diff options
| author |  joshualitt <joshualitt@google.com> | 2015-02-25 13:04:43 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-02-25 13:04:44 -0800 |
| commit | 2907059d0eb1972a300ea1bf0cd4e4febabb9784 (patch) | |
| tree | f3f565626302891f0b74b870972ae2a4db89df4c /src/gpu/GrClip.cpp | |
| parent | edeccc58606e0421a1ae275e391ee4347c6f52f6 (diff) | |
Revert of Pass clip to context (patchset #8 id:180001 of https://codereview.chromium.org/936943002/)
Reason for revert:
Strange blur problems on nexus 5
Original issue's description:
> I'd really like to land this before the branch so speedy reviews are appreciated.
>
> BUG=skia:
>
> Committed: https://skia.googlesource.com/skia/+/586d5d640b19860dfbbd903a5188da1bbbe87336
TBR=jvanverth@google.com,senorblanco@google.com,bsalomon@google.com,senorblanco@chromium.org,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:
Review URL: https://codereview.chromium.org/956083002
Diffstat (limited to 'src/gpu/GrClip.cpp')
| -rw-r--r-- | src/gpu/GrClip.cpp | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/src/gpu/GrClip.cpp b/src/gpu/GrClip.cpp index 63d8f51695..1dc6edc168 100644 --- a/src/gpu/GrClip.cpp +++ b/src/gpu/GrClip.cpp @@ -21,6 +21,8 @@ void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult, bool* isIntersectionOfRects) const { switch (fClipType) { + default: + SkFAIL("incomplete switch\n"); case kWideOpen_ClipType: { devResult->setLTRB(0, 0, width, height); if (isIntersectionOfRects) { @@ -33,15 +35,6 @@ void GrClip::getConservativeBounds(int width, int height, SkIRect* devResult, *isIntersectionOfRects = true; } } break; - case kRect_ClipType: { - devResult->setLTRB(SkScalarCeilToInt(this->rect().fLeft), - SkScalarCeilToInt(this->rect().fTop), - SkScalarCeilToInt(this->rect().fRight), - SkScalarCeilToInt(this->rect().fBottom)); - if (isIntersectionOfRects) { - *isIntersectionOfRects = true; - } - } break; case kClipStack_ClipType: { SkRect devBounds; this->clipStack()->getConservativeBounds(-this->origin().fX, |