Followup: remove unnecessary SkTRefArray

src/core/SkPictureFlat.h

 
 /*
  * Copyright 2011 Google Inc.
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 #ifndef SkPictureFlat_DEFINED
 #define SkPictureFlat_DEFINED
 
 
 #include "SkBitmapHeap.h"
 #include "SkChecksum.h"
 #include "SkChunkAlloc.h"
 #include "SkReadBuffer.h"
 #include "SkWriteBuffer.h"
 #include "SkPaint.h"
 #include "SkPicture.h"
 #include "SkPtrRecorder.h"
 #include "SkTDynamicHash.h"
-#include "SkTRefArray.h"
 
 enum DrawType {
     UNUSED,
     CLIP_PATH,
     CLIP_REGION,
     CLIP_RECT,
     CLIP_RRECT,
     CONCAT,
     DRAW_BITMAP,
     DRAW_BITMAP_MATRIX,
@@ skipping 410 matching lines @@
         // findAndReturnMutableFlat already called fHash.add(), so we just clean up the old entry.
         fHash.remove(*found);
         fController->unalloc((void*)found);
         SkASSERT(this->count() == oldCount);
 
         *replaced = true;
         return flat;
     }
 
     /**
-     *  Unflatten the objects and return them in SkTRefArray, or return NULL
-     *  if there no objects.  Caller takes ownership of result.
-     */
-    SkTRefArray<T>* unflattenToArray() const {
-        const int count = this->count();
-        if (count == 0) {
-            return NULL;
-        }
-        SkTRefArray<T>* array = SkTRefArray<T>::Create(count);
-        for (int i = 0; i < count; i++) {
-            this->unflatten(&array->writableAt(i), fIndexedData[i]);
-        }
-        return array;
-    }
-
-    /**
      * Unflatten the specific object at the given index.
      * Caller takes ownership of the result.
      */
     T* unflatten(int index) const {
         // index is 1-based, while fIndexedData is 0-based.
         const SkFlatData* element = fIndexedData[index-1];
         SkASSERT(index == element->index());
 
         T* dst = new T;
         this->unflatten(dst, element);
@@ skipping 86 matching lines @@
     bool fReady;
 
     // For index -> SkFlatData.  0-based, while all indices in the API are 1-based.  Careful!
     SkTDArray<const SkFlatData*> fIndexedData;
 
     // For SkFlatData -> cached SkFlatData, which has index().
     SkTDynamicHash<SkFlatData, SkFlatData, SkFlatData::HashTraits> fHash;
 };
 
 #endif