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

src/core/SkMaskFilter.cpp

Index: src/core/SkMaskFilter.cpp
diff --git a/src/core/SkMaskFilter.cpp b/src/core/SkMaskFilter.cpp
index cacc0524141cd9a5eb0b533c791f0cb670e7d117..f78ae7a8913a5c79bc00624fbf70e992e5ebe655 100644
--- a/src/core/SkMaskFilter.cpp
+++ b/src/core/SkMaskFilter.cpp
@@ -215,7 +215,7 @@ static int countNestedRects(const SkPath& path, SkRect rects[2]) {
 
 bool SkMaskFilter::filterRRect(const SkRRect& devRRect, const SkMatrix& matrix,
                                const SkRasterClip& clip, SkBlitter* blitter,

[robertphillips, 2016/05/05 19:57:20]

style is unused here ?
can we delete is as a parameter ?

[bsalomon, 2016/05/05 20:15:17]

I think so. The one caller (SkDraw::drawRRect) does take the path case if the
style is not fill and always passes kFill to this function. There is a comment
there about investigating optimizations for other cases but since the
implementation assumes kFill it's probably better to remove the parameter and
readd it in the glorious future when all TODOs are addressed.

-                               SkPaint::Style style) const {
+                               SkStrokeRec::InitStyle style) 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.
@@ -233,10 +233,10 @@ bool SkMaskFilter::filterRRect(const SkRRect& devRRect, const SkMatrix& matrix,
 
 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;

[robertphillips, 2016/05/05 19:52:06]

yoda speak ?

[bsalomon, 2016/05/05 20:15:17]

Done.

-    if (SkPaint::kFill_Style == style) {
+    if (style == SkStrokeRec::kFill_InitStyle) {
         rectCount = countNestedRects(devPath, rects);
     }
     if (rectCount > 0) {