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