Remove drawPathsFromRange from GrDrawContext

src/gpu/batches/GrDrawPathBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawPathBatch_DEFINED
 #define GrDrawPathBatch_DEFINED
 
 #include "GrBatchFlushState.h"
 #include "GrDrawBatch.h"
 #include "GrGpu.h"
 #include "GrPath.h"
 #include "GrPathRendering.h"
 #include "GrPathProcessor.h"
 
 #include "SkTLList.h"
 
 class GrDrawPathBatchBase : public GrDrawBatch {
 public:
     void computePipelineOptimizations(GrInitInvariantOutput* color, 
                                       GrInitInvariantOutput* coverage,
                                       GrBatchToXPOverrides* overrides) const override {
         color->setKnownFourComponents(fColor);
         coverage->setKnownSingleComponent(0xff);
         overrides->fUsePLSDstRead = false;
     }
 
+    GrPathRendering::FillType fillType() const { return fFillType; }
+
     void setStencilSettings(const GrStencilSettings& stencil) { fStencilSettings = stencil; }
 
 protected:
-    GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor)
+    GrDrawPathBatchBase(uint32_t classID, const SkMatrix& viewMatrix, GrColor initialColor,
+                        GrPathRendering::FillType fill)
         : INHERITED(classID)
         , fViewMatrix(viewMatrix)
-        , fColor(initialColor) {}
+        , fColor(initialColor)
+        , fFillType(fill) {}
 
     const GrStencilSettings& stencilSettings() const { return fStencilSettings; }
     const GrXPOverridesForBatch& overrides() const { return fOverrides; }
     const SkMatrix& viewMatrix() const { return fViewMatrix; }
     GrColor color() const { return fColor; }
 
 private:
     void initBatchTracker(const GrXPOverridesForBatch& overrides) override {
         overrides.getOverrideColorIfSet(&fColor);
         fOverrides = overrides;
     }
 
     SkMatrix                                                fViewMatrix;
     GrColor                                                 fColor;
+    GrPathRendering::FillType                               fFillType;
     GrStencilSettings                                       fStencilSettings;
     GrXPOverridesForBatch                                   fOverrides;
 
     typedef GrDrawBatch INHERITED;
 };
 
 class GrDrawPathBatch final : public GrDrawPathBatchBase {
 public:
     DEFINE_BATCH_CLASS_ID
 
     // This can't return a more abstract type because we install the stencil settings late :(
     static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, GrColor color,
-                                       const GrPath* path) {
-        return new GrDrawPathBatch(viewMatrix, color, path);
+                                       GrPathRendering::FillType fill, const GrPath* path) {
+        return new GrDrawPathBatch(viewMatrix, color, fill, path);
     }
 
     const char* name() const override { return "DrawPath"; }
 
     SkString dumpInfo() const override;
 
 private:
-    GrDrawPathBatch(const SkMatrix& viewMatrix, GrColor color, const GrPath* path)
-        : INHERITED(ClassID(), viewMatrix, color)
+    GrDrawPathBatch(const SkMatrix& viewMatrix, GrColor color, GrPathRendering::FillType fill,
+                    const GrPath* path)
+        : INHERITED(ClassID(), viewMatrix, color, fill)
         , fPath(path) {
         fBounds = path->getBounds();
         viewMatrix.mapRect(&fBounds);
     }
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override { return false; }
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override;
@@ skipping 57 matching lines @@
     typedef GrNonAtomicRef INHERITED;
 };
 
 // Template this if we decide to support index types other than 16bit
 class GrDrawPathRangeBatch final : public GrDrawPathBatchBase {
 public:
     DEFINE_BATCH_CLASS_ID
 
     // This can't return a more abstract type because we install the stencil settings late :(
     static GrDrawPathBatchBase* Create(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
-                                       GrColor color, GrPathRange* range, GrPathRangeDraw* draw,
+                                       GrColor color, GrPathRendering::FillType fill,
+                                       GrPathRange* range, GrPathRangeDraw* draw,
                                        const SkRect& bounds) {
-        return new GrDrawPathRangeBatch(viewMatrix, localMatrix, color, range, draw, bounds);
+        return new GrDrawPathRangeBatch(viewMatrix, localMatrix, color, fill, range, draw,
+                                        bounds);
     }
 
     ~GrDrawPathRangeBatch() override;
 
     const char* name() const override { return "DrawPathRange"; }
 
     SkString dumpInfo() const override;
 
 private:
-    inline bool isWinding() const;
-
     GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix, GrColor color,
-                         GrPathRange* range, GrPathRangeDraw* draw, const SkRect& bounds);
+                         GrPathRendering::FillType fill, GrPathRange* range,
+                         GrPathRangeDraw* draw, const SkRect& bounds);
 
     bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) override;
 
     void onPrepare(GrBatchFlushState*) override {}
 
     void onDraw(GrBatchFlushState* state) override;
 
     typedef GrPendingIOResource<const GrPathRange, kRead_GrIOType> PendingPathRange;
     typedef SkTLList<GrPathRangeDraw*, 4> DrawList;
     PendingPathRange    fPathRange;
     DrawList            fDraws;
     int                 fTotalPathCount;
     SkMatrix            fLocalMatrix;
 
     typedef GrDrawPathBatchBase INHERITED;
 };
 
 #endif