Start stripping out complicated parts of SkPicture{Record,Data}.

tests/BitmapHeapTest.cpp

 /*
  * Copyright 2012 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 #include "SkBitmap.h"
 #include "SkBitmapHeap.h"
 #include "SkColor.h"
 #include "SkFlattenable.h"
 #include "SkWriteBuffer.h"
 #include "SkPictureFlat.h"
 #include "SkRefCnt.h"
 #include "SkShader.h"
 #include "Test.h"
 
+struct SimpleFlatController : public SkFlatController {
+    SimpleFlatController() : SkFlatController() {}

[robertphillips, 2014/11/12 17:14:42]

SK_OVERRIDE on these two ?

+    virtual void* allocThrow(size_t bytes) { return sk_malloc_throw(bytes); }
+    virtual void unalloc(void* ptr) { sk_free(ptr); }
+    void setBitmapStorage(SkBitmapHeap* h) { this->setBitmapHeap(h); }
+};
+
 struct SkShaderTraits {
     static void Flatten(SkWriteBuffer& buffer, const SkShader& shader) {
         buffer.writeFlattenable(&shader);
     }
 };
 typedef SkFlatDictionary<SkShader, SkShaderTraits> FlatDictionary;
 
 class SkBitmapHeapTester {
-
 public:
     static int32_t GetRefCount(const SkBitmapHeapEntry* entry) {
         return entry->fRefCount;
     }
 };
 
 DEF_TEST(BitmapHeap, reporter) {
     // Create a bitmap shader.
     SkBitmap bm;
     bm.allocN32Pixels(2, 2);
     bm.eraseColor(SK_ColorRED);
     uint32_t* pixel = bm.getAddr32(1,0);
     *pixel = SK_ColorBLUE;
 
     SkShader* bitmapShader = SkShader::CreateBitmapShader(bm, SkShader::kRepeat_TileMode,
                                                           SkShader::kRepeat_TileMode);
     SkAutoTUnref<SkShader> aur(bitmapShader);
 
     // Flatten, storing it in the bitmap heap.
     SkBitmapHeap heap(1, 1);
-    SkChunkFlatController controller(1024);
+    SimpleFlatController controller;
     controller.setBitmapStorage(&heap);
     FlatDictionary dictionary(&controller);
 
     // Dictionary and heap start off empty.
     REPORTER_ASSERT(reporter, heap.count() == 0);
     REPORTER_ASSERT(reporter, dictionary.count() == 0);
 
     heap.deferAddingOwners();
     int index = dictionary.find(*bitmapShader);
     heap.endAddingOwnersDeferral(true);
@@ skipping 18 matching lines @@
     heap.deferAddingOwners();
     index = dictionary.find(*bitmapShader);
     heap.endAddingOwnersDeferral(false);
 
     // The dictionary should report the same index since the new entry is identical.
     // The bitmap heap should contain the bitmap, but with no references.
     REPORTER_ASSERT(reporter, 1 == index);
     REPORTER_ASSERT(reporter, heap.count() == 1);
     REPORTER_ASSERT(reporter, SkBitmapHeapTester::GetRefCount(heap.getEntry(0)) == 0);
 }