Take SkStrokeRec::InitStyle rather than SkPaint::Style in mask filter and DrawMask

src/gpu/GrBlurUtils.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrBlurUtils.h"
 #include "GrDrawContext.h"
 #include "GrCaps.h"
@@ skipping 36 matching lines @@
 }
 
 static bool sw_draw_with_mask_filter(GrDrawContext* drawContext,
                                      GrTextureProvider* textureProvider,
                                      const GrClip& clipData,
                                      const SkMatrix& viewMatrix,
                                      const SkPath& devPath,
                                      const SkMaskFilter* filter,
                                      const SkIRect& clipBounds,
                                      GrPaint* grp,
-                                     SkPaint::Style style) {
+                                     SkStrokeRec::InitStyle style) {
     SkMask  srcM, dstM;
 
     if (!SkDraw::DrawToMask(devPath, &clipBounds, filter, &viewMatrix, &srcM,
                             SkMask::kComputeBoundsAndRenderImage_CreateMode, style)) {
         return false;
     }
     SkAutoMaskFreeImage autoSrc(srcM.fImage);
 
     if (!filter->filterMask(&dstM, srcM, viewMatrix, nullptr)) {
         return false;
@@ skipping 21 matching lines @@
 
     SkRect maskRect = SkRect::Make(dstM.fBounds);
 
     return draw_mask(drawContext, clipData, viewMatrix, maskRect, grp, texture);
 }
 
 // Create a mask of 'devPath' and place the result in 'mask'.
 static sk_sp<GrTexture> create_mask_GPU(GrContext* context,
                                         SkRect* maskRect,
                                         const SkPath& devPath,
-                                        const GrStrokeInfo& strokeInfo,
+                                        SkStrokeRec::InitStyle style,
                                         bool doAA,
                                         int sampleCnt) {
     // This mask will ultimately be drawn as a non-AA rect (see draw_mask).
     // Non-AA rects have a bad habit of snapping arbitrarily. Integerize here
     // so the mask draws in a reproducible manner.
     *maskRect = SkRect::Make(maskRect->roundOut());
 
     if (!doAA) {
         // Don't need MSAA if mask isn't AA
         sampleCnt = 0;
@@ skipping 22 matching lines @@
     tempPaint.setCoverageSetOpXPFactory(SkRegion::kReplace_Op);
 
     // setup new clip
     const SkRect clipRect = SkRect::MakeWH(maskRect->width(), maskRect->height());
     GrClip clip(clipRect);
 
     // Draw the mask into maskTexture with the path's integerized top-left at
     // the origin using tempPaint.
     SkMatrix translate;
     translate.setTranslate(-maskRect->fLeft, -maskRect->fTop);
-    drawContext->drawPath(clip, tempPaint, translate, devPath, strokeInfo);
+    drawContext->drawPath(clip, tempPaint, translate, devPath, GrStrokeInfo(style));
     return drawContext->asTexture();;
 }
 
 static void draw_path_with_mask_filter(GrContext* context,
                                        GrDrawContext* drawContext,
                                        const GrClip& clip,
                                        GrPaint* paint,
                                        const SkMatrix& viewMatrix,
                                        const SkMaskFilter* maskFilter,
                                        const SkPathEffect* pathEffect,
-                                       const GrStrokeInfo& origStrokeInfo,
+                                       const GrStrokeInfo& strokeInfo,
                                        SkPath* pathPtr,
                                        bool pathIsMutable) {
     SkASSERT(maskFilter);
 
     SkIRect clipBounds;
     clip.getConservativeBounds(drawContext->width(), drawContext->height(), &clipBounds);
     SkTLazy<SkPath> tmpPath;
-    GrStrokeInfo strokeInfo(origStrokeInfo);
 
     static const SkRect* cullRect = nullptr;  // TODO: what is our bounds?
 
     SkASSERT(strokeInfo.isDashed() || !pathEffect);
-
-    if (!strokeInfo.isHairlineStyle()) {
+    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, &strokeInfo, cullRect)) {
+            if (pathEffect->filterPath(strokedPath, *pathPtr, &rec, cullRect)) {
                 pathPtr = strokedPath;
                 pathPtr->setIsVolatile(true);
                 pathIsMutable = true;
             }
-            strokeInfo.removeDash();
         }
-        if (strokeInfo.applyToPath(strokedPath, *pathPtr)) {
+        if (rec.applyToPath(strokedPath, *pathPtr)) {
             // Apply the stroke to the path if there is one
             pathPtr = strokedPath;
             pathPtr->setIsVolatile(true);
             pathIsMutable = true;
-            strokeInfo.setFillStyle();
         }
+        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);
     }
 
     // transform the path into device space
     pathPtr->transform(viewMatrix, devPathPtr);
 
     SkRect maskRect;
     if (maskFilter->canFilterMaskGPU(SkRRect::MakeRect(devPathPtr->getBounds()),
                                      clipBounds,
                                      viewMatrix,
                                      &maskRect)) {
         SkIRect finalIRect;
         maskRect.roundOut(&finalIRect);
         if (clip_bounds_quick_reject(clipBounds, finalIRect)) {
             // clipped out
             return;
         }
 
         if (maskFilter->directFilterMaskGPU(context->textureProvider(),
                                             drawContext,
                                             paint,
                                             clip,
                                             viewMatrix,
-                                            strokeInfo,
+                                            SkStrokeRec(maskStyle),
                                             *devPathPtr)) {
             // the mask filter was able to draw itself directly, so there's nothing
             // left to do.
             return;
         }
 
         sk_sp<GrTexture> mask(create_mask_GPU(context,
                                               &maskRect,
                                               *devPathPtr,
-                                              strokeInfo,
+                                              maskStyle,
                                               paint->isAntiAlias(),
                                               drawContext->numColorSamples()));
         if (mask) {
             GrTexture* filtered;
 
             if (maskFilter->filterMaskGPU(mask.get(), viewMatrix, maskRect, &filtered, true)) {
                 // filterMaskGPU gives us ownership of a ref to the result
                 SkAutoTUnref<GrTexture> atu(filtered);
                 if (draw_mask(drawContext, clip, viewMatrix, maskRect, paint, filtered)) {
                     // This path is completely drawn
                     return;
                 }
             }
         }
     }
 
-    // draw the mask on the CPU - this is a fallthrough path in case the
-    // GPU path fails
-    SkPaint::Style style = strokeInfo.isHairlineStyle() ? SkPaint::kStroke_Style :
-                                                          SkPaint::kFill_Style;
     sw_draw_with_mask_filter(drawContext, context->textureProvider(),
                              clip, viewMatrix, *devPathPtr,
-                             maskFilter, clipBounds, paint, style);
+                             maskFilter, clipBounds, paint, maskStyle);
 }
 
 void GrBlurUtils::drawPathWithMaskFilter(GrContext* context,
                                          GrDrawContext* drawContext,
                                          const GrClip& clip,
                                          const SkPath& origPath,
                                          GrPaint* paint,
                                          const SkMatrix& viewMatrix,
                                          const SkMaskFilter* mf,
                                          const SkPathEffect* pathEffect,
@@ skipping 82 matching lines @@
     }
 
     if (paint.getMaskFilter()) {
         draw_path_with_mask_filter(context, drawContext, clip, &grPaint, viewMatrix,
                                    paint.getMaskFilter(), pathEffect, strokeInfo,
                                    pathPtr, pathIsMutable);
     } else {
         drawContext->drawPath(clip, grPaint, viewMatrix, *pathPtr, strokeInfo);
     }
 }