Revert of BitmapTextBatch and BitmapTextBlob

src/gpu/GrAADistanceFieldPathRenderer.cpp

 
 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAADistanceFieldPathRenderer.h"
 
@@ skipping 275 matching lines @@
                            pipeline,
                            dfProcessor,
                            positions,
                            vertexStride,
                            this->viewMatrix(),
                            args.fPath,
                            args.fPathData);
             instancesToFlush++;
         }
 
-        this->flush(batchTarget, &drawInfo, instancesToFlush, maxInstancesPerDraw);
+        this->flush(batchTarget, dfProcessor, pipeline, &drawInfo, instancesToFlush,
+                    maxInstancesPerDraw);
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
 private:
     AADistanceFieldPathBatch(const Geometry& geometry, GrColor color, const SkMatrix& viewMatrix,
                              GrBatchAtlas* atlas,
                              PathCache* pathCache, PathDataList* pathList) {
         this->initClassID<AADistanceFieldPathBatch>();
         fBatch.fColor = color;
@@ skipping 106 matching lines @@
                                                (const unsigned char*)bmp.getPixels(),
                                                bmp.width(), bmp.height(), bmp.rowBytes());
         }
 
         // add to atlas
         SkIPoint16 atlasLocation;
         GrBatchAtlas::AtlasID id;
         bool success = atlas->addToAtlas(&id, batchTarget, width, height, dfStorage.get(),
                                          &atlasLocation);
         if (!success) {
-            this->flush(batchTarget, drawInfo, *instancesToFlush, maxInstancesPerDraw);
+            this->flush(batchTarget, dfProcessor, pipeline, drawInfo, *instancesToFlush,
+                        maxInstancesPerDraw);
             this->initDraw(batchTarget, dfProcessor, pipeline);
             *instancesToFlush = 0;
 
             SkDEBUGCODE(success =) atlas->addToAtlas(&id, batchTarget, width, height,
                                                      dfStorage.get(), &atlasLocation);
             SkASSERT(success);
 
         }
 
         // add to cache
@@ skipping 73 matching lines @@
         // TODO remove this when batch is everywhere
         GrPipelineInfo init;
         init.fColorIgnored = fBatch.fColorIgnored;
         init.fOverrideColor = GrColor_ILLEGAL;
         init.fCoverageIgnored = fBatch.fCoverageIgnored;
         init.fUsesLocalCoords = this->usesLocalCoords();
         dfProcessor->initBatchTracker(batchTarget->currentBatchTracker(), init);
     }
 
     void flush(GrBatchTarget* batchTarget,
+               const GrGeometryProcessor* dfProcessor,
+               const GrPipeline* pipeline,
                GrDrawTarget::DrawInfo* drawInfo,
                int instanceCount,
                int maxInstancesPerDraw) {
         while (instanceCount) {
             drawInfo->setInstanceCount(SkTMin(instanceCount, maxInstancesPerDraw));
             drawInfo->setVertexCount(drawInfo->instanceCount() * drawInfo->verticesPerInstance());
             drawInfo->setIndexCount(drawInfo->instanceCount() * drawInfo->indicesPerInstance());
 
             batchTarget->draw(*drawInfo);
 
@@ skipping 80 matching lines @@
     SkAutoTUnref<GrBatch> batch(AADistanceFieldPathBatch::Create(geometry, color, viewMatrix,
                                                                  fAtlas, &fPathCache, &fPathList));
 
     SkRect bounds = path.getBounds();
     viewMatrix.mapRect(&bounds);
     target->drawBatch(pipelineBuilder, batch, &bounds);
 
     return true;
 }