diff options
Diffstat (limited to 'include')
-rw-r--r-- | include/gpu/GrResourceKey.h | 18 | ||||
-rw-r--r-- | include/private/SkMessageBus.h | 16 |
2 files changed, 13 insertions, 21 deletions
diff --git a/include/gpu/GrResourceKey.h b/include/gpu/GrResourceKey.h index 5e9bf1f5c0..90b84d72bf 100644 --- a/include/gpu/GrResourceKey.h +++ b/include/gpu/GrResourceKey.h @@ -8,13 +8,13 @@ #ifndef GrResourceKey_DEFINED #define GrResourceKey_DEFINED -#include <new> #include "../private/SkOnce.h" #include "../private/SkTemplates.h" #include "../private/SkTo.h" #include "GrTypes.h" #include "SkData.h" #include "SkString.h" +#include <new> uint32_t GrResourceKeyHash(const uint32_t* data, size_t size); @@ -315,22 +315,18 @@ static inline void gr_init_static_unique_key_once(SkAlignedSTStorage<1,GrUniqueK // The cache listens for these messages to purge junk resources proactively. class GrUniqueKeyInvalidatedMessage { public: - GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key, uint32_t contextUniqueID) - : fKey(key), fContextID(contextUniqueID) { - SkASSERT(SK_InvalidUniqueID != contextUniqueID); - } + explicit GrUniqueKeyInvalidatedMessage(const GrUniqueKey& key) : fKey(key) {} - GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage&) = default; + GrUniqueKeyInvalidatedMessage(const GrUniqueKeyInvalidatedMessage& that) : fKey(that.fKey) {} - GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage&) = default; + GrUniqueKeyInvalidatedMessage& operator=(const GrUniqueKeyInvalidatedMessage& that) { + fKey = that.fKey; + return *this; + } const GrUniqueKey& key() const { return fKey; } - bool shouldSend(uint32_t inboxID) const { return fContextID == inboxID; } - private: GrUniqueKey fKey; - uint32_t fContextID; }; - #endif diff --git a/include/private/SkMessageBus.h b/include/private/SkMessageBus.h index 418235d68e..19e937555d 100644 --- a/include/private/SkMessageBus.h +++ b/include/private/SkMessageBus.h @@ -14,17 +14,13 @@ #include "SkTDArray.h" #include "SkTypes.h" -/** - * Message must implement bool Message::shouldSend(uint32_t inboxID) const. Perhaps someday we - * can use std::experimental::is_detected to avoid this requirement by sending to all inboxes when - * the method is not detected on Message. - */ template <typename Message> class SkMessageBus : SkNoncopyable { public: - // Post a message to be received by Inboxes for this Message type. Checks - // Message::shouldSend() for each inbox. Threadsafe. - static void Post(const Message& m); + // Post a message to be received by Inboxes for this Message type. Threadsafe. + // If id is SK_InvalidUniqueID then it will be sent to all inboxes. + // Otherwise it will be sent to the inbox with that id. + static void Post(const Message& m, uint32_t destID = SK_InvalidUniqueID); class Inbox { public: @@ -106,11 +102,11 @@ template <typename Message> SkMessageBus<Message>::SkMessageBus() {} template <typename Message> -/*static*/ void SkMessageBus<Message>::Post(const Message& m) { +/*static*/ void SkMessageBus<Message>::Post(const Message& m, uint32_t destID) { SkMessageBus<Message>* bus = SkMessageBus<Message>::Get(); SkAutoMutexAcquire lock(bus->fInboxesMutex); for (int i = 0; i < bus->fInboxes.count(); i++) { - if (m.shouldSend(bus->fInboxes[i]->fUniqueID)) { + if (SK_InvalidUniqueID == destID || bus->fInboxes[i]->fUniqueID == destID) { bus->fInboxes[i]->receive(m); } } |