BitmapTextBatch and BitmapTextBlob

src/gpu/GrAADistanceFieldPathRenderer.cpp

Index: src/gpu/GrAADistanceFieldPathRenderer.cpp
diff --git a/src/gpu/GrAADistanceFieldPathRenderer.cpp b/src/gpu/GrAADistanceFieldPathRenderer.cpp
index b9ca1ec26b6fc77fcae1b585e97842abc07a1869..733534ea8c15e34319b42c158e93f80023bc552f 100755
--- a/src/gpu/GrAADistanceFieldPathRenderer.cpp
+++ b/src/gpu/GrAADistanceFieldPathRenderer.cpp
@@ -293,8 +293,7 @@ public:
             instancesToFlush++;
         }
 
-        this->flush(batchTarget, dfProcessor, pipeline, &drawInfo, instancesToFlush,
-                    maxInstancesPerDraw);
+        this->flush(batchTarget, &drawInfo, instancesToFlush, maxInstancesPerDraw);
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
@@ -421,8 +420,7 @@ private:
         bool success = atlas->addToAtlas(&id, batchTarget, width, height, dfStorage.get(),
                                          &atlasLocation);
         if (!success) {
-            this->flush(batchTarget, dfProcessor, pipeline, drawInfo, *instancesToFlush,
-                        maxInstancesPerDraw);
+            this->flush(batchTarget, drawInfo, *instancesToFlush, maxInstancesPerDraw);
             this->initDraw(batchTarget, dfProcessor, pipeline);
             *instancesToFlush = 0;
 
@@ -516,8 +514,6 @@ private:
     }
 
     void flush(GrBatchTarget* batchTarget,
-               const GrGeometryProcessor* dfProcessor,
-               const GrPipeline* pipeline,
                GrDrawTarget::DrawInfo* drawInfo,
                int instanceCount,
                int maxInstancesPerDraw) {