diff options
| -rw-r--r-- | experimental/PdfViewer/SkNulCanvas.h | 3 | ||||
| -rw-r--r-- | include/core/SkCanvas.h | 12 | ||||
| -rw-r--r-- | src/core/SkCanvas.cpp | 12 | ||||
| -rw-r--r-- | src/utils/debugger/SkDebugCanvas.h | 5 |
4 files changed, 0 insertions, 32 deletions
diff --git a/experimental/PdfViewer/SkNulCanvas.h b/experimental/PdfViewer/SkNulCanvas.h index 816b089146..2427c4c95b 100644 --- a/experimental/PdfViewer/SkNulCanvas.h +++ b/experimental/PdfViewer/SkNulCanvas.h @@ -59,9 +59,6 @@ public: virtual SkDrawFilter* setDrawFilter(SkDrawFilter* filter) SK_OVERRIDE {return NULL;} virtual bool isClipEmpty() const SK_OVERRIDE { return false; } -#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE - virtual ClipType getClipType() const SK_OVERRIDE { return kRect_ClipType; } -#endif virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { bounds->setXYWH(0, 0, diff --git a/include/core/SkCanvas.h b/include/core/SkCanvas.h index 3b8f17c53e..ceb85f6017 100644 --- a/include/core/SkCanvas.h +++ b/include/core/SkCanvas.h @@ -1115,18 +1115,6 @@ public: */ const SkMatrix& getTotalMatrix() const; -#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE - enum ClipType { - kEmpty_ClipType = 0, - kRect_ClipType, - kComplex_ClipType - }; - /** Returns a description of the total clip; may be cheaper than - getting the clip and querying it directly. - */ - virtual ClipType getClipType() const; -#endif - /** Return the clip stack. The clip stack stores all the individual * clips organized by the save/restore frame in which they were * added. diff --git a/src/core/SkCanvas.cpp b/src/core/SkCanvas.cpp index bab1edca0b..104dfc488d 100644 --- a/src/core/SkCanvas.cpp +++ b/src/core/SkCanvas.cpp @@ -1681,18 +1681,6 @@ const SkMatrix& SkCanvas::getTotalMatrix() const { return fMCRec->fMatrix; } -#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE -SkCanvas::ClipType SkCanvas::getClipType() const { - if (fMCRec->fRasterClip.isEmpty()) { - return kEmpty_ClipType; - } - if (fMCRec->fRasterClip.isRect()) { - return kRect_ClipType; - } - return kComplex_ClipType; -} -#endif - const SkRegion& SkCanvas::internal_private_getTotalClip() const { return fMCRec->fRasterClip.forceGetBW(); } diff --git a/src/utils/debugger/SkDebugCanvas.h b/src/utils/debugger/SkDebugCanvas.h index e774121cb9..e4fb0d9588 100644 --- a/src/utils/debugger/SkDebugCanvas.h +++ b/src/utils/debugger/SkDebugCanvas.h @@ -210,11 +210,6 @@ public: virtual bool isClipEmpty() const SK_OVERRIDE { return false; } virtual bool isClipRect() const SK_OVERRIDE { return true; } -#ifdef SK_SUPPORT_LEGACY_GETCLIPTYPE - virtual ClipType getClipType() const SK_OVERRIDE { - return kRect_ClipType; - } -#endif virtual bool getClipBounds(SkRect* bounds) const SK_OVERRIDE { if (NULL != bounds) { bounds->setXYWH(0, 0, |