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

src/xps/SkXPSDevice.cpp

 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkTypes.h"
 #if defined(SK_BUILD_FOR_WIN32)
 
@@ skipping 1639 matching lines @@
                            &ppuScale,
                            d.fRC->getBounds(),
                            &clipIRect);
 
         //[Fillable-path -> Pixel-path]
         SkPath* pixelPath = pathIsMutable ? fillablePath : &modifiedPath;
         fillablePath->transform(matrix, pixelPath);
 
         SkMask* mask = nullptr;
 
+        SkASSERT(SkPaint::kFill_Style == paint->getStyle() ||
+                 (SkPaint::kStroke_Style == paint->getStyle() && 0 == paint->getStrokeWidth()));
+        SkStrokeRec::InitStyle style = (SkPaint::kFill_Style == paint->getStyle())
+                                            ? SkStrokeRec::kFill_InitStyle
+                                            : SkStrokeRec::kHairline_InitStyle;
         //[Pixel-path -> Mask]
         SkMask rasteredMask;
         if (SkDraw::DrawToMask(
                         *pixelPath,
                         &clipIRect,
                         filter,  //just to compute how much to draw.
                         &matrix,
                         &rasteredMask,
                         SkMask::kComputeBoundsAndRenderImage_CreateMode,
-                        paint->getStyle())) {
+                        style)) {
 
             SkAutoMaskFreeImage rasteredAmi(rasteredMask.fImage);
             mask = &rasteredMask;
 
             //[Mask -> Mask]
             SkMask filteredMask;
             if (filter->filterMask(&filteredMask, rasteredMask, matrix, nullptr)) {
                 mask = &filteredMask;
             }
             SkAutoMaskFreeImage filteredAmi(filteredMask.fImage);
@@ skipping 586 matching lines @@
         //SkXPSDevice* dev = new SkXPSDevice(this);
         //SkSize s = SkSize::Make(width, height);
         //dev->BeginCanvas(s, s, SkMatrix::I());
         //return dev;
     }
 #endif
     return new SkXPSDevice(this->fXpsFactory.get());
 }
 
 #endif//defined(SK_BUILD_FOR_WIN32)