Remove drawPathsFromRange from GrDrawContext

src/gpu/batches/GrDrawPathBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrDrawPathBatch.h"
 
 SkString GrDrawPathBatch::dumpInfo() const {
@@ skipping 24 matching lines @@
     SkString string;
     string.printf("RANGE: 0x%p COUNTS: [", *fDraws.head());
     for (DrawList::Iter iter(fDraws); iter.get(); iter.next()) {
         string.appendf("%d ,", (*iter.get())->count());
     }
     string.remove(string.size() - 2, 2);
     string.append("]");
     return string;
 }
 
-bool GrDrawPathRangeBatch::isWinding() const {
-    static const GrStencilSettings::Face pathFace = GrStencilSettings::kFront_Face;
-    bool isWinding = kInvert_StencilOp != this->stencilSettings().passOp(pathFace);
-    if (isWinding) {
-        // Double check that it is in fact winding.
-        SkASSERT(kIncClamp_StencilOp == this->stencilSettings().passOp(pathFace));
-        SkASSERT(kIncClamp_StencilOp == this->stencilSettings().failOp(pathFace));
-        SkASSERT(0x1 != this->stencilSettings().writeMask(pathFace));
-        SkASSERT(!this->stencilSettings().isTwoSided());
-    }
-    return isWinding;
-}
-
 GrDrawPathRangeBatch::GrDrawPathRangeBatch(const SkMatrix& viewMatrix, const SkMatrix& localMatrix,
-                                           GrColor color, GrPathRange* range, GrPathRangeDraw* draw,
+                                           GrColor color, GrPathRendering::FillType fill,
+                                           GrPathRange* range, GrPathRangeDraw* draw,
                                            const SkRect& bounds)
-    : INHERITED(ClassID(), viewMatrix, color)
+    : INHERITED(ClassID(), viewMatrix, color, fill)
     , fPathRange(range)
     , fLocalMatrix(localMatrix) {
     SkDEBUGCODE(draw->fUsedInBatch = true;)
     fDraws.addToHead(SkRef(draw));
     fTotalPathCount = draw->count();
     fBounds = bounds;
 }
 
 bool GrDrawPathRangeBatch::onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
     GrDrawPathRangeBatch* that = t->cast<GrDrawPathRangeBatch>();
@@ skipping 11 matching lines @@
         !fLocalMatrix.cheapEqualTo(that->fLocalMatrix)) {
         return false;
     }
     // TODO: Check some other things here. (winding, opaque, pathProc color, vm, ...)
     // Try to combine this call with the previous DrawPaths. We do this by stenciling all the
     // paths together and then covering them in a single pass. This is not equivalent to two
     // separate draw calls, so we can only do it if there is no blending (no overlap would also
     // work). Note that it's also possible for overlapping paths to cancel each other's winding
     // numbers, and we only partially account for this by not allowing even/odd paths to be
     // combined. (Glyphs in the same font tend to wind the same direction so it works out OK.)
-    if (!this->isWinding() ||
+    if (GrPathRendering::kWinding_FillType != this->fillType() ||
         this->stencilSettings() != that->stencilSettings() ||
         this->overrides().willColorBlendWithDst()) {
         return false;
     }
     SkASSERT(!that->overrides().willColorBlendWithDst());
     fTotalPathCount += that->fTotalPathCount;
     while (GrPathRangeDraw** head = that->fDraws.head()) {
         fDraws.addToTail(*head);
         // We're stealing that's refs, so pop without unreffing.
         that->fDraws.popHead();
@@ skipping 30 matching lines @@
         memcpy(indices, (*iter.get())->indices(), cnt * sizeof(uint16_t));
         indices += cnt;
         memcpy(transforms, (*iter.get())->transforms(), cnt * floatsPerTransform * sizeof(float));
         transforms += cnt * floatsPerTransform;
     }
     SkASSERT(indices - indexStorage.get() == fTotalPathCount);
     state->gpu()->pathRendering()->drawPaths(args, fPathRange.get(), indexStorage.get(),
         GrPathRange::kU16_PathIndexType, transformStorage.get(), transformType,
         fTotalPathCount);
 }