diff options
author | 2017-04-13 11:06:30 -0400 | |
---|---|---|
committer | 2017-04-13 15:42:09 +0000 | |
commit | 1335a0561e28b97ff4347129c7cc3fdcbf952eb5 (patch) | |
tree | 7c5447b5e2e83c23ca481bb24649d5db178d6201 /src | |
parent | 0a4b4100c12844f49f0656e6a3e382e98d906e5f (diff) |
remove dead code around replayClips
Bug: skia:
Change-Id: I208bf41846265524d86f65de660311199fefc158
Reviewed-on: https://skia-review.googlesource.com/13338
Reviewed-by: Mike Reed <reed@google.com>
Commit-Queue: Mike Reed <reed@google.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/core/SkCanvas.cpp | 19 | ||||
-rw-r--r-- | src/core/SkClipStack.cpp | 21 | ||||
-rw-r--r-- | src/core/SkClipStack.h | 11 |
3 files changed, 0 insertions, 51 deletions
diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index 8cef3353a2..f8e427cd81 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1582,19 +1582,6 @@ void SkCanvas::validateClip() const { } #endif -#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP -void SkCanvas::replayClips(ClipVisitor* visitor) const { -#if 0 - SkClipStack::B2TIter iter(*fClipStack); - const SkClipStack::Element* element; - - while ((element = iter.next()) != nullptr) { - element->replay(visitor); - } -#endif -} -#endif - bool SkCanvas::androidFramework_isClipAA() const { bool containsAA = false; @@ -3128,12 +3115,6 @@ int SkCanvas::LayerIter::y() const { return fImpl->getY(); } /////////////////////////////////////////////////////////////////////////////// -#ifdef SK_SUPPORT_OBSOLETE_REPLAYCLIP -SkCanvasClipVisitor::~SkCanvasClipVisitor() { } -#endif - -/////////////////////////////////////////////////////////////////////////////// - static bool supported_for_raster_canvas(const SkImageInfo& info) { switch (info.alphaType()) { case kPremul_SkAlphaType: diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp index 516cc8d1ae..8da54e1ca3 100644 --- a/src/core/SkClipStack.cpp +++ b/src/core/SkClipStack.cpp @@ -70,27 +70,6 @@ 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 }; - - switch (fType) { - case kPath_Type: - visitor->clipPath(this->getPath(), this->getOp(), this->isAA()); - break; - case kRRect_Type: - visitor->clipRRect(this->getRRect(), this->getOp(), this->isAA()); - break; - case kRect_Type: - visitor->clipRect(this->getRect(), this->getOp(), this->isAA()); - break; - case kEmpty_Type: - visitor->clipRect(kEmptyRect, kIntersect_SkClipOp, false); - break; - } -} -#endif - void SkClipStack::Element::invertShapeFillType() { switch (fType) { case kRect_Type: diff --git a/src/core/SkClipStack.h b/src/core/SkClipStack.h index bd197e35fa..98cec07af6 100644 --- a/src/core/SkClipStack.h +++ b/src/core/SkClipStack.h @@ -21,10 +21,6 @@ #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. // Each clip in fDeque stores the stack state to which it belongs @@ -198,13 +194,6 @@ 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 /** * Dumps the element to SkDebugf. This is intended for Skia development debugging |