commit 44c48d062f7996b5b46917e1b312a32ad101f326
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Mar 13 20:03:58 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Mar 13 20:03:58 2014 +0000
tree 7870101b3784d3dccf3602fefa3f8a4f143c8d48
parent 1037d92bbc10cafb61d050638e8cbe5a3aa6706f

De-virtualize SkCanvas matrix ops.

This moves the matrix management logic into non-virtual SkCanvas
methods, and turns the virtuals into protected notifiers.

R=reed@google.com, robertphillips@google.com, bsalomon@google.com
BUG=skia:2297

Author: fmalita@chromium.org

Review URL: https://codereview.chromium.org/195793012

git-svn-id: http://skia.googlecode.com/svn/trunk@13799 2bbb7eff-a529-9590-31e7-b0007b416f81

src/core/SkPictureRecord.cpp

diff --git a/src/core/SkPictureRecord.cpp b/src/core/SkPictureRecord.cpp
index a85ea8d..55670ba 100644
--- a/src/core/SkPictureRecord.cpp
+++ b/src/core/SkPictureRecord.cpp
@@ -664,7 +664,7 @@
     this->validate(initialOffset, size);
 }
 
-bool SkPictureRecord::translate(SkScalar dx, SkScalar dy) {
+void SkPictureRecord::didTranslate(SkScalar dx, SkScalar dy) {
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.translate(dx, dy);
 #else
@@ -675,10 +675,10 @@
     this->addScalar(dy);
     this->validate(initialOffset, size);
 #endif
-    return this->INHERITED::translate(dx, dy);
+    this->INHERITED::didTranslate(dx, dy);
 }
 
-bool SkPictureRecord::scale(SkScalar sx, SkScalar sy) {
+void SkPictureRecord::didScale(SkScalar sx, SkScalar sy) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.scale(sx, sy);
@@ -690,10 +690,10 @@
     this->addScalar(sy);
     this->validate(initialOffset, size);
 #endif
-    return this->INHERITED::scale(sx, sy);
+    this->INHERITED::didScale(sx, sy);
 }
 
-bool SkPictureRecord::rotate(SkScalar degrees) {
+void SkPictureRecord::didRotate(SkScalar degrees) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.rotate(degrees);
@@ -704,10 +704,10 @@
     this->addScalar(degrees);
     this->validate(initialOffset, size);
 #endif
-    return this->INHERITED::rotate(degrees);
+    this->INHERITED::didRotate(degrees);
 }
 
-bool SkPictureRecord::skew(SkScalar sx, SkScalar sy) {
+void SkPictureRecord::didSkew(SkScalar sx, SkScalar sy) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.skew(sx, sy);
@@ -719,17 +719,17 @@
     this->addScalar(sy);
     this->validate(initialOffset, size);
 #endif
-    return this->INHERITED::skew(sx, sy);
+    this->INHERITED::didSkew(sx, sy);
 }
 
-bool SkPictureRecord::concat(const SkMatrix& matrix) {
+void SkPictureRecord::didConcat(const SkMatrix& matrix) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.concat(matrix);
 #else
     this->recordConcat(matrix);
 #endif
-    return this->INHERITED::concat(matrix);
+    this->INHERITED::didConcat(matrix);
 }
 
 void SkPictureRecord::recordConcat(const SkMatrix& matrix) {
@@ -741,7 +741,7 @@
     this->validate(initialOffset, size);
 }
 
-void SkPictureRecord::setMatrix(const SkMatrix& matrix) {
+void SkPictureRecord::didSetMatrix(const SkMatrix& matrix) {
 
 #ifdef SK_COLLAPSE_MATRIX_CLIP_STATE
     fMCMgr.setMatrix(matrix);
@@ -753,7 +753,7 @@
     this->addMatrix(matrix);
     this->validate(initialOffset, size);
 #endif
-    this->INHERITED::setMatrix(matrix);
+    this->INHERITED::didSetMatrix(matrix);
 }
 
 static bool regionOpExpands(SkRegion::Op op) {