Revert of Batch multiple single NVPR draw paths to instanced draws

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
 
@@ skipping 135 matching lines @@
         const SkMatrix* fViewMatrix;
         const GrScissorState* fScissor;
         const GrStencilSettings* fStencil;
     };
 
     void stencilPath(const StencilPathArgs& args, const GrPath* path) {
         fGpu->handleDirtyContext();
         this->onStencilPath(args, path);
     }
 
+    void drawPath(const GrPipeline& pipeline,
+                  const GrPrimitiveProcessor& primProc,
+                  const GrStencilSettings& stencil,
+                  const GrPath* path) {
+        fGpu->handleDirtyContext();
+        if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
+            fGpu->xferBarrier(pipeline.getRenderTarget(), barrierType);
+        }
+        this->onDrawPath(pipeline, primProc, stencil, path);
+    }
+
     void drawPaths(const GrPipeline& pipeline,
                    const GrPrimitiveProcessor& primProc,
                    const GrStencilSettings& stencil,
                    const GrPathRange* pathRange,
                    const void* indices,
                    PathIndexType indexType,
                    const float transformValues[],
                    PathTransformType transformType,
                    int count) {
         fGpu->handleDirtyContext();
         if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
             fGpu->xferBarrier(pipeline.getRenderTarget(), barrierType);
         }
 #ifdef SK_DEBUG
         pathRange->assertPathsLoaded(indices, indexType, count);
 #endif
         this->onDrawPaths(pipeline, primProc, stencil, pathRange, indices, indexType,
                           transformValues, transformType, count);
     }
 
-    void drawPaths(const GrPipeline& pipeline,
-                   const GrPrimitiveProcessor& primProc,
-                   const GrStencilSettings& stencil,
-                   const GrPath* const* paths,
-                   int count) {
-        fGpu->handleDirtyContext();
-        if (GrXferBarrierType barrierType = pipeline.xferBarrierType(*fGpu->caps())) {
-            fGpu->xferBarrier(pipeline.getRenderTarget(), barrierType);
-        }
-        this->onDrawPaths(pipeline, primProc, stencil, paths, count);
-    }
-
 protected:
     GrPathRendering(GrGpu* gpu)
         : fGpu(gpu) {
     }
     virtual void onStencilPath(const StencilPathArgs&, const GrPath*) = 0;
+    virtual void onDrawPath(const GrPipeline&,
+                            const GrPrimitiveProcessor&,
+                            const GrStencilSettings&,
+                            const GrPath*) = 0;
     virtual void onDrawPaths(const GrPipeline&,
                              const GrPrimitiveProcessor&,
                              const GrStencilSettings&,
                              const GrPathRange*,
                              const void* indices,
                              PathIndexType,
                              const float transformValues[],
                              PathTransformType,
                              int count) = 0;
-    virtual void onDrawPaths(const GrPipeline&,
-                             const GrPrimitiveProcessor&,
-                             const GrStencilSettings&,
-                             const GrPath* const*,
-                             int count) = 0;
 
     GrGpu* fGpu;
 private:
     GrPathRendering& operator=(const GrPathRendering&);
 };
 
 #endif