SkData -> SkPicture::SnapshotArray

src/core/SkPicture.cpp

 
 /*
  * Copyright 2007 The Android Open Source Project
  *
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 
 #include "SkPictureFlat.h"
@@ skipping 240 matching lines @@
             *reason = "Too many anti-aliased concave paths.";
         else
             *reason = "Unknown reason for GPU unsuitability.";
     }
     return ret;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 
 int SkPicture::drawableCount() const {
-    if (fDrawablePicts.get()) {
-        return SkToInt(fDrawablePicts->size() / sizeof(SkPicture*));
-    } else {
-        return 0;
-    }
+    return fDrawablePicts.get() ? fDrawablePicts->count() : 0;
 }
 
 SkPicture const* const* SkPicture::drawablePicts() const {
-    if (fDrawablePicts) {
-        return reinterpret_cast<SkPicture* const*>(fDrawablePicts->data());
-    }
-    return NULL;
+    return fDrawablePicts.get() ? fDrawablePicts->begin() : NULL;
 }
 
 SkPicture::~SkPicture() {
     this->callDeletionListeners();
 }
 
 void SkPicture::EXPERIMENTAL_addAccelData(const SkPicture::AccelData* data) const {
     fAccelData.reset(SkRef(data));
 }
 
@@ skipping 240 matching lines @@
     return genID;
 }
 
 uint32_t SkPicture::uniqueID() const {
     if (SK_InvalidGenID == fUniqueID) {
         fUniqueID = next_picture_generation_id();
     }
     return fUniqueID;
 }
 
-SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SkData* drawablePicts,
+SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SnapshotArray* drawablePicts,
                      SkBBoxHierarchy* bbh)
     : fCullRect(cullRect)
     , fRecord(record)
     , fBBH(SkSafeRef(bbh))
     , fDrawablePicts(SkSafeRef(drawablePicts))
     , fAnalysis(*fRecord) {
     this->needsNewGenID();
 }
 
 // Note that we are assuming that this entry point will only be called from
 // one thread. Currently the only client of this method is
 // SkGpuDevice::EXPERIMENTAL_optimize which should be only called from a single
 // thread.
 void SkPicture::addDeletionListener(DeletionListener* listener) const {
     SkASSERT(listener);
 
     *fDeletionListeners.append() = SkRef(listener);
 }
 
 void SkPicture::callDeletionListeners() {
     for (int i = 0; i < fDeletionListeners.count(); ++i) {
         fDeletionListeners[i]->onDeletion(this->uniqueID());
     }
 
     fDeletionListeners.unrefAll();
 }