Start from scratch on a faster SkFlatDictionary.

src/core/SkPictureFlat.cpp

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #include "SkPictureFlat.h"
 
 #include "SkChecksum.h"
@@ skipping 76 matching lines @@
     fTypefacePlayback = playback;
 }
 
 SkNamedFactorySet* SkFlatController::setNamedFactorySet(SkNamedFactorySet* set) {
     SkRefCnt_SafeAssign(fFactorySet, set);
     return set;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
+void SkFlatData::stampHeaderAndSentinel(int index, int32_t size) {
+    fIndex    = index;
+    fFlatSize = size;
+    fChecksum = SkChecksum::Compute(this->data32(), size);
+    this->setTopBotUnwritten();
+    this->setSentinelAsCandidate();
+}
+
 SkFlatData* SkFlatData::Create(SkFlatController* controller, const void* obj,
         int index, void (*flattenProc)(SkOrderedWriteBuffer&, const void*)) {
     // a buffer of 256 bytes should be sufficient for most paints, regions,
     // and matrices.
     intptr_t storage[256];
     SkOrderedWriteBuffer buffer(256, storage, sizeof(storage));
 
     buffer.setBitmapHeap(controller->getBitmapHeap());
     buffer.setTypefaceRecorder(controller->getTypefaceSet());
     buffer.setNamedFactoryRecorder(controller->getNamedFactorySet());
     buffer.setFlags(controller->getWriteBufferFlags());
 
     flattenProc(buffer, obj);
     uint32_t size = buffer.size();
     SkASSERT(SkIsAlign4(size));
 
     /**
      *  Allocate enough memory to hold
      *  1. SkFlatData struct
      *  2. flattenProc's data (4-byte aligned)
      *  3. 4-byte sentinel
      */
     size_t allocSize = sizeof(SkFlatData) + size + sizeof(uint32_t);
     SkFlatData* result = (SkFlatData*) controller->allocThrow(allocSize);
 
-    result->setIndex(index);
-    result->setTopBotUnwritten();
-    result->fFlatSize = size;
-
     // put the serialized contents into the data section of the new allocation
     buffer.writeToMemory(result->data());
-    result->fChecksum = SkChecksum::Compute(result->data32(), size);
-    result->setSentinelAsCandidate();
+    result->stampHeaderAndSentinel(index, size);
     return result;
 }
 
 void SkFlatData::unflatten(void* result,
         void (*unflattenProc)(SkOrderedReadBuffer&, void*),
         SkBitmapHeap* bitmapHeap,
         SkTypefacePlayback* facePlayback) const {
 
     SkOrderedReadBuffer buffer(this->data(), fFlatSize);
 
     if (bitmapHeap) {
         buffer.setBitmapStorage(bitmapHeap);
     }
     if (facePlayback) {
         facePlayback->setupBuffer(buffer);
     }
 
     unflattenProc(buffer, result);
     SkASSERT(fFlatSize == (int32_t)buffer.offset());
 }