Misc batch->op cleanup Part 2 of 2

Change-Id: Iedfe5bd019ca1171ab09de569f74c57975aa54c9
Reviewed-on: https://skia-review.googlesource.com/6384
Commit-Queue: Brian Salomon <bsalomon@google.com>
Reviewed-by: Brian Osman <brianosman@google.com>
diff --git a/src/gpu/ops/GrAAStrokeRectOp.cpp b/src/gpu/ops/GrAAStrokeRectOp.cpp
index 711129f..1c70059 100644
--- a/src/gpu/ops/GrAAStrokeRectOp.cpp
+++ b/src/gpu/ops/GrAAStrokeRectOp.cpp
@@ -385,13 +385,13 @@
         return false;
     }
 
-    // TODO batch across miterstroke changes
+    // TODO combine across miterstroke changes
     if (this->miterStroke() != that->miterStroke()) {
         return false;
     }
 
     // We apply the viewmatrix to the rect points on the cpu.  However, if the pipeline uses
-    // local coords then we won't be able to batch.  We could actually upload the viewmatrix
+    // local coords then we won't be able to combine.  We could actually upload the viewmatrix
     // using vertex attributes in these cases, but haven't investigated that
     if (this->usesLocalCoords() && !this->viewMatrix().cheapEqualTo(that->viewMatrix())) {
         return false;