Revert of patch from issue 885453002 at patchset 20001 (http://crrev.com/885453002#ps20001)

src/core/SkGlyphCache.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 SkGlyphCache_DEFINED
@@ skipping 184 matching lines @@
     };
     SkGlyph*            fGlyphHash[kHashCount];
     SkTDArray<SkGlyph*> fGlyphArray;
     SkChunkAlloc        fGlyphAlloc;
 
     struct CharGlyphRec {
         uint32_t    fID;    // unichar + subpixel
         SkGlyph*    fGlyph;
     };
     // no reason to use the same kHashCount as fGlyphHash, but we do for now
-    // Dynamically allocated when chars are encountered.
-    SkAutoTDelete<CharGlyphRec> fCharToGlyphHash;
-    
-    CharGlyphRec* getCharGlyphRec(uint32_t id);
+    CharGlyphRec    fCharToGlyphHash[kHashCount];
 
     static inline unsigned ID2HashIndex(uint32_t id) {
         id ^= id >> 16;
         id ^= id >> 8;
         return id & kHashMask;
     }
 
     // used to track (approx) how much ram is tied-up in this cache
     size_t  fMemoryUsed;
 
@@ skipping 74 matching lines @@
                             const SkMatrix* matrix) {
         fCache = paint.detachCache(deviceProperties, matrix, true);
     }
 
 private:
     SkAutoGlyphCacheNoGamma() : SkAutoGlyphCacheBase() {}
 };
 #define SkAutoGlyphCacheNoGamma(...) SK_REQUIRE_LOCAL_VAR(SkAutoGlyphCacheNoGamma)
 
 #endif