SkData -> SkPicture::SnapshotArray

src/core/SkRecorder.cpp

Index: src/core/SkRecorder.cpp
diff --git a/src/core/SkRecorder.cpp b/src/core/SkRecorder.cpp
index 33d89d90794c26ca2bdfc78ad8d4c72e47651205..4b965fd7f9ab4da34eaba4ad89a190a12ef2253d 100644
--- a/src/core/SkRecorder.cpp
+++ b/src/core/SkRecorder.cpp
@@ -5,7 +5,6 @@
  * found in the LICENSE file.
  */
 
-#include "SkData.h"
 #include "SkRecorder.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
@@ -30,42 +29,17 @@ void SkRecorder::forgetRecord() {
     fRecord = NULL;
 }
 
-// ReleaseProc for SkData, assuming the data was allocated via sk_malloc, and its contents are an
-// array of SkPicture* which need to be unref'd.
-//
-static void unref_all_malloc_releaseProc(const void* ptr, size_t length, void* context) {
-    SkASSERT(ptr == context);   // our context is our ptr, allocated via sk_malloc
-    int count = SkToInt(length / sizeof(SkPicture*));
-    SkASSERT(count * sizeof(SkPicture*) == length);  // our length is snug for the array
-
-    SkPicture* const* array = reinterpret_cast<SkPicture* const*>(ptr);
-    for (int i = 0; i < count; ++i) {
-        SkSafeUnref(array[i]);
-    }
-    sk_free(context);
-}
-
-// Return an uninitialized SkData sized for "count" SkPicture pointers. They will be unref'd when
-// the SkData is destroyed.
-//
-static SkData* new_uninitialized_picture_ptrs(int count) {
-    size_t length = count * sizeof(SkPicture*);
-    void* array = sk_malloc_throw(length);
-    void* context = array;
-    return SkData::NewWithProc(array, length, unref_all_malloc_releaseProc, context);
-}
-
-SkData* SkRecorder::newDrawableSnapshot(SkBBHFactory* factory, uint32_t recordFlags) {
+SkPicture::SnapshotArray* SkRecorder::newDrawableSnapshot(SkBBHFactory* factory,
+                                                          uint32_t recordFlags) {
     const int count = fDrawableList.count();
     if (0 == count) {
         return NULL;
     }
-    SkData* data = new_uninitialized_picture_ptrs(count);
-    SkPicture** pics = reinterpret_cast<SkPicture**>(data->writable_data());
+    SkPicture::SnapshotArray* pics = SkNEW_ARGS(SkPicture::SnapshotArray, (count));

[reed1, 2014/11/20 20:36:47]

Seems like this section could turn into:

SkPicture** array = new ...[count];
for (int i = 0; ...) 
    array[i] = newshapshot;

return new SnapshotArray(array, count);

     for (int i = 0; i < count; ++i) {
-        pics[i] = fDrawableList[i]->newPictureSnapshot(factory, recordFlags);
+        (*pics)[i] = fDrawableList[i]->newPictureSnapshot(factory, recordFlags);
     }
-    return data;
+    return pics;
 }
 
 // To make appending to fRecord a little less verbose.