Revert "De-virtualize SkCanvas save/restore."

src/utils/SkNWayCanvas.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 "SkNWayCanvas.h"
 
 SkNWayCanvas::SkNWayCanvas(int width, int height)
@@ skipping 39 matching lines @@
         return false;
     }
     SkCanvas* operator->() { return fCanvas; }
 
 private:
     const SkTDArray<SkCanvas*>& fList;
     int fIndex;
     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);
+    return this->INHERITED::save(flags);
 }
 
-bool SkNWayCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
-                               SaveFlags 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;
+    return this->INHERITED::saveLayer(bounds, paint, flags);
 }
 
-void SkNWayCanvas::onRestore() {
+void SkNWayCanvas::restore() {
     Iter iter(fList);
     while (iter.next()) {
         iter->restore();
     }
-    this->INHERITED::onRestore();
+    this->INHERITED::restore();
 }
 
 bool SkNWayCanvas::translate(SkScalar dx, SkScalar dy) {
     Iter iter(fList);
     while (iter.next()) {
         iter->translate(dx, dy);
     }
     return this->INHERITED::translate(dx, dy);
 }
 
@@ skipping 257 matching lines @@
         iter->addComment(kywd, value);
     }
 }
 
 void SkNWayCanvas::endCommentGroup() {
     Iter iter(fList);
     while (iter.next()) {
         iter->endCommentGroup();
     }
 }