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

include/core/SkDraw.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 SkDraw_DEFINED
 #define SkDraw_DEFINED
 
 #include "SkCanvas.h"
 #include "SkMask.h"
 #include "SkPaint.h"
+#include "SkStrokeRec.h"
 
 class SkBitmap;
 class SkClipStack;
 class SkBaseDevice;
 class SkBlitter;
 class SkMatrix;
 class SkPath;
 class SkRegion;
 class SkRasterClip;
 struct SkDrawProcs;
@@ skipping 60 matching lines @@
     }
 
     /** Helper function that creates a mask from a path and an optional maskfilter.
         Note however, that the resulting mask will not have been actually filtered,
         that must be done afterwards (by calling filterMask). The maskfilter is provided
         solely to assist in computing the mask's bounds (if the mode requests that).
     */
     static bool DrawToMask(const SkPath& devPath, const SkIRect* clipBounds,
                            const SkMaskFilter*, const SkMatrix* filterMatrix,
                            SkMask* mask, SkMask::CreateMode mode,
-                           SkPaint::Style style);
+                           SkStrokeRec::InitStyle style);
 
     enum RectType {
         kHair_RectType,
         kFill_RectType,
         kStroke_RectType,
         kPath_RectType
     };
 
     /**
      *  Based on the paint's style, strokeWidth, and the matrix, classify how
@@ skipping 44 matching lines @@
     SkBaseDevice*   fDevice;        // optional, may be null
 
 #ifdef SK_DEBUG
     void validate() const;
 #else
     void validate() const {}
 #endif
 };
 
 #endif