From 069a55a7fe2c3ae6f5049843b3fc1a167b51215c Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Wed, 12 Mar 2014 15:08:22 +0000 Subject: Revert of Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/196323003/) Reason for revert: Pulling out to rename the virtuals. Original issue's description: > Revert of Revert "De-virtualize SkCanvas save/restore." (https://codereview.chromium.org/194923008/) > > Reason for revert: > Re-landing after roll fix. > > Original issue's description: > > Revert "De-virtualize SkCanvas save/restore." > > > > (To allow a roll fix into the tree). > > > > This reverts commit edf702204be42c945254191f9f9cd6585b3d189b. > > > > R=halcanary@google.com > > > > Committed: https://code.google.com/p/skia/source/detail?r=13748 > > TBR=halcanary@google.com,fmalita@chromium.org > NOTREECHECKS=true > NOTRY=true > > Committed: http://code.google.com/p/skia/source/detail?r=13754 R=halcanary@google.com, fmalita@chromium.org TBR=fmalita@chromium.org, halcanary@google.com NOTREECHECKS=true NOTRY=true Author: fmalita@google.com Review URL: https://codereview.chromium.org/197553002 git-svn-id: http://skia.googlecode.com/svn/trunk@13765 2bbb7eff-a529-9590-31e7-b0007b416f81 --- src/utils/debugger/SkDebugCanvas.cpp | 21 +++++++++------------ src/utils/debugger/SkDebugCanvas.h | 10 ++++++---- 2 files changed, 15 insertions(+), 16 deletions(-) (limited to 'src/utils/debugger') diff --git a/src/utils/debugger/SkDebugCanvas.cpp b/src/utils/debugger/SkDebugCanvas.cpp index 67ecc65b08..08e6d94f9e 100644 --- a/src/utils/debugger/SkDebugCanvas.cpp +++ b/src/utils/debugger/SkDebugCanvas.cpp @@ -530,9 +530,8 @@ void SkDebugCanvas::onPopCull() { this->addDrawCommand(new SkPopCullCommand()); } -void SkDebugCanvas::onRestore() { - this->addDrawCommand(new SkRestoreCommand()); - this->INHERITED::onRestore(); +void SkDebugCanvas::restore() { + addDrawCommand(new SkRestoreCommand()); } bool SkDebugCanvas::rotate(SkScalar degrees) { @@ -540,17 +539,15 @@ bool SkDebugCanvas::rotate(SkScalar degrees) { return true; } -void SkDebugCanvas::onSave(SaveFlags flags) { - this->addDrawCommand(new SkSaveCommand(flags)); - this->INHERITED::onSave(flags); +int SkDebugCanvas::save(SaveFlags flags) { + addDrawCommand(new SkSaveCommand(flags)); + return true; } -bool SkDebugCanvas::onSaveLayer(const SkRect* bounds, const SkPaint* paint, - SaveFlags flags) { - this->addDrawCommand(new SkSaveLayerCommand(bounds, paint, flags)); - this->INHERITED::onSaveLayer(bounds, paint, flags); - // No need for a full layer. - return false; +int SkDebugCanvas::saveLayer(const SkRect* bounds, const SkPaint* paint, + SaveFlags flags) { + addDrawCommand(new SkSaveLayerCommand(bounds, paint, flags)); + return true; } bool SkDebugCanvas::scale(SkScalar sx, SkScalar sy) { diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index 24824c964d..0bbb640a98 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -206,8 +206,14 @@ public: const uint16_t indices[], int indexCount, const SkPaint&) SK_OVERRIDE; + virtual void restore() SK_OVERRIDE; + virtual bool rotate(SkScalar degrees) SK_OVERRIDE; + virtual int save(SaveFlags) SK_OVERRIDE; + + virtual int saveLayer(const SkRect* bounds, const SkPaint*, SaveFlags) SK_OVERRIDE; + virtual bool scale(SkScalar sx, SkScalar sy) SK_OVERRIDE; virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; @@ -242,10 +248,6 @@ public: } protected: - virtual void onSave(SaveFlags) SK_OVERRIDE; - virtual bool onSaveLayer(const SkRect*, const SkPaint*, SaveFlags) SK_OVERRIDE; - virtual void onRestore() SK_OVERRIDE; - virtual void onDrawDRRect(const SkRRect&, const SkRRect&, const SkPaint&) SK_OVERRIDE; virtual void onPushCull(const SkRect& cullRect) SK_OVERRIDE; virtual void onPopCull() SK_OVERRIDE; -- cgit v1.2.3