Beginning to refactor nvpr code

src/gpu/gl/GrGLPathRendering.h

Index: src/gpu/gl/GrGLPathRendering.h
diff --git a/src/gpu/gl/GrGLPathRendering.h b/src/gpu/gl/GrGLPathRendering.h
index 5133506a427bb1ad244c0d31cb039cbbb5314f4e..f3145636886389e022dc5d6ef33c80f6e1108439 100644
--- a/src/gpu/gl/GrGLPathRendering.h
+++ b/src/gpu/gl/GrGLPathRendering.h
@@ -39,11 +39,11 @@ public:
     virtual GrPathRange* createGlyphs(const SkTypeface*,
                                       const SkDescriptor*,
                                       const SkStrokeRec&) SK_OVERRIDE;
-    virtual void stencilPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
-    virtual void drawPath(const GrPath*, SkPath::FillType) SK_OVERRIDE;
+    virtual void stencilPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
+    virtual void drawPath(const GrPath*, const GrStencilSettings&) SK_OVERRIDE;
     virtual void drawPaths(const GrPathRange*, const uint32_t indices[], int count,
                            const float transforms[], PathTransformType,
-                           SkPath::FillType) SK_OVERRIDE;
+                           const GrStencilSettings&) SK_OVERRIDE;
 
     /* Called when the 3D context state is unknown. */
     void resetContext();
@@ -107,7 +107,7 @@ private:
     };
     const Caps& caps() const { return fCaps; }
 
-    void flushPathStencilSettings(SkPath::FillType fill);
+    void flushPathStencilSettings(const GrStencilSettings&);
 
     // NV_path_rendering v1.2
     void stencilThenCoverFillPath(GrGLuint path, GrGLenum fillMode,