De-virtualize SkCanvas matrix ops.

src/core/SkCanvas.cpp

 
 /*
  * Copyright 2008 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkCanvas.h"
@@ skipping 1198 matching lines @@
                                          tmpUnfiltered);
             }
         } else {
             iter.fDevice->drawSprite(iter, bitmap, pos.x(), pos.y(), *paint);
         }
     }
     LOOPER_END
 }
 
 /////////////////////////////////////////////////////////////////////////////
+void SkCanvas::didTranslate(SkScalar, SkScalar) {
+    // Do nothing. Subclasses may do something.
+}
 
 bool SkCanvas::translate(SkScalar dx, SkScalar dy) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
-    return fMCRec->fMatrix->preTranslate(dx, dy);
+    bool res = fMCRec->fMatrix->preTranslate(dx, dy);
+
+    this->didTranslate(dx, dy);
+    return res;
+}
+
+void SkCanvas::didScale(SkScalar, SkScalar) {
+    // Do nothing. Subclasses may do something.
 }
 
 bool SkCanvas::scale(SkScalar sx, SkScalar sy) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
-    return fMCRec->fMatrix->preScale(sx, sy);
+    bool res = fMCRec->fMatrix->preScale(sx, sy);
+
+    this->didScale(sx, sy);
+    return res;
+}
+
+void SkCanvas::didRotate(SkScalar) {
+    // Do nothing. Subclasses may do something.
 }
 
 bool SkCanvas::rotate(SkScalar degrees) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
-    return fMCRec->fMatrix->preRotate(degrees);
+    bool res = fMCRec->fMatrix->preRotate(degrees);
+
+    this->didRotate(degrees);
+    return res;
+}
+
+void SkCanvas::didSkew(SkScalar, SkScalar) {
+    // Do nothing. Subclasses may do something.
 }
 
 bool SkCanvas::skew(SkScalar sx, SkScalar sy) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
-    return fMCRec->fMatrix->preSkew(sx, sy);
+    bool res = fMCRec->fMatrix->preSkew(sx, sy);
+
+    this->didSkew(sx, sy);
+    return res;
+}
+
+void SkCanvas::didConcat(const SkMatrix&) {
+    // Do nothing. Subclasses may do something.
 }
 
 bool SkCanvas::concat(const SkMatrix& matrix) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
-    return fMCRec->fMatrix->preConcat(matrix);
+    bool res = fMCRec->fMatrix->preConcat(matrix);
+
+    this->didConcat(matrix);
+    return res;
+}
+
+void SkCanvas::didSetMatrix(const SkMatrix&) {
+    // Do nothing. Subclasses may do something.
 }
 
 void SkCanvas::setMatrix(const SkMatrix& matrix) {
     fDeviceCMDirty = true;
     fCachedLocalClipBoundsDirty = true;
     *fMCRec->fMatrix = matrix;
+    this->didSetMatrix(matrix);
 }
 
-// this is not virtual, so it must call a virtual method so that subclasses
-// will see its action
 void SkCanvas::resetMatrix() {
     SkMatrix matrix;
 
     matrix.reset();
     this->setMatrix(matrix);
 }
 
 //////////////////////////////////////////////////////////////////////////////
 
 void SkCanvas::clipRect(const SkRect& rect, SkRegion::Op op, bool doAA) {
@@ skipping 1233 matching lines @@
     if (!bitmap.allocPixels(info)) {
         return NULL;
     }
 
     // should this functionality be moved into allocPixels()?
     if (!bitmap.info().isOpaque()) {
         bitmap.eraseColor(0);
     }
     return SkNEW_ARGS(SkCanvas, (bitmap));
 }