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

src/core/SkBBoxHierarchyRecord.cpp

Index: src/core/SkBBoxHierarchyRecord.cpp
diff --git a/src/core/SkBBoxHierarchyRecord.cpp b/src/core/SkBBoxHierarchyRecord.cpp
index e7a30f61f1495b6503a3ce3b94b6fbba62bde214..5d310be7bcd3d28a74a1ef823ac019306e7fddd3 100644
--- a/src/core/SkBBoxHierarchyRecord.cpp
+++ b/src/core/SkBBoxHierarchyRecord.cpp
@@ -26,20 +26,20 @@
     fBoundingHierarchy->insert(draw, r, true);
 }
 
-void SkBBoxHierarchyRecord::onSave(SaveFlags flags) {
+int SkBBoxHierarchyRecord::save(SaveFlags flags) {
     fStateTree->appendSave();
-    this->INHERITED::onSave(flags);
+    return INHERITED::save(flags);
 }
 
-bool SkBBoxHierarchyRecord::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                                        SaveFlags flags) {
+int SkBBoxHierarchyRecord::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                                     SaveFlags flags) {
     fStateTree->appendSaveLayer(this->writeStream().bytesWritten());
-    return this->INHERITED::onSaveLayer(bounds, paint, flags);
+    return INHERITED::saveLayer(bounds, paint, flags);
 }
 
-void SkBBoxHierarchyRecord::onRestore() {
+void SkBBoxHierarchyRecord::restore() {
     fStateTree->appendRestore();
-    this->INHERITED::onRestore();
+    INHERITED::restore();
 }
 
 bool SkBBoxHierarchyRecord::translate(SkScalar dx, SkScalar dy) {