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

src/core/SkMaskFilter.cpp

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkMaskFilter.h"
 #include "SkBlitter.h"
@@ skipping 196 matching lines @@
 }
 
 static int countNestedRects(const SkPath& path, SkRect rects[2]) {
     if (path.isNestedFillRects(rects)) {
         return 2;
     }
     return path.isRect(&rects[0]);
 }
 
 bool SkMaskFilter::filterRRect(const SkRRect& devRRect, const SkMatrix& matrix,
-                               const SkRasterClip& clip, SkBlitter* blitter,
-                               SkPaint::Style style) const {
+                               const SkRasterClip& clip, SkBlitter* blitter) const {
     // Attempt to speed up drawing by creating a nine patch. If a nine patch
     // cannot be used, return false to allow our caller to recover and perform
     // the drawing another way.
     NinePatch patch;
     patch.fMask.fImage = nullptr;
     if (kTrue_FilterReturn != this->filterRRectToNine(devRRect, matrix,
                                                       clip.getBounds(),
                                                       &patch)) {
         SkASSERT(nullptr == patch.fMask.fImage);
         return false;
     }
     draw_nine(patch.fMask, patch.fOuterRect, patch.fCenter, true, clip, blitter);
     return true;
 }
 
 bool SkMaskFilter::filterPath(const SkPath& devPath, const SkMatrix& matrix,
                               const SkRasterClip& clip, SkBlitter* blitter,
-                              SkPaint::Style style) const {
+                              SkStrokeRec::InitStyle style) const {
     SkRect rects[2];
     int rectCount = 0;
-    if (SkPaint::kFill_Style == style) {
+    if (SkStrokeRec::kFill_InitStyle == style) {
         rectCount = countNestedRects(devPath, rects);
     }
     if (rectCount > 0) {
         NinePatch patch;
 
         switch (this->filterRectsToNine(rects, rectCount, matrix, clip.getBounds(), &patch)) {
             case kFalse_FilterReturn:
                 SkASSERT(nullptr == patch.fMask.fImage);
                 return false;
 
@@ skipping 101 matching lines @@
     srcM.fRowBytes = 0;
     srcM.fFormat = SkMask::kA8_Format;
 
     SkIPoint margin;    // ignored
     if (this->filterMask(&dstM, srcM, SkMatrix::I(), &margin)) {
         dst->set(dstM.fBounds);
     } else {
         dst->set(srcM.fBounds);
     }
 }