combine glyph and image bulk alloc, and adjust initial alloc size, to reduce total waste from 50% t…

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 212 matching lines @@
     SkPaint::FontMetrics fFontMetrics;
 
     enum {
         kHashBits   = 8,
         kHashCount  = 1 << kHashBits,
         kHashMask   = kHashCount - 1
     };
     SkGlyph*            fGlyphHash[kHashCount];
     SkTDArray<SkGlyph*> fGlyphArray;
     SkChunkAlloc        fGlyphAlloc;
-    SkChunkAlloc        fImageAlloc;
 
     int fMetricsCount, fAdvanceCount;
 
     struct CharGlyphRec {
         uint32_t    fID;    // unichar + subpixel
         SkGlyph*    fGlyph;
     };
     // no reason to use the same kHashCount as fGlyphHash, but we do for now
     CharGlyphRec    fCharToGlyphHash[kHashCount];
 
@@ skipping 48 matching lines @@
         }
     }
 
 private:
     SkGlyphCache*   fCache;
 
     static bool DetachProc(const SkGlyphCache*, void*);
 };
 
 #endif