Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / Source / core / workers / WorkerEventQueue.h

diff --git a/src/third_party/WebKit/Source/core/workers/WorkerEventQueue.h b/src/third_party/WebKit/Source/core/workers/WorkerEventQueue.h
index cdbd169..152c2b2 100644 (file)
--- a/src/third_party/WebKit/Source/core/workers/WorkerEventQueue.h
+++ b/src/third_party/WebKit/Source/core/workers/WorkerEventQueue.h
@@ -33,21 +33,22 @@
 #include "wtf/PassOwnPtr.h"
 #include "wtf/RefCounted.h"
 
-namespace WebCore {
+namespace blink {
 
 class Event;
 class Node;
 class ExecutionContext;
 
 class WorkerEventQueue FINAL : public EventQueue {
-    WTF_MAKE_FAST_ALLOCATED;
+    WTF_MAKE_FAST_ALLOCATED_WILL_BE_REMOVED;
 public:
 
-    static PassOwnPtr<WorkerEventQueue> create(ExecutionContext*);
+    static PassOwnPtrWillBeRawPtr<WorkerEventQueue> create(ExecutionContext*);
     virtual ~WorkerEventQueue();
+    void trace(Visitor*);
 
     // EventQueue
-    virtual bool enqueueEvent(PassRefPtr<Event>) OVERRIDE;
+    virtual bool enqueueEvent(PassRefPtrWillBeRawPtr<Event>) OVERRIDE;
     virtual bool cancelEvent(Event*) OVERRIDE;
     virtual void close() OVERRIDE;
 
@@ -55,11 +56,11 @@ private:
     explicit WorkerEventQueue(ExecutionContext*);
     void removeEvent(Event*);
 
-    ExecutionContext* m_executionContext;
+    RawPtrWillBeMember<ExecutionContext> m_executionContext;
     bool m_isClosed;
 
     class EventDispatcherTask;
-    typedef HashMap<RefPtr<Event>, EventDispatcherTask*> EventTaskMap;
+    typedef WillBeHeapHashMap<RefPtrWillBeMember<Event>, EventDispatcherTask*> EventTaskMap;
     EventTaskMap m_eventTaskMap;
 };