ccpr: Unregister path listeners when their cache entries are evicted
Bug: skia:8452
Change-Id: I5cf63c07481db38fc37e920e04ca140bad8966e4
Reviewed-on: https://skia-review.googlesource.com/c/163560
Reviewed-by: Brian Salomon <bsalomon@google.com>
Commit-Queue: Chris Dalton <csmartdalton@google.com>
diff --git a/include/private/SkPathRef.h b/include/private/SkPathRef.h
index 92568d8..49cc28f 100644
--- a/include/private/SkPathRef.h
+++ b/include/private/SkPathRef.h
@@ -15,6 +15,7 @@
#include "SkRRect.h"
#include "SkRect.h"
#include "SkRefCnt.h"
+#include "SkTArray.h"
#include "SkTDArray.h"
#include "SkTemplates.h"
#include "SkTo.h"
@@ -309,9 +310,24 @@
*/
uint32_t genID() const;
- struct GenIDChangeListener : SkRefCnt {
+ class GenIDChangeListener : public SkRefCnt {
+ public:
+ GenIDChangeListener() : fShouldUnregisterFromPath(false) {}
virtual ~GenIDChangeListener() {}
+
virtual void onChange() = 0;
+
+ // The caller can use this method to notify the path that it no longer needs to listen. Once
+ // called, the path will remove this listener from the list at some future point.
+ void markShouldUnregisterFromPath() {
+ fShouldUnregisterFromPath.store(true, std::memory_order_relaxed);
+ }
+ bool shouldUnregisterFromPath() {
+ return fShouldUnregisterFromPath.load(std::memory_order_relaxed);
+ }
+
+ private:
+ mutable std::atomic<bool> fShouldUnregisterFromPath;
};
void addGenIDChangeListener(sk_sp<GenIDChangeListener>); // Threadsafe.
@@ -545,8 +561,8 @@
mutable uint32_t fGenerationID;
SkDEBUGCODE(int32_t fEditorsAttached;) // assert that only one editor in use at any time.
- SkMutex fGenIDChangeListenersMutex;
- SkTDArray<GenIDChangeListener*> fGenIDChangeListeners; // pointers are reffed
+ SkMutex fGenIDChangeListenersMutex;
+ SkTArray<sk_sp<GenIDChangeListener>> fGenIDChangeListeners;
mutable uint8_t fBoundsIsDirty;
mutable bool fIsFinite; // only meaningful if bounds are valid