Consolidate SkCanvas matrix virtuals.

src/utils/SkDumpCanvas.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkDumpCanvas.h"
 
@@ skipping 204 matching lines @@
     }
     this->dump(kSave_Verb, paint, str.c_str());
     return this->INHERITED::willSaveLayer(bounds, paint, flags);
 }
 
 void SkDumpCanvas::willRestore() {
     this->dump(kRestore_Verb, NULL, "restore");
     this->INHERITED::willRestore();
 }
 
-void SkDumpCanvas::didTranslate(SkScalar dx, SkScalar dy) {
-    this->dump(kMatrix_Verb, NULL, "translate(%g %g)",
-               SkScalarToFloat(dx), SkScalarToFloat(dy));
-    this->INHERITED::didTranslate(dx, dy);
-}
-
-void SkDumpCanvas::didScale(SkScalar sx, SkScalar sy) {
-    this->dump(kMatrix_Verb, NULL, "scale(%g %g)",
-               SkScalarToFloat(sx), SkScalarToFloat(sy));
-    this->INHERITED::didScale(sx, sy);
-}
-
-void SkDumpCanvas::didRotate(SkScalar degrees) {
-    this->dump(kMatrix_Verb, NULL, "rotate(%g)", SkScalarToFloat(degrees));
-    this->INHERITED::didRotate(degrees);
-}
-
-void SkDumpCanvas::didSkew(SkScalar sx, SkScalar sy) {
-    this->dump(kMatrix_Verb, NULL, "skew(%g %g)",
-               SkScalarToFloat(sx), SkScalarToFloat(sy));
-    this->INHERITED::didSkew(sx, sy);
-}
-
 void SkDumpCanvas::didConcat(const SkMatrix& matrix) {
     SkString str;
-    matrix.toString(&str);
-    this->dump(kMatrix_Verb, NULL, "concat(%s)", str.c_str());
+
+    switch (matrix.getType()) {

[robertphillips, 2014/03/25 15:44:36]

same here.

[f(malita), 2014/03/25 15:58:08]

Done.

+    case SkMatrix::kTranslate_Mask:
+        this->dump(kMatrix_Verb, NULL, "translate(%g %g)",
+                   SkScalarToFloat(matrix.getTranslateX()),
+                   SkScalarToFloat(matrix.getTranslateY()));
+        break;
+    case SkMatrix::kScale_Mask:
+        this->dump(kMatrix_Verb, NULL, "scale(%g %g)",
+                   SkScalarToFloat(matrix.getScaleX()),
+                   SkScalarToFloat(matrix.getScaleY()));
+        break;
+    default:
+        matrix.toString(&str);
+        this->dump(kMatrix_Verb, NULL, "concat(%s)", str.c_str());
+        break;
+    }
+
     this->INHERITED::didConcat(matrix);
 }
 
 void SkDumpCanvas::didSetMatrix(const SkMatrix& matrix) {
     SkString str;
     matrix.toString(&str);
     this->dump(kMatrix_Verb, NULL, "setMatrix(%s)", str.c_str());
     this->INHERITED::didSetMatrix(matrix);
 }
 
@@ skipping 266 matching lines @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
 static void dumpToDebugf(const char text[], void*) {
     SkDebugf("%s\n", text);
 }
 
 SkDebugfDumper::SkDebugfDumper() : INHERITED(dumpToDebugf, NULL) {}
 
 #endif