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

src/utils/SkProxyCanvas.cpp

Index: src/utils/SkProxyCanvas.cpp
diff --git a/src/utils/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index 0a9d7a80c20a6b8f11313753bb3d1beffed63fb0..f61a31d9b3f3bdc95a0876619990c21d1bf25ee0 100644
--- a/src/utils/SkProxyCanvas.cpp
+++ b/src/utils/SkProxyCanvas.cpp
@@ -21,17 +21,22 @@
 
 ///////////////////////////////// Overrides ///////////
 
-int SkProxyCanvas::save(SaveFlags flags) {
-    return fProxy->save(flags);
+void SkProxyCanvas::onSave(SaveFlags flags) {
+    fProxy->save(flags);
+    this->INHERITED::onSave(flags);
 }
 
-int SkProxyCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
-                             SaveFlags flags) {
-    return fProxy->saveLayer(bounds, paint, flags);
+bool SkProxyCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
+                                SaveFlags flags) {
+    fProxy->saveLayer(bounds, paint, flags);
+    this->INHERITED::onSaveLayer(bounds, paint, flags);
+    // No need for a layer.
+    return false;
 }
 
-void SkProxyCanvas::restore() {
+void SkProxyCanvas::onRestore() {
     fProxy->restore();
+    this->INHERITED::onRestore();
 }
 
 bool SkProxyCanvas::translate(SkScalar dx, SkScalar dy) {