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

src/utils/SkNWayCanvas.cpp

Index: src/utils/SkNWayCanvas.cpp
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index 6fbec962044091f647704c236ab20e3dc1411dc8..a9543f9c02f4d4ad04c769d0a1e7fa6f1cab602c 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -57,33 +57,29 @@
     SkCanvas* fCanvas;
 };
 
-void SkNWayCanvas::onSave(SaveFlags flags) {
+int SkNWayCanvas::save(SaveFlags flags) {
     Iter iter(fList);
     while (iter.next()) {
         iter->save(flags);
     }
-
-    this->INHERITED::onSave(flags);
-}
-
-bool SkNWayCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                               SaveFlags flags) {
+    return this->INHERITED::save(flags);
+}
+
+int SkNWayCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                                    SaveFlags flags) {
     Iter iter(fList);
     while (iter.next()) {
         iter->saveLayer(bounds, paint, flags);
     }
-
-    this->INHERITED::onSaveLayer(bounds, paint, flags);
-    // No need for a layer.
-    return false;
-}
-
-void SkNWayCanvas::onRestore() {
+    return this->INHERITED::saveLayer(bounds, paint, flags);
+}
+
+void SkNWayCanvas::restore() {
     Iter iter(fList);
     while (iter.next()) {
         iter->restore();
     }
-    this->INHERITED::onRestore();
+    this->INHERITED::restore();
 }
 
 bool SkNWayCanvas::translate(SkScalar dx, SkScalar dy) {