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

include/utils/SkDumpCanvas.h

Index: include/utils/SkDumpCanvas.h
diff --git a/include/utils/SkDumpCanvas.h b/include/utils/SkDumpCanvas.h
index c990690d943270c174e741892f3cfae76afc161d..5e3249cbee5ceef1ec1c318e5fd2ad85ea595d8e 100644
--- a/include/utils/SkDumpCanvas.h
+++ b/include/utils/SkDumpCanvas.h
@@ -74,6 +74,11 @@
 
     int getNestLevel() const { return fNestLevel; }
 
+    virtual int save(SaveFlags) SK_OVERRIDE;
+    virtual int saveLayer(const SkRect* bounds, const SkPaint* paint,
+                          SaveFlags) SK_OVERRIDE;
+    virtual void restore() SK_OVERRIDE;
+
     virtual bool translate(SkScalar dx, SkScalar dy) SK_OVERRIDE;
     virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE;
     virtual bool rotate(SkScalar degrees) SK_OVERRIDE;
@@ -119,10 +124,6 @@
     virtual void endCommentGroup() SK_OVERRIDE;
 
 protected:
-    virtual void onSave(SaveFlags) SK_OVERRIDE;
-    virtual bool onSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE;
-    virtual void onRestore() SK_OVERRIDE;
-
     virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE;
     virtual void onPushCull(const SkRect& cullRect) SK_OVERRIDE;
     virtual void onPopCull() SK_OVERRIDE;