AuroraMiddleware/skia2
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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/ )

Browse Source 
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
This commit is contained in:
robertphillips 2015-10-26 14:11:15 -07:00 committed by Commit bot
parent e6d2024c68
commit ee7d516d4b
2 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/core/SkClipStack.cpp
View File

@ -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();

1
src/gpu/GrClipMaskManager.cpp
View File

@ -448,6 +448,7 @@ bool GrClipMaskManager::drawElement(GrPipelineBuilder* pipelineBuilder,
default: {
SkPath path;
element->asPath(&path);
path.setIsVolatile(true);
if (path.isInverseFillType()) {
path.toggleInverseFillType();
}