diff options
| author |  robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 15:28:02 +0000 |
|---|---|---|
| committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2014-02-28 15:28:02 +0000 |
| commit | 03fc3b4f67a115e4a7945d173856a6c80b09311e (patch) | |
| tree | 76665d4141136cb091f7c9e3e5d3bdc2342cdfa2 /src/utils/SkCanvasStack.h | |
| parent | d85f32ca40475fb246dd8ca93abaf1c3db0389e1 (diff) | |
Revert of r13620 (add new onClip* methods to SkCanvas - https://codereview.chromium.org/183453002/) due to broken Chrome Canary and failing tests.
git-svn-id: http://skia.googlecode.com/svn/trunk@13622 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'src/utils/SkCanvasStack.h')
| -rw-r--r-- | src/utils/SkCanvasStack.h | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/utils/SkCanvasStack.h b/src/utils/SkCanvasStack.h index ba2fed4932..5311118270 100644 --- a/src/utils/SkCanvasStack.h +++ b/src/utils/SkCanvasStack.h @@ -30,12 +30,11 @@ public: virtual void removeCanvas(SkCanvas*) SK_OVERRIDE { SkDEBUGFAIL("Invalid Op"); } virtual void setMatrix(const SkMatrix& matrix) SK_OVERRIDE; - -protected: - virtual void onClipRect(const SkRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRRect(const SkRRect&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipPath(const SkPath&, SkRegion::Op, ClipEdgeStyle) SK_OVERRIDE; - virtual void onClipRegion(const SkRegion&, SkRegion::Op) SK_OVERRIDE; + virtual bool clipRect(const SkRect&, SkRegion::Op, bool) SK_OVERRIDE; + virtual bool clipRRect(const SkRRect&, SkRegion::Op, bool) SK_OVERRIDE; + virtual bool clipPath(const SkPath&, SkRegion::Op, bool) SK_OVERRIDE; + virtual bool clipRegion(const SkRegion& deviceRgn, + SkRegion::Op) SK_OVERRIDE; private: void clipToZOrderedBounds(); |