From 2cc22b8f2fe4d11e5709ec5ab73adccebb262249 Mon Sep 17 00:00:00 2001
From: reed <reed@chromium.org>
Date: Thu, 2 Oct 2014 17:52:03 -0700
Subject: [PATCH] make SkMatrix::dump always available

BUG=skia:
TBR=

Review URL: https://codereview.chromium.org/624783002
---
 include/core/SkMatrix.h | 4 ++--
 src/core/SkMatrix.cpp   | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/include/core/SkMatrix.h b/include/core/SkMatrix.h
index b3c7378ab2..34f16077a4 100644
--- a/include/core/SkMatrix.h
+++ b/include/core/SkMatrix.h
@@ -560,8 +560,8 @@ public:
      */
     size_t readFromMemory(const void* buffer, size_t length);
 
-    SkDEVCODE(void dump() const;)
-    SK_TO_STRING_NONVIRT()
+    void dump() const;
+    void toString(SkString*) const;
 
     /**
      * Calculates the minimum scaling factor of the matrix as computed from the SVD of the upper
diff --git a/src/core/SkMatrix.cpp b/src/core/SkMatrix.cpp
index 3f235d54aa..db6cc8953c 100644
--- a/src/core/SkMatrix.cpp
+++ b/src/core/SkMatrix.cpp
@@ -1592,21 +1592,17 @@ size_t SkMatrix::readFromMemory(const void* buffer, size_t length) {
     return sizeInMemory;
 }
 
-#ifdef SK_DEVELOPER
 void SkMatrix::dump() const {
     SkString str;
     this->toString(&str);
     SkDebugf("%s\n", str.c_str());
 }
-#endif
 
-#ifndef SK_IGNORE_TO_STRING
 void SkMatrix::toString(SkString* str) const {
     str->appendf("[%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f][%8.4f %8.4f %8.4f]",
              fMat[0], fMat[1], fMat[2], fMat[3], fMat[4], fMat[5],
              fMat[6], fMat[7], fMat[8]);
 }
-#endif
 
 ///////////////////////////////////////////////////////////////////////////////