Revert "De-virtualize SkCanvas save/restore."
(To allow a roll fix into the tree).
This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
R=halcanary@google.com
Review URL: https://codereview.chromium.org/194923008
git-svn-id: http://skia.googlecode.com/svn/trunk@13748 2bbb7eff-a529-9590-31e7-b0007b416f81
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 {