Revert "De-virtualize SkCanvas save/restore."

src/utils/SkProxyCanvas.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkProxyCanvas.h"
 
 SkProxyCanvas::SkProxyCanvas(SkCanvas* proxy) : fProxy(proxy) {
     SkSafeRef(fProxy);
 }
 
 SkProxyCanvas::~SkProxyCanvas() {
     SkSafeUnref(fProxy);
 }
 
 void SkProxyCanvas::setProxy(SkCanvas* proxy) {
     SkRefCnt_SafeAssign(fProxy, proxy);
 }
 
 ///////////////////////////////// Overrides ///////////
 
-void SkProxyCanvas::onSave(SaveFlags flags) {
-    fProxy->save(flags);
-    this->INHERITED::onSave(flags);
+int SkProxyCanvas::save(SaveFlags flags) {
+    return fProxy->save(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;
+int SkProxyCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint,
+                             SaveFlags flags) {
+    return fProxy->saveLayer(bounds, paint, flags);
 }
 
-void SkProxyCanvas::onRestore() {
+void SkProxyCanvas::restore() {
     fProxy->restore();
-    this->INHERITED::onRestore();
 }
 
 bool SkProxyCanvas::translate(SkScalar dx, SkScalar dy) {
     return fProxy->translate(dx, dy);
 }
 
 bool SkProxyCanvas::scale(SkScalar sx, SkScalar sy) {
     return fProxy->scale(sx, sy);
 }
 
@@ skipping 131 matching lines @@
     fProxy->endCommentGroup();
 }
 
 SkBounder* SkProxyCanvas::setBounder(SkBounder* bounder) {
     return fProxy->setBounder(bounder);
 }
 
 SkDrawFilter* SkProxyCanvas::setDrawFilter(SkDrawFilter* filter) {
     return fProxy->setDrawFilter(filter);
 }