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

src/core/SkChunkAlloc.cpp

 /*
  * 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.
  */
 
 #include "SkChunkAlloc.h"
 
 // Don't malloc any chunks smaller than this
@@ skipping 34 matching lines @@
 
 SkChunkAlloc::SkChunkAlloc(size_t minSize) {
     if (minSize < MIN_CHUNKALLOC_BLOCK_SIZE) {
         minSize = MIN_CHUNKALLOC_BLOCK_SIZE;
     }
 
     fBlock = NULL;
     fMinSize = minSize;
     fChunkSize = fMinSize;
     fTotalCapacity = 0;
+    fTotalUsed = 0;
     fBlockCount = 0;
 }
 
 SkChunkAlloc::~SkChunkAlloc() {
     this->reset();
 }
 
 void SkChunkAlloc::reset() {
     Block::FreeChain(fBlock);
     fBlock = NULL;
     fChunkSize = fMinSize;  // reset to our initial minSize
     fTotalCapacity = 0;
+    fTotalUsed = 0;
     fBlockCount = 0;
 }
 
 SkChunkAlloc::Block* SkChunkAlloc::newBlock(size_t bytes, AllocFailType ftype) {
     size_t size = bytes;
     if (size < fChunkSize) {
         size = fChunkSize;
     }
 
     Block* block = (Block*)sk_malloc_flags(sizeof(Block) + size,
                         ftype == kThrow_AllocFailType ? SK_MALLOC_THROW : 0);
 
     if (block) {
         //    block->fNext = fBlock;
         block->fFreeSize = size;
         block->fFreePtr = block->startOfData();
 
         fTotalCapacity += size;
         fBlockCount += 1;
 
         fChunkSize = increase_next_size(fChunkSize);
     }
     return block;
 }
 
 void* SkChunkAlloc::alloc(size_t bytes, AllocFailType ftype) {
+    fTotalUsed += bytes;
+    
     bytes = SkAlign4(bytes);
 
     Block* block = fBlock;
 
     if (block == NULL || bytes > block->fFreeSize) {
         block = this->newBlock(bytes, ftype);
         if (NULL == block) {
             return NULL;
         }
         block->fNext = fBlock;
@@ skipping 26 matching lines @@
 bool SkChunkAlloc::contains(const void* addr) const {
     const Block* block = fBlock;
     while (block) {
         if (block->contains(addr)) {
             return true;
         }
         block = block->fNext;
     }
     return false;
 }