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

src/effects/SkLayerRasterizer.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 "SkLayerRasterizer.h"
 #include "SkDraw.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkMask.h"
 #include "SkMaskFilter.h"
 #include "SkPaint.h"
 #include "SkPath.h"
 #include "SkPathEffect.h"
 #include "../core/SkRasterClip.h"
+#include "../core/SkStrokeRec.h"
 #include "SkXfermode.h"
 #include <new>
 
 struct SkLayerRasterizer_Rec {
     SkPaint     fPaint;
     SkVector    fOffset;
 };
 
 SkLayerRasterizer::SkLayerRasterizer() : fLayers(new SkDeque(sizeof(SkLayerRasterizer_Rec))) {}
 
@@ skipping 42 matching lines @@
         {
             SkMatrix m = matrix;
             m.preTranslate(rec->fOffset.fX, rec->fOffset.fY);
             p->transform(m, &devPath);
         }
 
         SkMask  mask;
         if (!SkDraw::DrawToMask(devPath, clipBounds, paint.getMaskFilter(),
                                 &matrix, &mask,
                                 SkMask::kJustComputeBounds_CreateMode,
-                                SkPaint::kFill_Style)) {
+                                SkStrokeRec::kFill_InitStyle)) {
             return false;
         }
 
         bounds->join(mask.fBounds);
     }
     return true;
 }
 
 bool SkLayerRasterizer::onRasterize(const SkPath& path, const SkMatrix& matrix,
                                     const SkIRect* clipBounds,
@@ skipping 125 matching lines @@
     while ((recOrig = static_cast<SkLayerRasterizer_Rec*>(iter.next())) != nullptr) {
         SkDEBUGCODE(count++);
         SkLayerRasterizer_Rec* recCopy = static_cast<SkLayerRasterizer_Rec*>(layers->push_back());
         new (&recCopy->fPaint) SkPaint(recOrig->fPaint);
         recCopy->fOffset = recOrig->fOffset;
     }
     SkASSERT(fLayers->count() == count);
     SkASSERT(layers->count() == count);
     return sk_sp<SkLayerRasterizer>(new SkLayerRasterizer(layers));
 }