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

Revert of Allow LCD text to batch across colorchanges.  This will always use (patchset #4 id:60001 of https://codereview.chromium.org/1502253003/ )

Reason for revert:
Seems to break textblobrandomfont on some platforms

Original issue's description:
> Allow LCD text to batch across colorchanges.  This will always use
> color vertices, even when we can't batch across color changes
> 
> BUG=skia:
> 
> Committed: https://skia.googlesource.com/skia/+/d9d30f7b577711a200395f7b62acc0d82a19f9c3

TBR=bsalomon@google.com,jvanverth@google.com,joshualitt@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=skia:

[joshualitt, 2015-12-09 15:27:46]

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

[commit-bot: I haz the power, 2015-12-09 15:27:58]

CQ is trying da patch. Follow status at
 https://chromium-cq-status.appspot.com/patch-status/1514563002/1
View timeline at
 https://chromium-cq-status.appspot.com/patch-timeline/1514563002/1

[commit-bot: I haz the power, 2015-12-09 15:28:05]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2015-12-09 15:28:05]

Failed to apply patch for src/gpu/GrAtlasTextContext.cpp:
While running git apply --index -3 -p1;
  error: patch failed: src/gpu/GrAtlasTextContext.cpp:1014
  Falling back to three-way merge...
  Applied patch to 'src/gpu/GrAtlasTextContext.cpp' with conflicts.
  U src/gpu/GrAtlasTextContext.cpp

Patch:       src/gpu/GrAtlasTextContext.cpp
Index: src/gpu/GrAtlasTextContext.cpp
diff --git a/src/gpu/GrAtlasTextContext.cpp b/src/gpu/GrAtlasTextContext.cpp
index
fbbcdb68c47b74beb86e483fc0cadc20e0a35490..50238574262ebb043f5437a06852e53b40f895ea
100644
--- a/src/gpu/GrAtlasTextContext.cpp
+++ b/src/gpu/GrAtlasTextContext.cpp
@@ -1014,8 +1014,7 @@
     r.fRight = r.fLeft + SkIntToScalar(width);
     r.fBottom = r.fTop + SkIntToScalar(height);
     subRun->setMaskFormat(format);
-    blob->appendGlyph(&run, subRun, r, color, vertexStride,
-                      kARGB_GrMaskFormat != format, glyph);
+    blob->appendGlyph(&run, subRun, r, color, vertexStride, kA8_GrMaskFormat ==
format, glyph);
 }
 
 bool GrAtlasTextContext::dfAppendGlyph(GrAtlasTextBlob* blob, int runIndex,
@@ -1071,9 +1070,11 @@
     SkASSERT(glyph->fMaskFormat == kA8_GrMaskFormat);
     subRun->setMaskFormat(kA8_GrMaskFormat);
 
-    size_t vertexStride = GrAtlasTextBatch::GetVertexStride(kA8_GrMaskFormat);
-
-    blob->appendGlyph(&run, subRun, glyphRect, color, vertexStride, true,
glyph);
+    size_t vertexStride = GrAtlasTextBatch::GetVertexStrideDf(kA8_GrMaskFormat,
+                                                             
subRun->hasUseLCDText());
+
+    bool useColorVerts = !subRun->hasUseLCDText();
+    blob->appendGlyph(&run, subRun, glyphRect, color, vertexStride,
useColorVerts, glyph);
     return true;
 }