Replace GrStrokeInfo with GrStyle.

src/gpu/GrBlurUtils.cpp

Index: src/gpu/GrBlurUtils.cpp
diff --git a/src/gpu/GrBlurUtils.cpp b/src/gpu/GrBlurUtils.cpp
index aee158113b759275fd34635eaea67a5feec82332..386cab6fba61cc7e8da439aea1569be5acd5df6b 100644
--- a/src/gpu/GrBlurUtils.cpp
+++ b/src/gpu/GrBlurUtils.cpp
@@ -10,7 +10,7 @@
 #include "GrCaps.h"
 #include "GrContext.h"
 #include "effects/GrSimpleTextureEffect.h"
-#include "GrStrokeInfo.h"
+#include "GrStyle.h"
 #include "GrTexture.h"
 #include "GrTextureProvider.h"
 #include "SkDraw.h"
@@ -54,11 +54,10 @@ static bool sw_draw_with_mask_filter(GrDrawContext* drawContext,
                                      const SkMaskFilter* filter,
                                      const SkIRect& clipBounds,
                                      GrPaint* grp,
-                                     SkStrokeRec::InitStyle style) {
+                                     SkStrokeRec::InitStyle fillOrHairline) {
     SkMask  srcM, dstM;
-
     if (!SkDraw::DrawToMask(devPath, &clipBounds, filter, &viewMatrix, &srcM,
-                            SkMask::kComputeBoundsAndRenderImage_CreateMode, style)) {
+                            SkMask::kComputeBoundsAndRenderImage_CreateMode, fillOrHairline)) {
         return false;
     }
     SkAutoMaskFreeImage autoSrc(srcM.fImage);
@@ -139,7 +138,7 @@ static sk_sp<GrTexture> create_mask_GPU(GrContext* context,
     // the origin using tempPaint.
     SkMatrix translate;
     translate.setTranslate(-maskRect->fLeft, -maskRect->fTop);

[robertphillips, 2016/05/09 20:05:28]

should this 'style' also be called 'fillOrHairline' ?

[bsalomon, 2016/05/09 20:38:55]

Done.

-    drawContext->drawPath(clip, tempPaint, translate, devPath, GrStrokeInfo(style));
+    drawContext->drawPath(clip, tempPaint, translate, devPath, GrStyle(style));
     return drawContext->asTexture();;
 }
 
