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

src/utils/SkDumpCanvas.cpp

Index: src/utils/SkDumpCanvas.cpp
diff --git a/src/utils/SkDumpCanvas.cpp b/src/utils/SkDumpCanvas.cpp
index ccc5124f30f9694df56c8d8310a1cd1e1b8fd814..4805d6287c5203df9dab37ddbda95d5543ee0841 100644
--- a/src/utils/SkDumpCanvas.cpp
+++ b/src/utils/SkDumpCanvas.cpp
@@ -192,13 +192,13 @@
 
 ///////////////////////////////////////////////////////////////////////////////
 
-void SkDumpCanvas::onSave(SaveFlags flags) {
+int SkDumpCanvas::save(SaveFlags flags) {
     this->dump(kSave_Verb, NULL, "save(0x%X)", flags);
-    this->INHERITED::onSave(flags);
-}
-
-bool SkDumpCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                               SaveFlags flags) {
+    return this->INHERITED::save(flags);
+}
+
+int SkDumpCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                             SaveFlags flags) {
     SkString str;
     str.printf("saveLayer(0x%X)", flags);
     if (bounds) {
@@ -214,12 +214,12 @@
         }
     }
     this->dump(kSave_Verb, paint, str.c_str());
-    return this->INHERITED::onSaveLayer(bounds, paint, flags);
-}
-
-void SkDumpCanvas::onRestore() {
+    return this->INHERITED::saveLayer(bounds, paint, flags);
+}
+
+void SkDumpCanvas::restore() {
+    this->INHERITED::restore();
     this->dump(kRestore_Verb, NULL, "restore");
-    this->INHERITED::onRestore();
 }
 
 bool SkDumpCanvas::translate(SkScalar dx, SkScalar dy) {