Refactor SkGrFontScaler and SkGrFontKey into non-virtual versions.

src/gpu/GrTextStrike_impl.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.
  */
 
 
 
 #ifndef GrTextStrike_impl_DEFINED
 #define GrTextStrike_impl_DEFINED
 
 class GrFontCache::Key {
 public:
-    explicit Key(const GrKey* fontScalarKey) {
+    explicit Key(const GrFontDescKey* fontScalarKey) {
         fFontScalerKey = fontScalarKey;
     }
 
     intptr_t getHash() const { return fFontScalerKey->getHash(); }
 
     static bool LessThan(const GrTextStrike& strike, const Key& key) {
         return *strike.getFontScalerKey() < *key.fFontScalerKey;
     }
     static bool Equals(const GrTextStrike& strike, const Key& key) {
         return *strike.getFontScalerKey() == *key.fFontScalerKey;
     }
 
 private:
-    const GrKey* fFontScalerKey;
+    const GrFontDescKey* fFontScalerKey;
 };
 
 void GrFontCache::detachStrikeFromList(GrTextStrike* strike) {
     if (strike->fPrev) {
         SkASSERT(fHead != strike);
         strike->fPrev->fNext = strike->fNext;
     } else {
         SkASSERT(fHead == strike);
         fHead = strike->fNext;
     }
@@ skipping 55 matching lines @@
 GrGlyph* GrTextStrike::getGlyph(GrGlyph::PackedID packed,
                                 GrFontScaler* scaler) {
     GrGlyph* glyph = fCache.find(packed);
     if (NULL == glyph) {
         glyph = this->generateGlyph(packed, scaler);
     }
     return glyph;
 }
 
 #endif