Consolidate handling of infinitely thin primitives and aa bloat handing WRT batch bounds

src/gpu/batches/GrAAStrokeRectBatch.cpp

 /*
  * Copyright 2015 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "GrAAStrokeRectBatch.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 110 matching lines @@
     DEFINE_BATCH_CLASS_ID
 
     AAStrokeRectBatch(GrColor color, const SkMatrix& viewMatrix,
                       const SkRect& devOutside, const SkRect& devInside)
             : INHERITED(ClassID())
             , fViewMatrix(viewMatrix) {
         SkASSERT(!devOutside.isEmpty())
         SkASSERT(!devInside.isEmpty())
 
         fGeoData.emplace_back(Geometry{color, devOutside, devOutside, devInside, false});
-        fBounds = devOutside;
+        this->setBounds(devOutside, HasAABloat::kYes, IsZeroArea::kNo);
         fMiterStroke = true;
     }
 
     static GrDrawBatch* Create(GrColor color, const SkMatrix& viewMatrix, const SkRect& rect,
                                const SkStrokeRec& stroke) {
         bool isMiter;
         if (!allowed_stroke(stroke, &isMiter)) {
             return nullptr;
         }
 
         AAStrokeRectBatch* batch = new AAStrokeRectBatch();
         batch->fMiterStroke = isMiter;
         Geometry& geo = batch->fGeoData.push_back();
         compute_rects(&geo.fDevOutside, &geo.fDevOutsideAssist, &geo.fDevInside, &geo.fDegenerate,
                       viewMatrix, rect, stroke.getWidth(), isMiter);
         geo.fColor = color;
-        batch->fBounds = geo.fDevOutside;
-        batch->fBounds.join(geo.fDevOutsideAssist);
+        batch->setBounds(geo.fDevOutside, HasAABloat::kYes, IsZeroArea::kNo);
         batch->fViewMatrix = viewMatrix;
         return batch;
     }
 
     const char* name() const override { return "AAStrokeRect"; }
 
     void computePipelineOptimizations(GrInitInvariantOutput* color,
                                       GrInitInvariantOutput* coverage,
                                       GrBatchToXPOverrides* overrides) const override {
         // When this is called on a batch, there is only one geometry bundle
@@ skipping 246 matching lines @@
     // In the event of two batches, one who can tweak, one who cannot, we just fall back to
     // not tweaking
     if (this->canTweakAlphaForCoverage() != that->canTweakAlphaForCoverage()) {
         fBatch.fCanTweakAlphaForCoverage = false;
     }
 
     if (this->color() != that->color()) {
         fBatch.fColor = GrColor_ILLEGAL;
     }
     fGeoData.push_back_n(that->fGeoData.count(), that->fGeoData.begin());
-    this->joinBounds(that->bounds());
+    this->joinBounds(*that);
     return true;
 }
 
 static void setup_scale(int* scale, SkScalar inset) {
     if (inset < SK_ScalarHalf) {
         *scale = SkScalarFloorToInt(512.0f * inset / (inset + SK_ScalarHalf));
         SkASSERT(*scale >= 0 && *scale <= 255);
     } else {
         *scale = 0xff;
     }
@@ skipping 187 matching lines @@
     SkStrokeRec rec(SkStrokeRec::kFill_InitStyle);
     rec.setStrokeStyle(strokeWidth);
     rec.setStrokeParams(SkPaint::kButt_Cap,
                         miterStroke ? SkPaint::kMiter_Join : SkPaint::kBevel_Join,
                         1.f);
     SkMatrix matrix = GrTest::TestMatrixRectStaysRect(random);
     return GrAAStrokeRectBatch::Create(color, matrix, rect, rec);
 }
 
 #endif