diff options
Diffstat (limited to 'src/core/SkMessageBus.h')
| -rw-r--r-- | src/core/SkMessageBus.h | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/src/core/SkMessageBus.h b/src/core/SkMessageBus.h index 1290ea965f..a005c3b9df 100644 --- a/src/core/SkMessageBus.h +++ b/src/core/SkMessageBus.h @@ -38,19 +38,21 @@ public: private: SkMessageBus(); static SkMessageBus* Get(); - static SkMessageBus* New(); + + // Allow SkLazyPtr to call SkMessageBus::SkMessageBus(). + template <typename T> friend T* Private::sk_new(); SkTDArray<Inbox*> fInboxes; SkMutex fInboxesMutex; }; // This must go in a single .cpp file, not some .h, or we risk creating more than one global -// SkMessageBus per type when using shared libraries. -#define DECLARE_SKMESSAGEBUS_MESSAGE(Message) \ - template <> \ - SkMessageBus<Message>* SkMessageBus<Message>::Get() { \ - SK_DECLARE_STATIC_LAZY_PTR(SkMessageBus<Message>, bus, New); \ - return bus.get(); \ +// SkMessageBus per type when using shared libraries. NOTE: at most one per file will compile. +#define DECLARE_SKMESSAGEBUS_MESSAGE(Message) \ + SK_DECLARE_STATIC_LAZY_PTR(SkMessageBus<Message>, bus); \ + template <> \ + SkMessageBus<Message>* SkMessageBus<Message>::Get() { \ + return bus.get(); \ } // ----------------------- Implementation of SkMessageBus::Inbox ----------------------- @@ -97,11 +99,6 @@ template <typename Message> SkMessageBus<Message>::SkMessageBus() {} template <typename Message> -/*static*/ SkMessageBus<Message>* SkMessageBus<Message>::New() { - return SkNEW(SkMessageBus<Message>); -} - -template <typename Message> /*static*/ void SkMessageBus<Message>::Post(const Message& m) { SkMessageBus<Message>* bus = SkMessageBus<Message>::Get(); SkAutoMutexAcquire lock(bus->fInboxesMutex); |