commit 069a55a7fe2c3ae6f5049843b3fc1a167b51215c
author commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 12 15:08:22 2014 +0000
committer commit-bot@chromium.org <commit-bot@chromium.org@2bbb7eff-a529-9590-31e7-b0007b416f81> Wed Mar 12 15:08:22 2014 +0000
tree af0921fd4edbcb113b013fe37c4c9881a13269bf
parent 9e5f85e89d03a850d435fc951e74e9861a0c1bdd

Revert of Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/196323003/)

Reason for revert:
Pulling out to rename the virtuals.

Original issue's description:
> Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/194923008/)
>
> Reason for revert:
> Re-landing after roll fix.
>
> Original issue's description:
> > Revert "De-virtualize SkCanvas save/restore."
> >
> > (To allow a roll fix into the tree).
> >
> > This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
> >
> > R=halcanary@google.com
> >
> > Committed: https://code.google.com/p/skia/source/detail?r=13748
>
> TBR=halcanary@google.com,fmalita@chromium.org
> NOTREECHECKS=true
> NOTRY=true
>
> Committed: http://code.google.com/p/skia/source/detail?r=13754

R=halcanary@google.com, fmalita@chromium.org
TBR=fmalita@chromium.org, halcanary@google.com
NOTREECHECKS=true
NOTRY=true

Author: fmalita@google.com

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

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

src/utils/SkProxyCanvas.cpp

diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index f61a31d..0a9d7a8 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) {