| Index: tests/GrShapeTest.cpp
|
| diff --git a/tests/GrShapeTest.cpp b/tests/GrShapeTest.cpp
|
| index e03570564ac8ff1cbaaefc446cc256e6737d1bef..f0173de2a46d86a50839a33eb456c763c64dfb6c 100644
|
| --- a/tests/GrShapeTest.cpp
|
| +++ b/tests/GrShapeTest.cpp
|
| @@ -88,17 +88,23 @@ private:
|
| SkPath postAllStyle;
|
|
|
| fBase.asPath(&preStyle);
|
| - SkStrokeRec postPathEffectStrokeRec(SkStrokeRec::kFill_InitStyle);
|
| - if (fBase.style().applyPathEffectToPath(&postPathEffect, &postPathEffectStrokeRec,
|
| - preStyle)) {
|
| + SkStrokeRec postPEStrokeRec(SkStrokeRec::kFill_InitStyle);
|
| + if (fBase.style().applyPathEffectToPath(&postPathEffect, &postPEStrokeRec, preStyle)) {
|
| + // run postPathEffect through GrShape to get any geometry reductions that would have
|
| + // occurred to fAppliedPE.
|
| + GrShape(postPathEffect, GrStyle(postPEStrokeRec, nullptr)).asPath(&postPathEffect);
|
| +
|
| SkPath testPath;
|
| fAppliedPE.asPath(&testPath);
|
| REPORTER_ASSERT(r, testPath == postPathEffect);
|
| - REPORTER_ASSERT(r,
|
| - postPathEffectStrokeRec.hasEqualEffect(fAppliedPE.style().strokeRec()));
|
| + REPORTER_ASSERT(r, postPEStrokeRec.hasEqualEffect(fAppliedPE.style().strokeRec()));
|
| }
|
| SkStrokeRec::InitStyle fillOrHairline;
|
| if (fBase.style().applyToPath(&postAllStyle, &fillOrHairline, preStyle)) {
|
| + // run postPathEffect through GrShape to get any reductions that would have occurred
|
| + // to fAppliedFull.
|
| + GrShape(postAllStyle, GrStyle(fillOrHairline)).asPath(&postAllStyle);
|
| +
|
| SkPath testPath;
|
| fAppliedFull.asPath(&testPath);
|
| REPORTER_ASSERT(r, testPath == postAllStyle);
|
|
|