diff options
Diffstat (limited to 'chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h')
-rw-r--r-- | chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h b/chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h index ab80f89a8ff..45ca524b315 100644 --- a/chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h +++ b/chromium/third_party/WebKit/Source/core/events/GenericEventQueue.h @@ -35,15 +35,15 @@ namespace WebCore { -class GenericEventQueue : public EventQueue { - WTF_MAKE_FAST_ALLOCATED; +class GenericEventQueue FINAL : public EventQueue { + WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED; public: - explicit GenericEventQueue(EventTarget*); - static PassOwnPtr<GenericEventQueue> create(EventTarget*); + static PassOwnPtrWillBeRawPtr<GenericEventQueue> create(EventTarget*); virtual ~GenericEventQueue(); // EventQueue - virtual bool enqueueEvent(PassRefPtr<Event>) OVERRIDE; + virtual void trace(Visitor*) OVERRIDE; + virtual bool enqueueEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE; virtual bool cancelEvent(Event*) OVERRIDE; virtual void close() OVERRIDE; @@ -51,10 +51,11 @@ public: bool hasPendingEvents() const; private: + explicit GenericEventQueue(EventTarget*); void timerFired(Timer<GenericEventQueue>*); - EventTarget* m_owner; - Vector<RefPtr<Event> > m_pendingEvents; + RawPtrWillBeMember<EventTarget> m_owner; + WillBeHeapVector<RefPtrWillBeMember<Event> > m_pendingEvents; Timer<GenericEventQueue> m_timer; bool m_isClosed; |