diff options
| author |  robertphillips <robertphillips@google.com> | 2015-10-26 14:11:15 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-10-26 14:11:15 -0700 |
| commit | ee7d516d4bc13a0e449ccdc55a3858845516b864 (patch) | |
| tree | a9acd02b64d846588370227c00c1d0537255629c /src | |
| parent | e6d2024c689199b09df0d7048fc5252179d52aff (diff) | |
Revert of Fix up the clip mask manager's creation of paths (w.r.t. volatility) (patchset #1 id:1 of https://codereview.chromium.org/1419403002/ )
Reason for revert:
Logic may be incorrect
Original issue's description:
> Fix up the clip mask manager's creation of paths (w.r.t. volatility)
>
> I don't expect this to make any difference (perf-wise) but it seems more correct.
>
> This CL relies on https://codereview.chromium.org/1421533007/ (Fix ClipMaskManager's SW-fallback logic)
>
> Committed: https://skia.googlesource.com/skia/+/953fe3139fa60ce56abcfa45a3647d924e637083
TBR=jvanverth@google.com,bsalomon@google.com
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Review URL: https://codereview.chromium.org/1415413007
Diffstat (limited to 'src')
| -rw-r--r-- | src/core/SkClipStack.cpp | 3 | ||||
| -rw-r--r-- | src/gpu/GrClipMaskManager.cpp | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/SkClipStack.cpp b/src/core/SkClipStack.cpp index 4227eeac68..f54d57fd0b 100644 --- a/src/core/SkClipStack.cpp +++ b/src/core/SkClipStack.cpp @@ -136,17 +136,14 @@ void SkClipStack::Element::asPath(SkPath* path) const { switch (fType) { case kEmpty_Type: path->reset(); - path->setIsVolatile(true); break; case kRect_Type: path->reset(); path->addRect(this->getRect()); - path->setIsVolatile(true); break; case kRRect_Type: path->reset(); path->addRRect(fRRect); - path->setIsVolatile(true); break; case kPath_Type: *path = *fPath.get(); diff --git a/src/gpu/GrClipMaskManager.cpp b/src/gpu/GrClipMaskManager.cpp index 4caa809206..b87788b286 100644 --- a/src/gpu/GrClipMaskManager.cpp +++ b/src/gpu/GrClipMaskManager.cpp @@ -448,6 +448,7 @@ bool GrClipMaskManager::drawElement(GrPipelineBuilder* pipelineBuilder, default: { SkPath path; element->asPath(&path); + path.setIsVolatile(true); if (path.isInverseFillType()) { path.toggleInverseFillType(); } |