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

src/gpu/batches/GrAtlasTextBatch.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 GrAtlasTextBatch_DEFINED
 #define GrAtlasTextBatch_DEFINED
 
 #include "batches/GrVertexBatch.h"
 
 #include "GrAtlasTextContext.h"
 
 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;
 
     typedef GrAtlasTextContext::DistanceAdjustTable DistanceAdjustTable;
     typedef GrAtlasTextBlob Blob;
     typedef Blob::Run Run;
     typedef Run::SubRunInfo TextInfo;
     struct Geometry {
         Blob* fBlob;
         int fRun;
@@ skipping 73 matching lines @@
         switch (maskFormat) {
             case kA8_GrMaskFormat:
                 return kGrayTextVASize;
             case kARGB_GrMaskFormat:
                 return kColorTextVASize;
             default:
                 return kLCDTextVASize;
         }
     }
 
+    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,
                                       GrBatchToXPOverrides* overrides) const override;
 
 
 private:
     void initBatchTracker(const GrXPOverridesForBatch& overrides) override;
 
     struct FlushInfo {
@@ skipping 85 matching lines @@
     GrBatchFontCache* fFontCache;
 
     // Distance field properties
     SkAutoTUnref<const DistanceAdjustTable> fDistanceAdjustTable;
     SkColor fFilteredColor;
 
     typedef GrVertexBatch INHERITED;
 };
 
 #endif