Revert of Replace GrStrokeInfo with GrStyle.

src/gpu/GrPathRendering.h

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrPathRendering_DEFINED
 #define GrPathRendering_DEFINED
 
 #include "SkPath.h"
 #include "GrGpu.h"
 #include "GrPathRange.h"
 #include "GrPipeline.h"
 
 class SkDescriptor;
 class SkTypeface;
 class GrPath;
 class GrStencilSettings;
-class GrStyle;
+class GrStrokeInfo;
 
 /**
  * Abstract class wrapping HW path rendering API.
  *
  * The subclasses of this class use the possible HW API to render paths (as opposed to path
  * rendering implemented in Skia on top of a "3d" HW API).
  * The subclasses hold the global state needed to render paths, including shadow of the global HW
  * API state. Similar to GrGpu.
  *
  * It is expected that the lifetimes of GrGpuXX and GrXXPathRendering are the same. The call context
@@ skipping 43 matching lines @@
         /** Specifies that "inside" is computed by an odd number of edge
             crossings
         */
         kEvenOdd_FillType,
     };
 
     /**
      * Creates a new gpu path, based on the specified path and stroke and returns it.
      * The caller owns a ref on the returned path which must be balanced by a call to unref.
      *
-     * @param SkPath    the geometry.
-     * @param GrStyle   the style applied to the path. Styles with non-dash path effects are not
-     *                  allowed.
-     * @return a new GPU path object.
+     * @param skPath the path geometry.
+     * @param stroke the path stroke.
+     * @return a new path.
      */
-    virtual GrPath* createPath(const SkPath&, const GrStyle&) = 0;
+    virtual GrPath* createPath(const SkPath&, const GrStrokeInfo&) = 0;
 
     /**
-     * Creates a range of gpu paths with a common style. The caller owns a ref on the
+     * Creates a range of gpu paths with a common stroke. The caller owns a ref on the
      * returned path range which must be balanced by a call to unref.
      *
      * @param PathGenerator class that generates SkPath objects for each path in the range.
-     * @param GrStyle   the common style applied to each path in the range. Styles with non-dash
-     *                  path effects are not allowed.
+     * @param GrStrokeInfo   the common stroke applied to each path in the range.
      * @return a new path range.
      */
-    virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*, const GrStyle&) = 0;
+    virtual GrPathRange* createPathRange(GrPathRange::PathGenerator*, const GrStrokeInfo&) = 0;
 
     /**
      * Creates a range of glyph paths, indexed by glyph id. The glyphs will have an
      * inverted y-direction in order to match the raw font path data. The caller owns
      * a ref on the returned path range which must be balanced by a call to unref.
      *
      * @param SkTypeface   Typeface that defines the glyphs.
      *                     If null, the default typeface will be used.
      *
      * @param SkDescriptor Additional font configuration that specifies the font's size,
      *                     stroke, and other flags. This will generally come from an
      *                     SkGlyphCache.
      *
      *                     It is recommended to leave this value null when possible, in
      *                     which case the glyphs will be loaded directly from the font's
      *                     raw path data and sized at SkPaint::kCanonicalTextSizeForPaths.
      *                     This will result in less memory usage and more efficient paths.
      *
      *                     If non-null, the glyph paths will match the font descriptor,
      *                     including with the stroke information baked directly into
      *                     the outlines.
      *
-     * @param GrStyle      Common style that the GPU will apply to every path. Note that
-     *                     if the glyph outlines contain baked-in styles from the font
-     *                     descriptor, the GPU style will be applied on top of those
+     * @param GrStrokeInfo Common stroke that the GPU will apply to every path. Note that
+     *                     if the glyph outlines contain baked-in strokes from the font
+     *                     descriptor, the GPU stroke will be applied on top of those
      *                     outlines.
      *
      * @return a new path range populated with glyphs.
      */
     GrPathRange* createGlyphs(const SkTypeface*, const SkScalerContextEffects&,
-                              const SkDescriptor*, const GrStyle&);
+                              const SkDescriptor*, const GrStrokeInfo&);
 
     /** None of these params are optional, pointers used just to avoid making copies. */
     struct StencilPathArgs {
         StencilPathArgs(bool useHWAA,
                         GrRenderTarget* renderTarget,
                         const SkMatrix* viewMatrix,
                         const GrScissorState* scissor,
                         const GrStencilSettings* stencil)
             : fUseHWAA(useHWAA)
             , fRenderTarget(renderTarget)
@@ skipping 62 matching lines @@
                              const float transformValues[],
                              PathTransformType,
                              int count) = 0;
 
     GrGpu* fGpu;
 private:
     GrPathRendering& operator=(const GrPathRendering&);
 };
 
 #endif