Revert of Add SkNVRefCnt, prune down SkPicture's size

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"
@@ skipping 13 matching lines @@
     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.
+// array of SkRefCnt* 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
+    int count = SkToInt(length / sizeof(SkRefCnt*));
+    SkASSERT(count * sizeof(SkRefCnt*) == length);  // our length is snug for the array
 
-    SkPicture* const* array = reinterpret_cast<SkPicture* const*>(ptr);
+    SkRefCnt* const* array = reinterpret_cast<SkRefCnt* 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
+// Return an uninitialized SkData sized for "count" SkRefCnt 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*);
+static SkData* new_uninitialized_refcnt_ptrs(int count) {
+    size_t length = count * sizeof(SkRefCnt*);
     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) {
     const int count = fDrawableList.count();
     if (0 == count) {
         return NULL;
     }
-    SkData* data = new_uninitialized_picture_ptrs(count);
+    SkData* data = new_uninitialized_refcnt_ptrs(count);
     SkPicture** pics = reinterpret_cast<SkPicture**>(data->writable_data());
     for (int i = 0; i < count; ++i) {
         pics[i] = fDrawableList[i]->newPictureSnapshot(factory, recordFlags);
     }
     return data;
 }
 
 // To make appending to fRecord a little less verbose.
 #define APPEND(T, ...) \
         SkNEW_PLACEMENT_ARGS(fRecord->append<SkRecords::T>(), SkRecords::T, (__VA_ARGS__))
@@ skipping 297 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);
 }