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

src/utils/SkLuaCanvas.cpp

Index: src/utils/SkLuaCanvas.cpp
diff --git a/src/utils/SkLuaCanvas.cpp b/src/utils/SkLuaCanvas.cpp
index 2679fd25bd327de1719f2c1bf6238d7b464d3332..0f13073049e1797cd82ec173d8c235c2ea86e3ed 100644
--- a/src/utils/SkLuaCanvas.cpp
+++ b/src/utils/SkLuaCanvas.cpp
@@ -81,13 +81,13 @@
 
 SkLuaCanvas::~SkLuaCanvas() {}
 
-void SkLuaCanvas::onSave(SaveFlags flags) {
+int SkLuaCanvas::save(SaveFlags flags) {
     AUTO_LUA("save");
-    this->INHERITED::onSave(flags);
-}
-
-bool SkLuaCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                              SaveFlags flags) {
+    return this->INHERITED::save(flags);
+}
+
+int SkLuaCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                             SaveFlags flags) {
     AUTO_LUA("saveLayer");
     if (bounds) {
         lua.pushRect(*bounds, "bounds");
@@ -95,15 +95,12 @@
     if (paint) {
         lua.pushPaint(*paint, "paint");
     }
-
-    this->INHERITED::onSaveLayer(bounds, paint, flags);
-    // No need for a layer.
-    return false;
-}
-
-void SkLuaCanvas::onRestore() {
+    return this->INHERITED::save(flags);
+}
+
+void SkLuaCanvas::restore() {
     AUTO_LUA("restore");
-    this->INHERITED::onRestore();
+    this->INHERITED::restore();
 }
 
 bool SkLuaCanvas::translate(SkScalar dx, SkScalar dy) {