SkData -> SkPicture::SnapshotArray

src/core/SkRecorder.cpp

 /*
  * Copyright 2014 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
-#include "SkData.h"
 #include "SkRecorder.h"
 #include "SkPatchUtils.h"
 #include "SkPicture.h"
 
 SkRecorder::SkRecorder(SkRecord* record, int width, int height)
     : SkCanvas(SkIRect::MakeWH(width, height), SkCanvas::kConservativeRasterClip_InitFlag)
     , fRecord(record)
     , fSaveLayerCount(0) {}
 
 SkRecorder::SkRecorder(SkRecord* record, const SkRect& bounds)
     : SkCanvas(bounds.roundOut(), SkCanvas::kConservativeRasterClip_InitFlag)
     , fRecord(record)
     , fSaveLayerCount(0) {}
 
 SkRecorder::~SkRecorder() {
     fDrawableList.unrefAll();
 }
 
 void SkRecorder::forgetRecord() {
     fDrawableList.unrefAll();
     fDrawableList.reset();
     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());
+    SkAutoTMalloc<const SkPicture*> pics(count);
     for (int i = 0; i < count; ++i) {
         pics[i] = fDrawableList[i]->newPictureSnapshot(factory, recordFlags);
     }
-    return data;
+    return SkNEW_ARGS(SkPicture::SnapshotArray, (pics.detach(), count));
 }
 
 // To make appending to fRecord a little less verbose.
 #define APPEND(T, ...) \
         SkNEW_PLACEMENT_ARGS(fRecord->append<SkRecords::T>(), SkRecords::T, (__VA_ARGS__))
 
 // For methods which must call back into SkCanvas.
 #define INHERITED(method, ...) this->SkCanvas::method(__VA_ARGS__)
 
 // The structs we're creating all copy their constructor arguments.  Given the way the SkRecords
@@ skipping 295 matching lines @@
     APPEND(EndCommentGroup);
 }
 
 bool SkRecorder::isDrawingToLayer() const {
     return fSaveLayerCount > 0;
 }
 
 void SkRecorder::drawData(const void* data, size_t length) {
     APPEND(DrawData, copy((const char*)data), length);
 }