Remove Picture deletion listeners.

include/core/SkPicture.h

Index: include/core/SkPicture.h
diff --git a/include/core/SkPicture.h b/include/core/SkPicture.h
index d5c07a37d3e717a0ffe400fc2f51b9cffc4a63a8..7356c2b3d25d3f91521a38c2a377d7a71b92c6c5 100644
--- a/include/core/SkPicture.h
+++ b/include/core/SkPicture.h
@@ -180,14 +180,6 @@ public:
     bool suitableForGpuRasterization(GrContext*, const char ** = NULL) const;
 #endif
 
-    class DeletionListener : public SkRefCnt {
-    public:
-        virtual void onDeletion(uint32_t pictureID) = 0;
-    };
-
-    // Takes ref on listener.
-    void addDeletionListener(DeletionListener* listener) const;
-
     /** Return the approximate number of operations in this picture.  This
      *  number may be greater or less than the number of SkCanvas calls
      *  recorded: some calls may be recorded as more than one operation, or some
@@ -211,6 +203,9 @@ public:
         size_t fCount;
     };
 
+    // Sent via SkMessageBus from destructor.

[robertphillips, 2014/11/24 15:13:15]

fUniqueID ?

[mtklein, 2014/11/24 16:05:05]

Done, though I think this is probably a net negative for readability.  It
doesn't seem valuable to have an fPrefix on struct fields, particularly when the
struct has no methods.  Access to the field will always have a prefix (e.g.
msg.uniqueID, ms->uniqueID) that makes it completely unambiguous that it's a
member.

+    struct DeletionMessage { int32_t uniqueID; };
+
 private:
     // V2 : adds SkPixelRef's generation ID.
     // V3 : PictInfo tag at beginning, and EOF tag at the end
@@ -258,8 +253,6 @@ private:
     static const uint32_t MIN_PICTURE_VERSION = 19;
     static const uint32_t CURRENT_PICTURE_VERSION = 37;
 
-    void callDeletionListeners();
-
     void createHeader(SkPictInfo* info) const;
     static bool IsValidPictInfo(const SkPictInfo& info);
 
@@ -274,7 +267,6 @@ private:
     const uint32_t                        fUniqueID;
     const SkRect                          fCullRect;
     mutable SkAutoTUnref<const AccelData> fAccelData;
-    mutable SkTDArray<DeletionListener*> fDeletionListeners;  // pointers are refed
     SkAutoTDelete<const SkRecord>       fRecord;
     SkAutoTUnref<const SkBBoxHierarchy> fBBH;
     SkAutoTUnref<const SnapshotArray>   fDrawablePicts;