Consolidate SkCanvas matrix virtuals.

src/utils/SkLuaCanvas.cpp

 /*
  * Copyright 2013 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkLuaCanvas.h"
 #include "SkLua.h"
 
@@ skipping 88 matching lines @@
     this->INHERITED::willSaveLayer(bounds, paint, flags);
     // No need for a layer.
     return kNoLayer_SaveLayerStrategy;
 }
 
 void SkLuaCanvas::willRestore() {
     AUTO_LUA("restore");
     this->INHERITED::willRestore();
 }
 
-void SkLuaCanvas::didTranslate(SkScalar dx, SkScalar dy) {
-    AUTO_LUA("translate");
-    lua.pushScalar(dx, "dx");
-    lua.pushScalar(dy, "dy");
-    this->INHERITED::didTranslate(dx, dy);
-}
+void SkLuaCanvas::didConcat(const SkMatrix& matrix) {
+    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: {
+        AUTO_LUA("translate");
+        lua.pushScalar(matrix.getTranslateX(), "dx");
+        lua.pushScalar(matrix.getTranslateY(), "dy");

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

break goes before the } when you do this.

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

Done.

+    } break;
+    case SkMatrix::kScale_Mask: {
+        AUTO_LUA("scale");
+        lua.pushScalar(matrix.getScaleX(), "sx");
+        lua.pushScalar(matrix.getScaleY(), "sy");
+    } break;
+    default: {
+        AUTO_LUA("concat");
+        lua.pushMatrix(matrix);
+    } break;
+    }
 
-void SkLuaCanvas::didScale(SkScalar sx, SkScalar sy) {
-    AUTO_LUA("scale");
-    lua.pushScalar(sx, "sx");
-    lua.pushScalar(sy, "sy");
-    this->INHERITED::didScale(sx, sy);
-}
-
-void SkLuaCanvas::didRotate(SkScalar degrees) {
-    AUTO_LUA("rotate");
-    lua.pushScalar(degrees, "degrees");
-    this->INHERITED::didRotate(degrees);
-}
-
-void SkLuaCanvas::didSkew(SkScalar kx, SkScalar ky) {
-    AUTO_LUA("skew");
-    lua.pushScalar(kx, "kx");
-    lua.pushScalar(ky, "ky");
-    this->INHERITED::didSkew(kx, ky);
-}
-
-void SkLuaCanvas::didConcat(const SkMatrix& matrix) {
-    AUTO_LUA("concat");
     this->INHERITED::didConcat(matrix);
 }
 
 void SkLuaCanvas::didSetMatrix(const SkMatrix& matrix) {
     this->INHERITED::didSetMatrix(matrix);
 }
 
 void SkLuaCanvas::onClipRect(const SkRect& r, SkRegion::Op op, ClipEdgeStyle edgeStyle) {
     AUTO_LUA("clipRect");
     lua.pushRect(r, "rect");
@@ skipping 139 matching lines @@
                                  const SkColor colors[], SkXfermode* xmode,
                                  const uint16_t indices[], int indexCount,
                                  const SkPaint& paint) {
     AUTO_LUA("drawVertices");
     lua.pushPaint(paint, "paint");
 }
 
 void SkLuaCanvas::drawData(const void* data, size_t length) {
     AUTO_LUA("drawData");
 }