Re-adding analytical GeoProc for rectangles

src/gpu/batches/GrRectBatchFactory.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 GrRectBatchFactory_DEFINED
 #define GrRectBatchFactory_DEFINED
 
 #include "GrAAFillRectBatch.h"
 #include "GrAAStrokeRectBatch.h"
 #include "GrColor.h"
 #include "GrNonAAFillRectBatch.h"
 #include "GrNonAAStrokeRectBatch.h"
+#include "GrPaint.h"
+#include "GrAnalyticRectBatch.h"

[egdaniel, 2016/08/12 18:33:11]

alphabetize this

[dvonbeck, 2016/08/12 18:43:10]

Done.

 #include "SkMatrix.h"
 
 class GrBatch;
 struct SkRect;
 class SkStrokeRec;
 
 /*
  * A factory for returning batches which can draw rectangles.
  */
 namespace GrRectBatchFactory {
 
 inline GrDrawBatch* CreateNonAAFill(GrColor color,
                                     const SkMatrix& viewMatrix,
                                     const SkRect& rect,
                                     const SkRect* localRect,
                                     const SkMatrix* localMatrix) {
     if (viewMatrix.hasPerspective() || (localMatrix && localMatrix->hasPerspective())) {
         return GrNonAAFillRectBatch::CreateWithPerspective(color, viewMatrix, rect, localRect,
                                                            localMatrix);
     } else {
         return GrNonAAFillRectBatch::Create(color, viewMatrix, rect, localRect, localMatrix);
     }
 }
 
+inline GrDrawBatch* CreateAAFill(GrPaint paint,

[egdaniel, 2016/08/12 18:33:11]

make this const ref for paint

[dvonbeck, 2016/08/12 18:43:09]

Done.

+                                 const SkMatrix& viewMatrix,
+                                 const SkRect& rect,
+                                 const SkRect& croppedRect,
+                                 const SkRect& devRect) {
+    if (!paint.usesDistanceVectorField()) {
+        return GrAAFillRectBatch::Create(paint.getColor(), viewMatrix, croppedRect, devRect);
+    } else {
+        return GrAnalyticRectBatch::CreateAnalyticRectBatch(paint.getColor(), viewMatrix, rect,
+                                                            croppedRect, devRect);
+    }
+}
+
 inline GrDrawBatch* CreateAAFill(GrColor color,
-                                 const SkMatrix& viewMatrix,
-                                 const SkRect& rect,
-                                 const SkRect& devRect) {
-    return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
-}
-
-inline GrDrawBatch* CreateAAFill(GrColor color,
                                  const SkMatrix& viewMatrix,
                                  const SkMatrix& localMatrix,
                                  const SkRect& rect,
                                  const SkRect& devRect) {
     return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
 }
 
 inline GrDrawBatch* CreateNonAAStroke(GrColor color,
                                       const SkMatrix& viewMatrix,
                                       const SkRect& rect,
@@ skipping 10 matching lines @@
 }
 
 // First rect is outer; second rect is inner
 GrDrawBatch* CreateAAFillNestedRects(GrColor,
                                      const SkMatrix& viewMatrix,
                                      const SkRect rects[2]);
 
 };
 
 #endif