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

Review URL: https://codereview.chromium.org/1419403002
This commit is contained in:
robertphillips 2015-10-26 14:37:03 -07:00 committed by Commit bot
parent 24cdec1744
commit 4d8762f8b0
2 changed files with 3 additions and 1 deletions

View File

@ -136,14 +136,17 @@ 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();

View File

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