Move the GlyphCache to use a hash table instead of doing its own ad-hoc

src/core/SkGlyph.h

 /*
  * Copyright 2006 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #ifndef SkGlyph_DEFINED
 #define SkGlyph_DEFINED
 
@@ skipping 99 matching lines @@
         encounters an error measuring a glyph). Note: this does not alter the
         fImage, fPath, fID, fMaskFormat fields.
      */
     void zeroMetrics();
 
     void toMask(SkMask* mask) const;
 
  private:
     // TODO(herb) remove friend statement after SkGlyphCache cleanup.
     friend class SkGlyphCache;
+    friend class GlyphTrait;
 
     void initCommon(uint32_t id) {
         fID             = id;
         fImage          = NULL;
         fPath           = NULL;
         fMaskFormat     = MASK_FORMAT_UNKNOWN;
         fForceBW        = 0;
     }
 
     static unsigned ID2Code(uint32_t id) {
@@ skipping 36 matching lines @@
 
   // FIXME - This is needed because the Android frame work directly
   // accesses fID. Remove when fID accesses are cleaned up.
 #ifdef SK_BUILD_FOR_ANDROID_FRAMEWORK
   public:
 #endif
     uint32_t    fID;
 };
 
 #endif