Revert of Ensure that we use different glyph entries for regular and df text.

src/gpu/GrFontCache.h

Index: src/gpu/GrFontCache.h
diff --git a/src/gpu/GrFontCache.h b/src/gpu/GrFontCache.h
index 31e56016db974b55142bf539968184cecee8b4ae..6ee39d0c47ff035d3485f25248e84f38abe2105e 100644
--- a/src/gpu/GrFontCache.h
+++ b/src/gpu/GrFontCache.h
@@ -72,6 +72,7 @@
     SkVarAlloc fPool;
 
     GrFontCache*    fFontCache;
+    bool            fUseDistanceField;
 
     GrAtlas::ClientPlotUsage fPlotUsage;
 
@@ -85,7 +86,7 @@
     GrFontCache(GrGpu*);
     ~GrFontCache();
 
-    inline GrTextStrike* getStrike(GrFontScaler* scaler) {
+    inline GrTextStrike* getStrike(GrFontScaler* scaler, bool useDistanceField) {
         this->validate();
         
         GrTextStrike* strike = fCache.find(*(scaler->getKey()));
@@ -101,6 +102,7 @@
             strike->fPrev = NULL;
             fHead = strike;
         }
+        strike->fUseDistanceField = useDistanceField;
         this->validate();
         return strike;
     }