diff options
author | robertphillips <robertphillips@google.com> | 2015-01-05 12:22:14 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-01-05 12:22:14 -0800 |
commit | 2b6ab61e2229bd76291b3d16ad7e386b3075eddb (patch) | |
tree | 54e4953e8b8a5501361952353b04ed16616f9ce8 /src/core | |
parent | 5a2315e750f65a8b61faa509a65840c622f04424 (diff) |
Remove SkPath::asRect
AFAICT the asRect entry point is not needed.
Greg: GPU
Reed: API
Cary: Path
Review URL: https://codereview.chromium.org/833193002
Diffstat (limited to 'src/core')
-rw-r--r-- | src/core/SkClipStack.cpp | 5 | ||||
-rw-r--r-- | src/core/SkPath.cpp | 8 |
2 files changed, 3 insertions, 10 deletions
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp index d5462876d1..515596a969 100644 --- a/src/core/SkClipStack.cpp +++ b/src/core/SkClipStack.cpp @@ -112,8 +112,9 @@ void SkClipStack::Element::invertShapeFillType() { void SkClipStack::Element::initPath(int saveCount, const SkPath& path, SkRegion::Op op, bool doAA) { if (!path.isInverseFillType()) { - if (SkPath::kNone_PathAsRect != path.asRect()) { - this->initRect(saveCount, path.getBounds(), op, doAA); + SkRect r; + if (path.isRect(&r)) { + this->initRect(saveCount, r, op, doAA); return; } SkRect ovalRect; diff --git a/src/core/SkPath.cpp b/src/core/SkPath.cpp index 9231d8bf8a..128a0cf3e4 100644 --- a/src/core/SkPath.cpp +++ b/src/core/SkPath.cpp @@ -526,14 +526,6 @@ bool SkPath::isRectContour(bool allowPartial, int* currVerb, const SkPoint** pts return result; } -SkPath::PathAsRect SkPath::asRect(Direction* direction) const { - SK_COMPILE_ASSERT(0 == kNone_PathAsRect, path_as_rect_mismatch); - SK_COMPILE_ASSERT(1 == kFill_PathAsRect, path_as_rect_mismatch); - SK_COMPILE_ASSERT(2 == kStroke_PathAsRect, path_as_rect_mismatch); - bool isClosed = false; - return (PathAsRect) (this->isRect(NULL, &isClosed, direction) + isClosed); -} - bool SkPath::isRect(SkRect* rect, bool* isClosed, Direction* direction) const { SkDEBUGCODE(this->validate();) int currVerb = 0; |