Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(184)

Unified Diff: src/core/SkCanvas.cpp

Issue 195793012: De-virtualize SkCanvas matrix ops. (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/core/SkBBoxHierarchyRecord.cpp ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/core/SkCanvas.cpp
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp
index 6f33280f4293039a09aff16f70294f9a666cdd3c..1443f5e575551bea03157e3be8635dda09011ae4 100644
--- a/src/core/SkCanvas.cpp
+++ b/src/core/SkCanvas.cpp
@@ -1216,45 +1216,82 @@ void SkCanvas::drawSprite(const SkBitmap& bitmap, int x, int y,
}
/////////////////////////////////////////////////////////////////////////////
+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;
« no previous file with comments | « src/core/SkBBoxHierarchyRecord.cpp ('k') | src/core/SkPictureRecord.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698