diff options
author | Mike Reed <reed@google.com> | 2017-04-05 16:21:47 -0400 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-04-06 12:53:21 +0000 |
commit | 93b1b4feda10c50ce10763ddf7e807f9b85c7953 (patch) | |
tree | 313b8b5e462fbc5b0662cd9771e8273e93fa0781 | |
parent | e78b7259c3d5cbed77b4390150cfb699b0b59cd4 (diff) |
add guard for obsolete (non-functioning) replayClips
replayClips has been disabled (broken) for a while.
This CL just attempts to hide the api (will remove
once android's callsite is removed)
Bug: skia:
Change-Id: I35b412addfc0a08ea888a62609888b9b54dce2a6
Reviewed-on: https://skia-review.googlesource.com/11401
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
-rw-r--r-- | gn/android_framework_defines.gni | 1 | ||||
-rw-r--r-- | include/core/SkCanvas.h | 6 | ||||
-rw-r--r-- | src/core/SkCanvas.cpp | 4 | ||||
-rw-r--r-- | src/core/SkClipStack.cpp | 2 | ||||
-rw-r--r-- | src/core/SkClipStack.h | 4 | ||||
-rw-r--r-- | tests/CanvasTest.cpp | 18 | ||||
-rw-r--r-- | tools/debugger/SkDebugCanvas.cpp | 4 |
7 files changed, 21 insertions, 18 deletions
diff --git a/gn/android_framework_defines.gni b/gn/android_framework_defines.gni index 3447efeb59..9f37ed68b2 100644 --- a/gn/android_framework_defines.gni +++ b/gn/android_framework_defines.gni @@ -14,4 +14,5 @@ android_framework_defines = [ "SK_IGNORE_GPU_DITHER", "SK_SUPPORT_LEGACY_SHADER_ISABITMAP", "SK_SUPPORT_LEGACY_EMBOSSMASKFILTER", + "SK_SUPPORT_OBSOLETE_REPLAYCLIP", ] diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 71e45fa369..4c875e8f44 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -21,7 +21,9 @@ class GrContext; class GrRenderTargetContext; class SkBaseDevice; class SkBitmap; +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP class SkCanvasClipVisitor; +#endif class SkClipStack; class SkData; class SkDraw; @@ -1281,6 +1283,7 @@ public: */ const SkMatrix& getTotalMatrix() const; +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP typedef SkCanvasClipVisitor ClipVisitor; /** * Replays the clip operations, back to front, that have been applied to @@ -1288,6 +1291,7 @@ public: * clip. All clips have already been transformed into device space. */ void replayClips(ClipVisitor*) const; +#endif /////////////////////////////////////////////////////////////////////////// @@ -1687,6 +1691,7 @@ private: }; #define SkAutoCanvasRestore(...) SK_REQUIRE_LOCAL_VAR(SkAutoCanvasRestore) +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP class SkCanvasClipVisitor { public: virtual ~SkCanvasClipVisitor(); @@ -1694,5 +1699,6 @@ public: virtual void clipRRect(const SkRRect&, SkClipOp, bool antialias) = 0; virtual void clipPath(const SkPath&, SkClipOp, bool antialias) = 0; }; +#endif #endif diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index e38e73be0c..9a02c19129 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1573,6 +1573,7 @@ void SkCanvas::validateClip() const { } #endif +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP void SkCanvas::replayClips(ClipVisitor* visitor) const { #if 0 SkClipStack::B2TIter iter(*fClipStack); @@ -1583,6 +1584,7 @@ void SkCanvas::replayClips(ClipVisitor* visitor) const { } #endif } +#endif bool SkCanvas::androidFramework_isClipAA() const { bool containsAA = false; @@ -3127,7 +3129,9 @@ int SkCanvas::LayerIter::y() const { return fImpl->getY(); } /////////////////////////////////////////////////////////////////////////////// +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP SkCanvasClipVisitor::~SkCanvasClipVisitor() { } +#endif /////////////////////////////////////////////////////////////////////////////// diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp index a2621a9af4..516cc8d1ae 100644 --- a/src/core/SkClipStack.cpp +++ b/src/core/SkClipStack.cpp @@ -70,6 +70,7 @@ bool SkClipStack::Element::operator== (const Element& element) const { } } +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP void SkClipStack::Element::replay(SkCanvasClipVisitor* visitor) const { static const SkRect kEmptyRect = { 0, 0, 0, 0 }; @@ -88,6 +89,7 @@ void SkClipStack::Element::replay(SkCanvasClipVisitor* visitor) const { break; } } +#endif void SkClipStack::Element::invertShapeFillType() { switch (fType) { diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h index 9360f4de33..bd197e35fa 100644 --- a/src/core/SkClipStack.h +++ b/src/core/SkClipStack.h @@ -21,7 +21,9 @@ #include "GrResourceKey.h" #endif +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP class SkCanvasClipVisitor; +#endif // Because a single save/restore state can have multiple clips, this class // stores the stack depth (fSaveCount) and clips (fDeque) separately. @@ -196,10 +198,12 @@ public: return kPath_Type == fType && fPath.get()->isInverseFillType(); } +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP /** * Replay this clip into the visitor. */ void replay(SkCanvasClipVisitor*) const; +#endif #ifdef SK_DEBUG /** diff --git a/tests/CanvasTest.cpp b/tests/CanvasTest.cpp index 9e7de67165..26228bacde 100644 --- a/tests/CanvasTest.cpp +++ b/tests/CanvasTest.cpp @@ -275,24 +275,6 @@ private: } }; -class Canvas2CanvasClipVisitor : public SkCanvas::ClipVisitor { -public: - Canvas2CanvasClipVisitor(SkCanvas* target) : fTarget(target) {} - - void clipRect(const SkRect& r, SkClipOp op, bool aa) override { - fTarget->clipRect(r, op, aa); - } - void clipRRect(const SkRRect& r, SkClipOp op, bool aa) override { - fTarget->clipRRect(r, op, aa); - } - void clipPath(const SkPath& p, SkClipOp op, bool aa) override { - fTarget->clipPath(p, op, aa); - } - -private: - SkCanvas* fTarget; -}; - // Format strings that describe the test context. The %s token is where // the name of the test step is inserted. The context is required for // disambiguating the error in the case of failures that are reported in diff --git a/tools/debugger/SkDebugCanvas.cpp b/tools/debugger/SkDebugCanvas.cpp index 2d7d040c27..90627266db 100644 --- a/tools/debugger/SkDebugCanvas.cpp +++ b/tools/debugger/SkDebugCanvas.cpp @@ -149,6 +149,7 @@ int SkDebugCanvas::getCommandAtPoint(int x, int y, int index) { return layer; } +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP class SkDebugClipVisitor : public SkCanvas::ClipVisitor { public: SkDebugClipVisitor(SkCanvas* canvas) : fCanvas(canvas) {} @@ -181,6 +182,7 @@ protected: private: typedef SkCanvas::ClipVisitor INHERITED; }; +#endif // set up the saveLayer commands so that the active ones // return true in their 'active' method @@ -288,6 +290,7 @@ void SkDebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) { filterCanvas.restore(); } +#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP if (fMegaVizMode) { filterCanvas.save(); // nuke the CTM @@ -305,6 +308,7 @@ void SkDebugCanvas::drawTo(SkCanvas* originalCanvas, int index, int m) { filterCanvas.restore(); } +#endif if (pathOpsMode) { this->resetClipStackData(); const SkClipStack* clipStack = nullptr;//HACK filterCanvas.getClipStack(); |