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

src/core/SkBBoxHierarchyRecord.cpp

 
 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBBoxHierarchyRecord.h"
 #include "SkPictureStateTree.h"
 
 SkBBoxHierarchyRecord::SkBBoxHierarchyRecord(const SkISize& size,
                                              uint32_t recordFlags,
                                              SkBBoxHierarchy* h)
     : INHERITED(size, recordFlags) {
     fStateTree = SkNEW(SkPictureStateTree);
     fBoundingHierarchy = h;
     fBoundingHierarchy->ref();
     fBoundingHierarchy->setClient(this);
 }
 
 void SkBBoxHierarchyRecord::handleBBox(const SkRect& bounds) {
     SkIRect r;
     bounds.roundOut(&r);
     SkPictureStateTree::Draw* draw = fStateTree->appendDraw(this->writeStream().bytesWritten());
     fBoundingHierarchy->insert(draw, r, true);
 }
 
-int SkBBoxHierarchyRecord::save(SaveFlags flags) {
+void SkBBoxHierarchyRecord::onSave(SaveFlags flags) {
     fStateTree->appendSave();
-    return INHERITED::save(flags);
+    this->INHERITED::onSave(flags);
 }
 
-int SkBBoxHierarchyRecord::saveLayer(const SkRect* bounds, const SkPaint* paint,
-                                     SaveFlags flags) {
+bool SkBBoxHierarchyRecord::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
+                                        SaveFlags flags) {
     fStateTree->appendSaveLayer(this->writeStream().bytesWritten());
-    return INHERITED::saveLayer(bounds, paint, flags);
+    return this->INHERITED::onSaveLayer(bounds, paint, flags);
 }
 
-void SkBBoxHierarchyRecord::restore() {
+void SkBBoxHierarchyRecord::onRestore() {
     fStateTree->appendRestore();
-    INHERITED::restore();
+    this->INHERITED::onRestore();
 }
 
 bool SkBBoxHierarchyRecord::translate(SkScalar dx, SkScalar dy) {
     bool result = INHERITED::translate(dx, dy);
     fStateTree->appendTransform(getTotalMatrix());
     return result;
 }
 
 bool SkBBoxHierarchyRecord::scale(SkScalar sx, SkScalar sy) {
     bool result = INHERITED::scale(sx, sy);
@@ skipping 53 matching lines @@
 
 bool SkBBoxHierarchyRecord::shouldRewind(void* data) {
     // SkBBoxHierarchy::rewindInserts is called by SkPicture after the
     // SkPicture has rewound its command stream.  To match that rewind in the
     // BBH, we rewind all draws that reference commands that were recorded
     // past the point to which the SkPicture has rewound, which is given by
     // writeStream().bytesWritten().
     SkPictureStateTree::Draw* draw = static_cast<SkPictureStateTree::Draw*>(data);
     return draw->fOffset >= writeStream().bytesWritten();
 }