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

src/gpu/GrFontCache.h

 
 /*
  * Copyright 2010 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 
@@ skipping 54 matching lines @@
     // for easy removal from list
     GrTextStrike*   fPrev;
     GrTextStrike*   fNext;
 
 private:
     SkTDynamicHash<GrGlyph, GrGlyph::PackedID> fCache;
     const GrFontDescKey* fFontScalerKey;
     SkVarAlloc fPool;
 
     GrFontCache*    fFontCache;
+    bool            fUseDistanceField;
 
     GrAtlas::ClientPlotUsage fPlotUsage;
 
     GrGlyph* generateGlyph(GrGlyph::PackedID packed, GrFontScaler* scaler);
 
     friend class GrFontCache;
 };
 
 class GrFontCache {
 public:
     GrFontCache(GrGpu*);
     ~GrFontCache();
 
-    inline GrTextStrike* getStrike(GrFontScaler* scaler) {
+    inline GrTextStrike* getStrike(GrFontScaler* scaler, bool useDistanceField) {
         this->validate();
         
         GrTextStrike* strike = fCache.find(*(scaler->getKey()));
         if (NULL == strike) {
             strike = this->generateStrike(scaler);
         } else if (strike->fPrev) {
             // Need to put the strike at the head of its dllist, since that is how
             // we age the strikes for purging (we purge from the back of the list)
             this->detachStrikeFromList(strike);
             // attach at the head
             fHead->fPrev = strike;
             strike->fNext = fHead;
             strike->fPrev = NULL;
             fHead = strike;
         }
+        strike->fUseDistanceField = useDistanceField;
         this->validate();
         return strike;
     }
 
     // add to texture atlas that matches this format
     GrPlot* addToAtlas(GrMaskFormat format, GrAtlas::ClientPlotUsage* usage,
                        int width, int height, const void* image,
                        SkIPoint16* loc);
 
     void freeAll();
@@ skipping 58 matching lines @@
         } else {
             SkASSERT(fTail == strike);
             fTail = strike->fPrev;
         }
     }
     
     void purgeStrike(GrTextStrike* strike);
 };
 
 #endif