diff options
| author |  robertphillips <robertphillips@google.com> | 2015-05-19 04:35:38 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-05-19 04:35:39 -0700 |
| commit | 2e5b4c52c59f838af0e0a2e5550dcffa4d3756cd (patch) | |
| tree | 967fa9bbae25a644b6b1174eb28b6dcb686a8afa /src/gpu/GrAARectRenderer.cpp | |
| parent | 50b58e6fbcc50785ceffacb2c51b22c6e67a7ab7 (diff) | |
Fix GrAARectRenderer's handling of unsorted nested rects
What is going on here is that, after the mapPoints in fillAANestedRects, devInside was upside down so the isEmpty check was always firing. I don't see why we need to avoid having devInside sorted.
BUG=488103
Review URL: https://codereview.chromium.org/1135753004
Diffstat (limited to 'src/gpu/GrAARectRenderer.cpp')
| -rw-r--r-- | src/gpu/GrAARectRenderer.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/gpu/GrAARectRenderer.cpp b/src/gpu/GrAARectRenderer.cpp index 9243e212e4..a4656a7c3e 100644 --- a/src/gpu/GrAARectRenderer.cpp +++ b/src/gpu/GrAARectRenderer.cpp @@ -808,12 +808,11 @@ void GrAARectRenderer::fillAANestedRects(GrDrawTarget* target, const SkMatrix& viewMatrix, const SkRect rects[2]) { SkASSERT(viewMatrix.rectStaysRect()); - SkASSERT(!rects[1].isEmpty()); + SkASSERT(!rects[0].isEmpty() && !rects[1].isEmpty()); SkRect devOutside, devInside; viewMatrix.mapRect(&devOutside, rects[0]); - // can't call mapRect for devInside since it calls sort - viewMatrix.mapPoints((SkPoint*)&devInside, (const SkPoint*)&rects[1], 2); + viewMatrix.mapRect(&devInside, rects[1]); if (devInside.isEmpty()) { this->fillAARect(target, pipelineBuilder, color, viewMatrix, devOutside, devOutside); |