Revert "De-virtualize SkCanvas save/restore."
(To allow a roll fix into the tree).
This reverts commit edf702204be42c945254191f9f9cd6585b3d189b.
R=halcanary@google.com
Review URL: https://codereview.chromium.org/194923008
git-svn-id: http://skia.googlecode.com/svn/trunk@13748 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index 6fbec96..a9543f9 100644
--- a/src/utils/SkNWayCanvas.cpp
+++ b/src/utils/SkNWayCanvas.cpp
@@ -57,33 +57,29 @@
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) {