Revert "fill rect batch refactor into separate batches"

src/gpu/batches/GrTInstanceBatch.h

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef GrTInstanceBatch_DEFINED
 #define GrTInstanceBatch_DEFINED
 
 #include "GrVertexBatch.h"
 
 #include "GrBatchFlushState.h"
 
 /**
  * GrTInstanceBatch is an optional template to help with writing batches
  * To use this template, The 'Impl' must define the following statics:
  *     A Geometry struct
  *
  *     static const int kVertsPerInstance
  *     static const int kIndicesPerInstance
  *
  *     const char* Name()
  *
- *     void SetBounds(const Geometry& seedGeometry, SkRect* outBounds)
- *
  *     bool CanCombine(const Geometry& mine, const Geometry& theirs,
  *                     const GrPipelineOptimizations&)
  *
  *     const GrGeometryProcessor* CreateGP(const Geometry& seedGeometry,
  *                                         const GrPipelineOptimizations& opts)
  *
  *     const GrIndexBuffer* GetIndexBuffer(GrResourceProvider*)
  *
  *     Tesselate(intptr_t vertices, size_t vertexStride, const Geometry& geo,
  *               const GrPipelineOptimizations& opts)
@@ skipping 24 matching lines @@
     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
 
     // to avoid even the initial copy of the struct, we have a getter for the first item which
     // is used to seed the batch with its initial geometry.  After seeding, the client should call
     // init() so the Batch can initialize itself
     Geometry* geometry() { return &fGeoData[0]; }
     void init() {
         const Geometry& geo = fGeoData[0];
-        Impl::SetBounds(geo, &fBounds);
+        this->setBounds(geo.fDevRect);
     }
 
 private:
     GrTInstanceBatch() {
         this->initClassID<GrTInstanceBatch<Impl>>();
 
         // Push back an initial geometry
         fGeoData.push_back();
     }
 
@@ skipping 50 matching lines @@
         fGeoData.push_back_n(that->geoData()->count(), that->geoData()->begin());
         this->joinBounds(that->bounds());
         return true;
     }
 
     GrPipelineOptimizations fOpts;
     SkSTArray<1, Geometry, true> fGeoData;
 };
 
 #endif