diff options
author | Robert Phillips <robertphillips@google.com> | 2018-04-23 15:12:00 +0000 |
---|---|---|
committer | Skia Commit-Bot <skia-commit-bot@chromium.org> | 2018-04-23 15:12:11 +0000 |
commit | c90b4dbec5b6891fc257945aa95c0e39cd5f7a7c (patch) | |
tree | 6136e46c2ff13d2545b8fe94ecb5b98a358bc709 /src/gpu/GrRenderTargetContext.cpp | |
parent | a96a1010711754e8320177a66aadc283930932b7 (diff) |
Reland "Prevent masked solid-color draws from being turned into clears"
This reverts commit f92bb3785fa8015cde9f379be52dedfce5abc290.
Reason for revert: The new unit test has been suppressed on ANGLE
Original change's description:
> Revert "Prevent masked solid-color draws from being turned into clears"
>
> This reverts commit e9f2bbe082e9e1eb9d76e3043adedc9443427d8d.
>
> Reason for revert: ANGLE
>
> Original change's description:
> > Prevent masked solid-color draws from being turned into clears
> >
> > GrRenderTargetContext::drawRect was eliding a BlurMask filtered circle.
> >
> > Bug: skia:7765
> > Change-Id: Id98c059f7d786ee5c9bca839c8e099997ff2aedb
> > Reviewed-on: https://skia-review.googlesource.com/122793
> > Reviewed-by: Brian Salomon <bsalomon@google.com>
>
> TBR=bsalomon@google.com,robertphillips@google.com
>
> Change-Id: I1b7752eab0fcf55ab6248eed587fd85d438efd78
> No-Presubmit: true
> No-Tree-Checks: true
> No-Try: true
> Bug: skia:7765
> Reviewed-on: https://skia-review.googlesource.com/122960
> Reviewed-by: Robert Phillips <robertphillips@google.com>
> Commit-Queue: Robert Phillips <robertphillips@google.com>
TBR=bsalomon@google.com,robertphillips@google.com
Change-Id: If432c24548ef0f6df4fd6a06aa3b1fb38ba793b8
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: skia:7765
Reviewed-on: https://skia-review.googlesource.com/123000
Reviewed-by: Robert Phillips <robertphillips@google.com>
Commit-Queue: Robert Phillips <robertphillips@google.com>
Diffstat (limited to 'src/gpu/GrRenderTargetContext.cpp')
-rw-r--r-- | src/gpu/GrRenderTargetContext.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gpu/GrRenderTargetContext.cpp b/src/gpu/GrRenderTargetContext.cpp index 576f348c01..aae0248ae4 100644 --- a/src/gpu/GrRenderTargetContext.cpp +++ b/src/gpu/GrRenderTargetContext.cpp @@ -503,7 +503,7 @@ void GrRenderTargetContext::drawRect(const GrClip& clip, AutoCheckFlush acf(this->drawingManager()); const SkStrokeRec& stroke = style->strokeRec(); - if (stroke.getStyle() == SkStrokeRec::kFill_Style) { + if (stroke.getStyle() == SkStrokeRec::kFill_Style && !paint.numCoverageFragmentProcessors()) { // Check if this is a full RT draw and can be replaced with a clear. We don't bother // checking cases where the RT is fully inside a stroke. SkRect rtRect = fRenderTargetProxy->getBoundsRect(); |