Check for xfer barriers in GrBatch, auto-issue barriers in GrGpu

src/gpu/batches/GrAAFillRectBatch.cpp

Index: src/gpu/batches/GrAAFillRectBatch.cpp
diff --git a/src/gpu/batches/GrAAFillRectBatch.cpp b/src/gpu/batches/GrAAFillRectBatch.cpp
index 582d2e8e048ed6e2c5ac83b3b5f1e6dcd2c909f9..a4aa660664cedfceefb4c4e51d40006f4d924104 100644
--- a/src/gpu/batches/GrAAFillRectBatch.cpp
+++ b/src/gpu/batches/GrAAFillRectBatch.cpp
@@ -131,7 +131,6 @@ public:
                                              canTweakAlphaForCoverage);
         }
 
-        helper.issueDraw(batchTarget);

[joshualitt, 2015/08/12 18:03:17]

is this intentional?

[bsalomon, 2015/08/12 18:09:05]

Done.

     }
 
     SkSTArray<1, Geometry, true>* geoData() { return &fGeoData; }
@@ -176,8 +175,9 @@ private:
     const SkMatrix& viewMatrix() const { return fGeoData[0].fViewMatrix; }
     bool coverageIgnored() const { return fBatch.fCoverageIgnored; }
 
-    bool onCombineIfPossible(GrBatch* t) override {
-        if (!this->pipeline()->isEqual(*t->pipeline())) {
+    bool onCombineIfPossible(GrBatch* t, const GrCaps& caps) {
+        if (!GrPipeline::CanCombine(*this->pipeline(), this->bounds(), *t->pipeline(), t->bounds(),
+                                caps)) {
             return false;
         }