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

Unified Diff: src/utils/SkProxyCanvas.cpp

Issue 197553002: Revert of Revert of Revert "De-virtualize SkCanvas save/restore." (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/utils/SkNoSaveLayerCanvas.h ('k') | src/utils/debugger/SkDebugCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkProxyCanvas.cpp
diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index f61a31d9b3f3bdc95a0876619990c21d1bf25ee0..0a9d7a80c20a6b8f11313753bb3d1beffed63fb0 100644
--- a/src/utils/SkProxyCanvas.cpp
+++ b/src/utils/SkProxyCanvas.cpp
@@ -21,22 +21,17 @@
///////////////////////////////// Overrides ///////////
-void SkProxyCanvas::onSave(SaveFlags flags) {
- fProxy->save(flags);
- this->INHERITED::onSave(flags);
+int SkProxyCanvas::save(SaveFlags flags) {
+ return fProxy->save(flags);
}
-bool SkProxyCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
- SaveFlags flags) {
- fProxy->saveLayer(bounds, paint, flags);
- this->INHERITED::onSaveLayer(bounds, paint, flags);
- // No need for a layer.
- return false;
+int SkProxyCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+ SaveFlags flags) {
+ return fProxy->saveLayer(bounds, paint, flags);
}
-void SkProxyCanvas::onRestore() {
+void SkProxyCanvas::restore() {
fProxy->restore();
- this->INHERITED::onRestore();
}
bool SkProxyCanvas::translate(SkScalar dx, SkScalar dy) {
« no previous file with comments | « src/utils/SkNoSaveLayerCanvas.h ('k') | src/utils/debugger/SkDebugCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698