Remove unused batch rect append functions

src/gpu/batches/GrNonAAFillRectBatch.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 "GrNonAAFillRectBatch.h"
 
 #include "GrBatchFlushState.h"
@@ skipping 406 matching lines @@
         this->joinBounds(that->bounds());
         return true;
     }
 
     GrXPOverridesForBatch fOverrides;
     SkSTArray<1, Geometry, true> fGeoData;
 
     typedef GrVertexBatch INHERITED;
 };
 
-inline static void append_to_batch(NonAAFillRectBatch* batch, GrColor color,
-                                   const SkMatrix& viewMatrix, const SkRect& rect,
-                                   const SkRect* localRect, const SkMatrix* localMatrix) {
+namespace GrNonAAFillRectBatch {
+
+GrDrawBatch* Create(GrColor color,
+                    const SkMatrix& viewMatrix,
+                    const SkRect& rect,
+                    const SkRect* localRect,
+                    const SkMatrix* localMatrix) {
+    NonAAFillRectBatch* batch = NonAAFillRectBatch::Create();
     SkASSERT(!viewMatrix.hasPerspective() && (!localMatrix || !localMatrix->hasPerspective()));
     NonAAFillRectBatch::Geometry& geo = batch->geoData()->push_back();
 
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fRect = rect;
 
     if (localRect && localMatrix) {
         geo.fLocalQuad.setFromMappedRect(*localRect, *localMatrix);
     } else if (localRect) {
         geo.fLocalQuad.set(*localRect);
     } else if (localMatrix) {
         geo.fLocalQuad.setFromMappedRect(rect, *localMatrix);
     } else {
         geo.fLocalQuad.set(rect);
     }
+    batch->init();
+    return batch;
 }
 
-inline static void append_to_batch(NonAAFillRectPerspectiveBatch* batch, GrColor color,
-                                   const SkMatrix& viewMatrix, const SkRect& rect,
-                                   const SkRect* localRect, const SkMatrix* localMatrix) {
+GrDrawBatch* CreateWithPerspective(GrColor color,
+                                   const SkMatrix& viewMatrix,
+                                   const SkRect& rect,
+                                   const SkRect* localRect,
+                                   const SkMatrix* localMatrix) {
+    NonAAFillRectPerspectiveBatch* batch = NonAAFillRectPerspectiveBatch::Create();
     SkASSERT(viewMatrix.hasPerspective() || (localMatrix && localMatrix->hasPerspective()));
     NonAAFillRectPerspectiveBatch::Geometry& geo = batch->geoData()->push_back();
 
     geo.fColor = color;
     geo.fViewMatrix = viewMatrix;
     geo.fRect = rect;
     geo.fHasLocalRect = SkToBool(localRect);
     geo.fHasLocalMatrix = SkToBool(localMatrix);
     if (localMatrix) {
         geo.fLocalMatrix = *localMatrix;
     }
     if (localRect) {
         geo.fLocalRect = *localRect;
     }
-
-}
-
-namespace GrNonAAFillRectBatch {
-
-GrDrawBatch* Create(GrColor color,
-                    const SkMatrix& viewMatrix,
-                    const SkRect& rect,
-                    const SkRect* localRect,
-                    const SkMatrix* localMatrix) {
-    NonAAFillRectBatch* batch = NonAAFillRectBatch::Create();
-    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
     batch->init();
     return batch;
 }
 
-GrDrawBatch* CreateWithPerspective(GrColor color,
-                                   const SkMatrix& viewMatrix,
-                                   const SkRect& rect,
-                                   const SkRect* localRect,
-                                   const SkMatrix* localMatrix) {
-    NonAAFillRectPerspectiveBatch* batch = NonAAFillRectPerspectiveBatch::Create();
-    append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
-    batch->init();
-    return batch;
-}
-
-bool Append(GrBatch* origBatch,
-            GrColor color,
-            const SkMatrix& viewMatrix,
-            const SkRect& rect,
-            const SkRect* localRect,
-            const SkMatrix* localMatrix) {
-    bool usePerspective = viewMatrix.hasPerspective() ||
-                          (localMatrix && localMatrix->hasPerspective());
-
-    if (usePerspective && origBatch->classID() != NonAAFillRectPerspectiveBatch::ClassID()) {
-        return false;
-    }
-
-    if (!usePerspective) {
-        NonAAFillRectBatch* batch = origBatch->cast<NonAAFillRectBatch>();
-        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
-        batch->updateBoundsAfterAppend();
-    } else {
-        NonAAFillRectPerspectiveBatch* batch = origBatch->cast<NonAAFillRectPerspectiveBatch>();
-        const NonAAFillRectPerspectiveBatch::Geometry& geo = batch->geoData()->back();
-
-        if (!geo.fViewMatrix.cheapEqualTo(viewMatrix) ||
-            geo.fHasLocalRect != SkToBool(localRect) ||
-            geo.fHasLocalMatrix != SkToBool(localMatrix) ||
-            (geo.fHasLocalMatrix && !geo.fLocalMatrix.cheapEqualTo(*localMatrix))) {
-            return false;
-        }
-
-        append_to_batch(batch, color, viewMatrix, rect, localRect, localMatrix);
-        batch->updateBoundsAfterAppend();
-    }
-
-    return true;
-}
-
 };
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////
 
 #ifdef GR_TEST_UTILS
 
 #include "GrBatchTest.h"
 
 DRAW_BATCH_TEST_DEFINE(RectBatch) {
     GrColor color = GrRandomColor(random);
     SkRect rect = GrTest::TestRect(random);
     SkRect localRect = GrTest::TestRect(random);
     SkMatrix viewMatrix = GrTest::TestMatrixInvertible(random);
     SkMatrix localMatrix = GrTest::TestMatrix(random);
 
     bool hasLocalRect = random->nextBool();
     bool hasLocalMatrix = random->nextBool();
     return GrNonAAFillRectBatch::Create(color, viewMatrix, rect,
                                         hasLocalRect ? &localRect : nullptr,
                                         hasLocalMatrix ? &localMatrix : nullptr);
 }
 
 #endif