Remove Picture deletion listeners.

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"
 #include "SkPictureData.h"
 #include "SkPicturePlayback.h"
 #include "SkPictureRecord.h"
 #include "SkPictureRecorder.h"
 
 #include "SkBitmapDevice.h"
 #include "SkCanvas.h"
 #include "SkChunkAlloc.h"
 #include "SkDrawPictureCallback.h"
+#include "SkMessageBus.h"
 #include "SkPaintPriv.h"
 #include "SkPathEffect.h"
 #include "SkPicture.h"
 #include "SkRegion.h"
 #include "SkShader.h"
 #include "SkStream.h"
 #include "SkTDArray.h"
 #include "SkTLogic.h"
 #include "SkTSearch.h"
 #include "SkTime.h"
 
 #include "SkReader32.h"
 #include "SkWriter32.h"
 #include "SkRTree.h"
 
 #if SK_SUPPORT_GPU
 #include "GrContext.h"
 #endif
 
 #include "SkRecord.h"
 #include "SkRecordDraw.h"
 #include "SkRecordOpts.h"
 #include "SkRecorder.h"
 
+DECLARE_SKMESSAGEBUS_MESSAGE(SkPicture::DeletionMessage);
+
 template <typename T> int SafeCount(const T* obj) {
     return obj ? obj->count() : 0;
 }
 
 static int32_t gPictureGenerationID;
 
 // never returns a 0
 static int32_t next_picture_generation_id() {
     // Loop in case our global wraps around.
     int32_t genID;
@@ skipping 217 matching lines @@
 
 int SkPicture::drawableCount() const {
     return fDrawablePicts.get() ? fDrawablePicts->count() : 0;
 }
 
 SkPicture const* const* SkPicture::drawablePicts() const {
     return fDrawablePicts.get() ? fDrawablePicts->begin() : NULL;
 }
 
 SkPicture::~SkPicture() {
-    this->callDeletionListeners();
+    SkPicture::DeletionMessage msg;
+    msg.fUniqueID = this->uniqueID();
+    SkMessageBus<SkPicture::DeletionMessage>::Post(msg);
 }
 
 void SkPicture::EXPERIMENTAL_addAccelData(const SkPicture::AccelData* data) const {
     fAccelData.reset(SkRef(data));
 }
 
 const SkPicture::AccelData* SkPicture::EXPERIMENTAL_getAccelData(
         SkPicture::AccelData::Key key) const {
     if (fAccelData.get() && fAccelData->getKey() == key) {
         return fAccelData.get();
@@ skipping 227 matching lines @@
 
 SkPicture::SkPicture(const SkRect& cullRect, SkRecord* record, SnapshotArray* drawablePicts,
                      SkBBoxHierarchy* bbh)
     : fUniqueID(next_picture_generation_id())
     , fCullRect(cullRect)
     , fRecord(record)
     , fBBH(SkSafeRef(bbh))
     , fDrawablePicts(drawablePicts)
     , fAnalysis(*fRecord)
 {}
-
-// 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();
-}