Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(608)

Unified Diff: src/utils/SkNWayCanvas.cpp

Issue 197553002: Revert of Revert of Revert "De-virtualize SkCanvas save/restore." (Closed) Base URL: https://skia.googlecode.com/svn/trunk
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/utils/SkLuaCanvas.cpp ('k') | src/utils/SkNoSaveLayerCanvas.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/utils/SkNWayCanvas.cpp
diff --git a/src/utils/SkNWayCanvas.cpp b/src/utils/SkNWayCanvas.cpp
index 6fbec962044091f647704c236ab20e3dc1411dc8..a9543f9c02f4d4ad04c769d0a1e7fa6f1cab602c 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);
-}
-
-bool SkNWayCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint,
- SaveFlags flags) {
+ return this->INHERITED::save(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;
-}
-
-void SkNWayCanvas::onRestore() {
+ return this->INHERITED::saveLayer(bounds, paint, flags);
+}
+
+void SkNWayCanvas::restore() {
Iter iter(fList);
while (iter.next()) {
iter->restore();
}
- this->INHERITED::onRestore();
+ this->INHERITED::restore();
}
bool SkNWayCanvas::translate(SkScalar dx, SkScalar dy) {
« no previous file with comments | « src/utils/SkLuaCanvas.cpp ('k') | src/utils/SkNoSaveLayerCanvas.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698