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

Unified Diff: include/utils/SkNWayCanvas.h

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 | « include/utils/SkLuaCanvas.h ('k') | include/utils/SkProxyCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: include/utils/SkNWayCanvas.h
diff --git a/include/utils/SkNWayCanvas.h b/include/utils/SkNWayCanvas.h
index 56cad84bb602b7bf08eac1e76e68ef190e3c1e12..84f4b4a177288baf09a918fceb8bedb58220f01e 100644
--- a/include/utils/SkNWayCanvas.h
+++ b/include/utils/SkNWayCanvas.h
@@ -23,6 +23,10 @@
///////////////////////////////////////////////////////////////////////////
// These are forwarded to the N canvases we're referencing
+ virtual int save(SaveFlags) SK_OVERRIDE;
+ virtual int saveLayer(const SkRect* bounds, const SkPaint*,
+ SaveFlags) SK_OVERRIDE;
+ virtual void restore() SK_OVERRIDE;
virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE;
virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE;
virtual bool rotate(SkScalar degrees) SK_OVERRIDE;
@@ -77,10 +81,6 @@
protected:
SkTDArray<SkCanvas*> fList;
- virtual void onSave(SaveFlags) SK_OVERRIDE;
- virtual bool onSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
- virtual void onRestore() SK_OVERRIDE;
-
virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE;
« no previous file with comments | « include/utils/SkLuaCanvas.h ('k') | include/utils/SkProxyCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698