Revert of Revert "De-virtualize SkCanvas save/restore."

src/utils/debugger/SkDebugCanvas.cpp

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