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

include/core/SkMaskFilter.h

 
 /*
  * 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.
  */
 
 
 #ifndef SkMaskFilter_DEFINED
 #define SkMaskFilter_DEFINED
 
 #include "SkBlurTypes.h"
 #include "SkFlattenable.h"
 #include "SkMask.h"
 #include "SkPaint.h"
+#include "SkStrokeRec.h"
 
 class GrClip;
 class GrDrawContext;
 class GrPaint;
 class GrRenderTarget;
 class GrTextureProvider;
 class SkBitmap;
 class SkBlitter;
 class SkCachedData;
 class SkMatrix;
 class SkPath;
 class SkRasterClip;
 class SkRRect;
-class SkStrokeRec;
 
 /** \class SkMaskFilter
 
     SkMaskFilter is the base class for object that perform transformations on
     an alpha-channel mask before drawing it. A subclass of SkMaskFilter may be
     installed into a SkPaint. Once there, each time a primitive is drawn, it
     is first scan converted into a SkMask::kA8_Format mask, and handed to the
     filter, calling its filterMask() method. If this returns true, then the
     new mask is used to render into the device.
 
@@ skipping 180 matching lines @@
 
 private:
     friend class SkDraw;
 
     /** Helper method that, given a path in device space, will rasterize it into a kA8_Format mask
      and then call filterMask(). If this returns true, the specified blitter will be called
      to render that mask. Returns false if filterMask() returned false.
      This method is not exported to java.
      */
     bool filterPath(const SkPath& devPath, const SkMatrix& ctm, const SkRasterClip&, SkBlitter*,
-                    SkPaint::Style) const;
+                    SkStrokeRec::InitStyle) const;
 
     /** Helper method that, given a roundRect in device space, will rasterize it into a kA8_Format
      mask and then call filterMask(). If this returns true, the specified blitter will be called
      to render that mask. Returns false if filterMask() returned false.
      */
     bool filterRRect(const SkRRect& devRRect, const SkMatrix& ctm, const SkRasterClip&,
-                     SkBlitter*, SkPaint::Style style) const;
+                     SkBlitter*) const;
 
     typedef SkFlattenable INHERITED;
 };
 
 #endif