Remove drawPathsFromRange from GrDrawContext

src/gpu/GrDrawTarget.h

 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrDrawTarget_DEFINED
 #define GrDrawTarget_DEFINED
 
@@ skipping 21 matching lines @@
 #include "SkTypes.h"
 #include "SkXfermode.h"
 
 //#define ENABLE_MDB 1
 
 class GrBatch;
 class GrClip;
 class GrCaps;
 class GrPath;
 class GrDrawPathBatchBase;
-class GrPathRangeDraw;
 
 class GrDrawTarget final : public SkRefCnt {
 public:
     /** Options for GrDrawTarget behavior. */
     struct Options {
         Options () : fClipBatchToBounds(false), fDrawBatchBounds(false) {}
         bool fClipBatchToBounds;
         bool fDrawBatchBounds;
     };
 
@@ skipping 52 matching lines @@
     /**
      * Draws path into the stencil buffer. The fill must be either even/odd or
      * winding (not inverse or hairline). It will respect the HW antialias flag
      * on the GrPipelineBuilder (if possible in the 3D API).  Note, we will never have an inverse
      * fill with stencil path
      */
     void stencilPath(const GrPipelineBuilder&, const SkMatrix& viewMatrix, const GrPath*,
                      GrPathRendering::FillType);
 
     /**
-     * Draws a path. Fill must not be a hairline. It will respect the HW
-     * antialias flag on the GrPipelineBuilder (if possible in the 3D API).
+     * Draws a path batch. Fill must not be a hairline. It will respect the HW antialias flag on
+     * the GrPipelineBuilder (if possible in the 3D API). This needs to be separate from drawBatch
+     * because we install path stencil settings late.
      *
-     * TODO: Remove this function and construct the batch outside GrDrawTarget.
+     * TODO: Figure out a better model that allows us to roll this method into drawBatch.
      */
-    void drawPath(const GrPipelineBuilder&, const SkMatrix& viewMatrix, GrColor color,
-                  const GrPath*, GrPathRendering::FillType);
-
-    /**
-     * Draws the aggregate path from combining multiple. Note that this will not
-     * always be equivalent to back-to-back calls to drawPath(). It will respect
-     * the HW antialias flag on the GrPipelineBuilder (if possible in the 3D API).
-     *
-     * TODO: Remove this function and construct the batch outside GrDrawTarget.
-     *
-     * @param draw            The transforms and indices for the draw.
-     *                        This object must only be drawn once. The draw
-     *                        may modify its contents.
-     * @param fill            Fill type for drawing all the paths
-     */
-    void drawPathsFromRange(const GrPipelineBuilder&,
-                            const SkMatrix& viewMatrix,
-                            const SkMatrix& localMatrix,
-                            GrColor color,
-                            GrPathRange* range,
-                            GrPathRangeDraw* draw,
-                            GrPathRendering::FillType fill,
-                            const SkRect& bounds);
+    void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch);
 
     /**
      * Helper function for drawing rects.
      *
      * @param rect        the rect to draw
      * @param localRect   optional rect that specifies local coords to map onto
      *                    rect. If nullptr then rect serves as the local coords.
      * @param localMatrix Optional local matrix. The local coordinates are specified by localRect,
      *                    or if it is nullptr by rect. This matrix applies to the coordinate implied by
      *                    that rectangle before it is input to GrCoordTransforms that read local
@@ skipping 128 matching lines @@
                                     GrDrawBatch* batch);
 
     // Makes a copy of the dst if it is necessary for the draw. Returns false if a copy is required
     // but couldn't be made. Otherwise, returns true.  This method needs to be protected because it
     // needs to be accessed by GLPrograms to setup a correct drawstate
     bool setupDstReadIfNecessary(const GrPipelineBuilder&,
         const GrPipelineOptimizations& optimizations,
         GrXferProcessor::DstTexture*,
         const SkRect& batchBounds);
 
-    void drawPathBatch(const GrPipelineBuilder& pipelineBuilder, GrDrawPathBatchBase* batch,
-                       GrPathRendering::FillType fill);
     // Check to see if this set of draw commands has been sent out
     void getPathStencilSettingsForFilltype(GrPathRendering::FillType,
                                            const GrStencilAttachment*,
                                            GrStencilSettings*);
     bool setupClip(const GrPipelineBuilder&,
                            GrPipelineBuilder::AutoRestoreFragmentProcessorState*,
                            GrPipelineBuilder::AutoRestoreStencil*,
                            GrScissorState*,
                            const SkRect* devBounds);
 
@@ skipping 16 matching lines @@
     // 'this' drawTarget relies on the output of the drawTargets in 'fDependencies'
     SkTDArray<GrDrawTarget*>                    fDependencies;
     GrRenderTarget*                             fRenderTarget;
 
     bool                                        fDrawBatchBounds;
 
     typedef SkRefCnt INHERITED;
 };
 
 #endif