Stop lieing about GrBatch color for Rects

src/gpu/GrOvalRenderer.cpp

Index: src/gpu/GrOvalRenderer.cpp
diff --git a/src/gpu/GrOvalRenderer.cpp b/src/gpu/GrOvalRenderer.cpp
index 481501f1299df97eb301cb9056d26c807396f769..d7f88fe137c25c1fcbadaf220838e6ea144a9345 100644
--- a/src/gpu/GrOvalRenderer.cpp
+++ b/src/gpu/GrOvalRenderer.cpp
@@ -711,10 +711,6 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchOpt(const GrBatchOpt& batchOpt) {
-        fBatchOpt = batchOpt;
-    }
-
     void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE {
         // Handle any color overrides
         if (init.fColorIgnored) {
@@ -873,7 +869,6 @@ private:
     static const int kVertsPerCircle = 4;
     static const int kIndicesPerCircle = 6;
 
-    GrBatchOpt fBatchOpt;
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
 };
@@ -966,10 +961,6 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchOpt(const GrBatchOpt& batchOpt) {
-        fBatchOpt = batchOpt;
-    }
-
     void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE {
         // Handle any color overrides
         if (init.fColorIgnored) {
@@ -1133,7 +1124,6 @@ private:
     static const int kVertsPerEllipse = 4;
     static const int kIndicesPerEllipse = 6;
 
-    GrBatchOpt fBatchOpt;
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
 };
@@ -1267,10 +1257,6 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchOpt(const GrBatchOpt& batchOpt) {
-        fBatchOpt = batchOpt;
-    }
-
     void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE {
         // Handle any color overrides
         if (init.fColorIgnored) {
@@ -1425,7 +1411,6 @@ private:
     static const int kVertsPerEllipse = 4;
     static const int kIndicesPerEllipse = 6;
 
-    GrBatchOpt fBatchOpt;
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
 };
@@ -1655,10 +1640,6 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchOpt(const GrBatchOpt& batchOpt) {
-        fBatchOpt = batchOpt;
-    }
-
     void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE {
         // Handle any color overrides
         if (init.fColorIgnored) {
@@ -1831,7 +1812,6 @@ private:
         bool fCoverageIgnored;
     };
 
-    GrBatchOpt fBatchOpt;
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
     const GrIndexBuffer* fIndexBuffer;
@@ -1864,10 +1844,6 @@ public:
         out->setUnknownSingleComponent();
     }
 
-    void initBatchOpt(const GrBatchOpt& batchOpt) {
-        fBatchOpt = batchOpt;
-    }
-
     void initBatchTracker(const GrPipelineInfo& init) SK_OVERRIDE {
         // Handle any color overrides
         if (init.fColorIgnored) {
@@ -2050,7 +2026,6 @@ private:
         bool fCoverageIgnored;
     };
 
-    GrBatchOpt fBatchOpt;
     BatchTracker fBatch;
     SkSTArray<1, Geometry, true> fGeoData;
     const GrIndexBuffer* fIndexBuffer;