Revert of Batch multiple single NVPR draw paths to instanced draws

src/gpu/GrPathRendering.h

Index: src/gpu/GrPathRendering.h
diff --git a/src/gpu/GrPathRendering.h b/src/gpu/GrPathRendering.h
index ca81b8f08fec285cd26f09961930d8cb9877893f..8ee3d7b3e24168e5640b6f9ee3055852a2f1a92e 100644
--- a/src/gpu/GrPathRendering.h
+++ b/src/gpu/GrPathRendering.h
@@ -153,6 +153,17 @@
         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,
@@ -173,23 +184,15 @@
                           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&,
@@ -199,11 +202,6 @@
                              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: