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/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp
index 67ecc65..08e6d94 100644
--- a/src/utils/debugger/SkDebugCanvas.cpp
+++ b/src/utils/debugger/SkDebugCanvas.cpp
@@ -530,9 +530,8 @@
this->addDrawCommand(new SkPopCullCommand());
}
-void SkDebugCanvas::onRestore() {
- this->addDrawCommand(new SkRestoreCommand());
- this->INHERITED::onRestore();
+void SkDebugCanvas::restore() {
+ addDrawCommand(new SkRestoreCommand());
}
bool SkDebugCanvas::rotate(SkScalar degrees) {
@@ -540,17 +539,15 @@
return true;
}
-void SkDebugCanvas::onSave(SaveFlags flags) {
- this->addDrawCommand(new SkSaveCommand(flags));
- this->INHERITED::onSave(flags);
+int SkDebugCanvas::save(SaveFlags flags) {
+ addDrawCommand(new SkSaveCommand(flags));
+ return true;
}
-bool SkDebugCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
- SaveFlags flags) {
- this->addDrawCommand(new SkSaveLayerCommand(bounds, paint, flags));
- this->INHERITED::onSaveLayer(bounds, paint, flags);
- // No need for a full layer.
- return false;
+int SkDebugCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+ SaveFlags flags) {
+ addDrawCommand(new SkSaveLayerCommand(bounds, paint, flags));
+ return true;
}
bool SkDebugCanvas::scale(SkScalar sx, SkScalar sy) {