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/SkProxyCanvas.cpp b/src/utils/SkProxyCanvas.cpp
index f61a31d..0a9d7a8 100644
--- a/src/utils/SkProxyCanvas.cpp
+++ b/src/utils/SkProxyCanvas.cpp
@@ -21,22 +21,17 @@
///////////////////////////////// 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) {