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/SkDeferredCanvas.cpp

diff --git a/src/utils/SkDeferredCanvas.cpp b/src/utils/SkDeferredCanvas.cpp
index 8b617b3..efe7501 100644
--- a/src/utils/SkDeferredCanvas.cpp
+++ b/src/utils/SkDeferredCanvas.cpp
@@ -739,25 +739,28 @@
         SkIntToScalar(canvasSize.fWidth), SkIntToScalar(canvasSize.fHeight)));
 }
 
-void SkDeferredCanvas::onSave(SaveFlags flags) {
+int SkDeferredCanvas::save(SaveFlags flags) {
     this->drawingCanvas()->save(flags);
+    int val = this->INHERITED::save(flags);
     this->recordedDrawCommand();
-    this->INHERITED::onSave(flags);
+
+    return val;
 }
 
-bool SkDeferredCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                   SaveFlags flags) {
+int SkDeferredCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                                SaveFlags flags) {
     this->drawingCanvas()->saveLayer(bounds, paint, flags);
+    int count = this->INHERITED::save(flags);
+    this->clipRectBounds(bounds, flags, NULL);
     this->recordedDrawCommand();
-    this->INHERITED::onSaveLayer(bounds, paint, flags);
-    // No need for a full layer.
-    return false;
+
+    return count;
 }
 
-void SkDeferredCanvas::onRestore() {
+void SkDeferredCanvas::restore() {
     this->drawingCanvas()->restore();
+    this->INHERITED::restore();
     this->recordedDrawCommand();
-    this->INHERITED::onRestore();
 }
 
 bool SkDeferredCanvas::isDrawingToLayer() const {