Revert of Allow LCD text to batch across colorchanges. This will always use

src/gpu/batches/GrAtlasTextBatch.h

Index: src/gpu/batches/GrAtlasTextBatch.h
diff --git a/src/gpu/batches/GrAtlasTextBatch.h b/src/gpu/batches/GrAtlasTextBatch.h
index 95abbf43814f0653828593c11e616d2388954b47..11cd89ea9a6116fa017e664a69fc86b94363a1d3 100644
--- a/src/gpu/batches/GrAtlasTextBatch.h
+++ b/src/gpu/batches/GrAtlasTextBatch.h
@@ -15,11 +15,11 @@
 class GrAtlasTextBatch : public GrVertexBatch {
 public:
     DEFINE_BATCH_CLASS_ID
+    static const size_t kLCDTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
 
     // position + local coord
     static const size_t kColorTextVASize = sizeof(SkPoint) + sizeof(SkIPoint16);
     static const size_t kGrayTextVASize = sizeof(SkPoint) + sizeof(GrColor) + sizeof(SkIPoint16);
-    static const size_t kLCDTextVASize = kGrayTextVASize;
     static const int kVerticesPerGlyph = GrAtlasTextBlob::kVerticesPerGlyph;
     static const int kIndicesPerGlyph = 6;
 
@@ -113,6 +113,15 @@
         }
     }
 
+    static size_t GetVertexStrideDf(GrMaskFormat maskFormat, bool useLCDText) {
+        SkASSERT(maskFormat == kA8_GrMaskFormat);
+        if (useLCDText) {
+            return kLCDTextVASize;
+        } else {
+            return kGrayTextVASize;
+        }
+    }
+
 protected:
     void computePipelineOptimizations(GrInitInvariantOutput* color, 
                                       GrInitInvariantOutput* coverage,