2 files changed, 19 insertions, 19 deletions

diff --git a/src/gpu/batches/GrRectBatchFactory.cpp b/src/gpu/batches/GrRectBatchFactory.cpp
index 86980d2944..f01010b21b 100644
--- a/src/gpu/batches/GrRectBatchFactory.cpp
+++ b/src/gpu/batches/GrRectBatchFactory.cpp
@@ -30,7 +30,7 @@ static GrDrawBatch* create_stroke_aa_batch(GrColor color,
 
 namespace GrRectBatchFactory {
 
-GrDrawBatch* CreateStrokeBW(GrColor color,
+GrDrawBatch* CreateNonAAStroke(GrColor color,
                             const SkMatrix& viewMatrix,
                             const SkRect& rect,
                             SkScalar strokeWidth,
@@ -43,7 +43,7 @@ GrDrawBatch* CreateStrokeBW(GrColor color,
     return GrStrokeRectBatch::Create(geometry, snapToPixelCenters);
 }
 
-GrDrawBatch* CreateStrokeAA(GrColor color,
+GrDrawBatch* CreateAAStroke(GrColor color,
                             const SkMatrix& viewMatrix,
                             const SkRect& rect,
                             const SkRect& devRect,
@@ -82,7 +82,7 @@ GrDrawBatch* CreateStrokeAA(GrColor color,
     }
 
     if (spare <= 0 && miterStroke) {
-        return CreateFillAA(color, viewMatrix, devOutside, devOutside);
+        return CreateAAFill(color, viewMatrix, devOutside, devOutside);
     }
 
     SkRect devInside(devRect);
@@ -102,7 +102,7 @@ GrDrawBatch* CreateStrokeAA(GrColor color,
                                   miterStroke);
 }
 
-GrDrawBatch* CreateFillNestedRectsAA(GrColor color,
+GrDrawBatch* CreateAAFillNestedRects(GrColor color,
                                      const SkMatrix& viewMatrix,
                                      const SkRect rects[2]) {
     SkASSERT(viewMatrix.rectStaysRect());
@@ -113,7 +113,7 @@ GrDrawBatch* CreateFillNestedRectsAA(GrColor color,
     viewMatrix.mapRect(&devInside, rects[1]);
 
     if (devInside.isEmpty()) {
-        return CreateFillAA(color, viewMatrix, devOutside, devOutside);
+        return CreateAAFill(color, viewMatrix, devOutside, devOutside);
     }
 
     return create_stroke_aa_batch(color, viewMatrix, devOutside, devOutside, devInside, true);
diff --git a/src/gpu/batches/GrRectBatchFactory.h b/src/gpu/batches/GrRectBatchFactory.h
index 5a43a34214..195a2b9e58 100644
--- a/src/gpu/batches/GrRectBatchFactory.h
+++ b/src/gpu/batches/GrRectBatchFactory.h
@@ -22,22 +22,22 @@ class SkStrokeRec;
  */
 namespace GrRectBatchFactory {
 
-inline GrDrawBatch* CreateFillBW(GrColor color,
-                                 const SkMatrix& viewMatrix,
-                                 const SkRect& rect,
-                                 const SkRect* localRect,
-                                 const SkMatrix* localMatrix) {
+inline GrDrawBatch* CreateNonAAFill(GrColor color,
+                                    const SkMatrix& viewMatrix,
+                                    const SkRect& rect,
+                                    const SkRect* localRect,
+                                    const SkMatrix* localMatrix) {
     return GrBWFillRectBatch::Create(color, viewMatrix, rect, localRect, localMatrix);
 }
 
-inline GrDrawBatch* CreateFillAA(GrColor color,
+inline GrDrawBatch* CreateAAFill(GrColor color,
                                  const SkMatrix& viewMatrix,
                                  const SkRect& rect,
                                  const SkRect& devRect) {
     return GrAAFillRectBatch::Create(color, viewMatrix, rect, devRect);
 }
 
-inline GrDrawBatch* CreateFillAA(GrColor color,
+inline GrDrawBatch* CreateAAFill(GrColor color,
                                  const SkMatrix& viewMatrix,
                                  const SkMatrix& localMatrix,
                                  const SkRect& rect,
@@ -45,20 +45,20 @@ inline GrDrawBatch* CreateFillAA(GrColor color,
     return GrAAFillRectBatch::Create(color, viewMatrix, localMatrix, rect, devRect);
 }
 
-GrDrawBatch* CreateStrokeBW(GrColor color,
-                            const SkMatrix& viewMatrix,
-                            const SkRect& rect,
-                            SkScalar strokeWidth,
-                            bool snapToPixelCenters);
+GrDrawBatch* CreateNonAAStroke(GrColor color,
+                               const SkMatrix& viewMatrix,
+                               const SkRect& rect,
+                               SkScalar strokeWidth,
+                               bool snapToPixelCenters);
 
-GrDrawBatch* CreateStrokeAA(GrColor,
+GrDrawBatch* CreateAAStroke(GrColor,
                             const SkMatrix& viewMatrix,
                             const SkRect& rect,
                             const SkRect& devRect,
                             const SkStrokeRec& stroke);
 
 // First rect is outer; second rect is inner
-GrDrawBatch* CreateFillNestedRectsAA(GrColor,
+GrDrawBatch* CreateAAFillNestedRects(GrColor,
                                      const SkMatrix& viewMatrix,
                                      const SkRect rects[2]);