@@ -149,52 +148,50 @@ static void draw_path_with_mask_filter(GrContext* context,
                                        GrPaint* paint,
                                        const SkMatrix& viewMatrix,
                                        const SkMaskFilter* maskFilter,
-                                       const SkPathEffect* pathEffect,
-                                       const GrStrokeInfo& strokeInfo,
-                                       SkPath* pathPtr,
+                                       const GrStyle& style,
+                                       const SkPath* path,
                                        bool pathIsMutable) {
     SkASSERT(maskFilter);
 
     SkIRect clipBounds;
     clip.getConservativeBounds(drawContext->width(), drawContext->height(), &clipBounds);
     SkTLazy<SkPath> tmpPath;
+    SkStrokeRec::InitStyle fillOrHairline;
 
-    static const SkRect* cullRect = nullptr;  // TODO: what is our bounds?
-
-    SkASSERT(strokeInfo.isDashed() || !pathEffect);
-    SkStrokeRec::InitStyle maskStyle;
-    if (strokeInfo.isHairlineStyle()) {
-        maskStyle = SkStrokeRec::kHairline_InitStyle;
-    } else {
-        SkPath* strokedPath = pathIsMutable ? pathPtr : tmpPath.init();
-        SkStrokeRec rec = strokeInfo;
-        if (strokeInfo.isDashed()) {
-            if (pathEffect->filterPath(strokedPath, *pathPtr, &rec, cullRect)) {
-                pathPtr = strokedPath;
-                pathPtr->setIsVolatile(true);
-                pathIsMutable = true;
-            }
-        }
-        if (rec.applyToPath(strokedPath, *pathPtr)) {
-            // Apply the stroke to the path if there is one
-            pathPtr = strokedPath;
-            pathPtr->setIsVolatile(true);
-            pathIsMutable = true;
+    // We just fully apply the style here.
+    if (style.applies()) {
+        if (!style.applyToPath(tmpPath.init(), &fillOrHairline, *path,
+                                   GrStyle::MatrixToScaleFactor(viewMatrix))) {
+            return;
         }
-        maskStyle = SkStrokeRec::kFill_InitStyle;
-    }
-
-    // avoid possibly allocating a new path in transform if we can
-    SkPath* devPathPtr = pathIsMutable ? pathPtr : tmpPath.init();
-    if (!pathIsMutable) {
-        devPathPtr->setIsVolatile(true);
+        pathIsMutable = true;
+        path = tmpPath.get();
+    } else if (style.isSimpleHairline()) {
+        fillOrHairline = SkStrokeRec::kHairline_InitStyle;
+    } else {
+        SkASSERT(style.isSimpleFill());
+        fillOrHairline = SkStrokeRec::kFill_InitStyle;
     }
 
     // transform the path into device space
-    pathPtr->transform(viewMatrix, devPathPtr);
+    if (!viewMatrix.isIdentity()) {
+        SkPath* result;
+        if (pathIsMutable) {
+            result = const_cast<SkPath*>(path);
+        } else {
+            if (!tmpPath.isValid()) {
+                tmpPath.init();
+            }
+            result = tmpPath.get();
+        }
+        path->transform(viewMatrix, result);
+        path = result;
+        result->setIsVolatile(true);
+        pathIsMutable = true;
+    }
 
     SkRect maskRect;
-    if (maskFilter->canFilterMaskGPU(SkRRect::MakeRect(devPathPtr->getBounds()),
+    if (maskFilter->canFilterMaskGPU(SkRRect::MakeRect(path->getBounds()),
                                      clipBounds,
                                      viewMatrix,
                                      &maskRect)) {
@@ -210,8 +207,8 @@ static void draw_path_with_mask_filter(GrContext* context,
                                             paint,
                                             clip,
                                             viewMatrix,
-                                            SkStrokeRec(maskStyle),
-                                            *devPathPtr)) {
+                                            SkStrokeRec(fillOrHairline),
+                                            *path)) {
             // the mask filter was able to draw itself directly, so there's nothing
             // left to do.
             return;
@@ -219,8 +216,8 @@ static void draw_path_with_mask_filter(GrContext* context,
 
         sk_sp<GrTexture> mask(create_mask_GPU(context,
                                               &maskRect,
-                                              *devPathPtr,
-                                              maskStyle,
+                                              *path,
+                                              fillOrHairline,
                                               paint->isAntiAlias(),
                                               drawContext->numColorSamples()));
         if (mask) {
@@ -238,96 +235,59 @@ static void draw_path_with_mask_filter(GrContext* context,
     }
 
     sw_draw_with_mask_filter(drawContext, context->textureProvider(),
-                             clip, viewMatrix, *devPathPtr,
-                             maskFilter, clipBounds, paint, maskStyle);
+                             clip, viewMatrix, *path,
+                             maskFilter, clipBounds, paint, fillOrHairline);
 }
 
 void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
                                          GrDrawContext* drawContext,
                                          const GrClip& clip,
-                                         const SkPath& origPath,
+                                         const SkPath& path,
                                          GrPaint* paint,
                                          const SkMatrix& viewMatrix,
                                          const SkMaskFilter* mf,
-                                         const SkPathEffect* pathEffect,
-                                         const GrStrokeInfo& origStrokeInfo,
+                                         const GrStyle& style,
                                          bool pathIsMutable) {
-    SkPath* pathPtr = const_cast<SkPath*>(&origPath);
-
-    SkTLazy<SkPath> tmpPath;
-    GrStrokeInfo strokeInfo(origStrokeInfo);
-
-    if (!strokeInfo.isDashed() && pathEffect && pathEffect->filterPath(tmpPath.init(), *pathPtr,
-                                                                       &strokeInfo, nullptr)) {
-        pathPtr = tmpPath.get();
-        pathPtr->setIsVolatile(true);
-        pathIsMutable = true;
-        pathEffect = nullptr;
-    }
-
-    draw_path_with_mask_filter(context, drawContext, clip, paint, viewMatrix, mf, pathEffect,
-                               strokeInfo, pathPtr, pathIsMutable);
+    draw_path_with_mask_filter(context, drawContext, clip, paint, viewMatrix, mf,
+                               style, &path, pathIsMutable);
 }
 
 void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
                                          GrDrawContext* drawContext,
                                          const GrClip& clip,
-                                         const SkPath& origSrcPath,
+                                         const SkPath& origPath,
                                          const SkPaint& paint,
                                          const SkMatrix& origViewMatrix,
                                          const SkMatrix* prePathMatrix,
                                          const SkIRect& clipBounds,
                                          bool pathIsMutable) {
-    SkASSERT(!pathIsMutable || origSrcPath.isVolatile());
-
-    GrStrokeInfo strokeInfo(paint);
-    // comment out the line below to determine if it is the reason that the chrome mac perf bot
-    // has begun crashing
-    // strokeInfo.setResScale(SkDraw::ComputeResScaleForStroking(origViewMatrix));
+    SkASSERT(!pathIsMutable || origPath.isVolatile());
 
+    GrStyle style(paint);
     // If we have a prematrix, apply it to the path, optimizing for the case
     // where the original path can in fact be modified in place (even though
     // its parameter type is const).
-    SkPath* pathPtr = const_cast<SkPath*>(&origSrcPath);
+
+    const SkPath* path = &origPath;
     SkTLazy<SkPath> tmpPath;
-    SkTLazy<SkPath> effectPath;
-    SkPathEffect* pathEffect = paint.getPathEffect();
 
     SkMatrix viewMatrix = origViewMatrix;
 
     if (prePathMatrix) {
-        // stroking, path effects, and blurs are supposed to be applied *after* the prePathMatrix.
-        // The pre-path-matrix also should not affect shading.
-        if (!paint.getMaskFilter() && !pathEffect && !paint.getShader() &&
-            (strokeInfo.isFillStyle() || strokeInfo.isHairlineStyle())) {
+        // Styling, blurs, and shading are supposed to be applied *after* the prePathMatrix.
+        if (!paint.getMaskFilter() && !paint.getShader() && !style.applies()) {
             viewMatrix.preConcat(*prePathMatrix);
         } else {
-            SkPath* result = pathPtr;
-
-            if (!pathIsMutable) {
-                result = tmpPath.init();
-                result->setIsVolatile(true);
-                pathIsMutable = true;
-            }
-            // should I push prePathMatrix on our MV stack temporarily, instead
-            // of applying it here? See SkDraw.cpp
-            pathPtr->transform(*prePathMatrix, result);
-            pathPtr = result;
+            SkPath* result = pathIsMutable ? const_cast<SkPath*>(path) : tmpPath.init();
+            pathIsMutable = true;
+            path->transform(*prePathMatrix, result);
+            path = result;
+            result->setIsVolatile(true);
         }
     }
     // at this point we're done with prePathMatrix
     SkDEBUGCODE(prePathMatrix = (const SkMatrix*)0x50FF8001;)
 
-    SkTLazy<SkPath> tmpPath2;
-
-    if (!strokeInfo.isDashed() && pathEffect &&
-        pathEffect->filterPath(tmpPath2.init(), *pathPtr, &strokeInfo, nullptr)) {
-        pathPtr = tmpPath2.get();
-        pathPtr->setIsVolatile(true);
-        pathIsMutable = true;
-        pathEffect = nullptr;
-    }
-
     GrPaint grPaint;
     if (!SkPaintToGrPaint(context, paint, viewMatrix, drawContext->isGammaCorrect(),
                           &grPaint)) {
@@ -336,9 +296,9 @@ void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
 
     if (paint.getMaskFilter()) {
         draw_path_with_mask_filter(context, drawContext, clip, &grPaint, viewMatrix,
-                                   paint.getMaskFilter(), pathEffect, strokeInfo,
-                                   pathPtr, pathIsMutable);
+                                   paint.getMaskFilter(), style,
+                                   path, pathIsMutable);
     } else {
-        drawContext->drawPath(clip, grPaint, viewMatrix, *pathPtr, strokeInfo);
+        drawContext->drawPath(clip, grPaint, viewMatrix, *path, style);
     }
 }