Changeset 80054 in webkit

Timestamp:

Mar 1, 2011 3:54:02 PM (13 years ago)

Author:

jorlow@chromium.org

Message:

2011-03-01 Jeremy Orlow <​jorlow@chromium.org>

Reviewed by Mihai Parparita.

EventQueue needs to be ref counted
​https://bugs.webkit.org/show_bug.cgi?id=55512

EventQueue needs to be ref counted because it's possible for its instance
to be deleted while it's dispatching events. This is the reason why
​https://bugs.webkit.org/show_bug.cgi?id=54785 had to be reverted.

No change of behavior, so no tests.

• dom/Document.h:
• dom/EventQueue.cpp: (WebCore::EventQueue::create):
• dom/EventQueue.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/Document.h (modified) (1 diff)
• dom/EventQueue.cpp (modified) (2 diffs)
• dom/EventQueue.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-03-01  Jeremy Orlow  <jorlow@chromium.org>
+
+        Reviewed by Mihai Parparita.
+
+        EventQueue needs to be ref counted
+        https://bugs.webkit.org/show_bug.cgi?id=55512
+
+        EventQueue needs to be ref counted because it's possible for its instance
+        to be deleted while it's dispatching events. This is the reason why
+        https://bugs.webkit.org/show_bug.cgi?id=54785 had to be reverted.
+
+        No change of behavior, so no tests.
+
+        * dom/Document.h:
+        * dom/EventQueue.cpp:
+        (WebCore::EventQueue::create):
+        * dom/EventQueue.h:
+
 2011-03-01  Helder Correia  <helder@sencha.com>
 

trunk/Source/WebCore/dom/Document.h

@@ -1394 +1394 @@
     bool m_usingGeolocation;
     
-    OwnPtr<EventQueue> m_eventQueue;
+    RefPtr<EventQueue> m_eventQueue;
 
 #if ENABLE(WML)

trunk/Source/WebCore/dom/EventQueue.cpp

@@ -48 +48 @@
 };
 
+PassRefPtr<EventQueue> EventQueue::create(ScriptExecutionContext* context)
+{
+    return adoptRef(new EventQueue(context));
+}
+
 EventQueue::EventQueue(ScriptExecutionContext* context)
     : m_pendingEventTimer(adoptPtr(new EventQueueTimer(this, context)))
@@ -87 +92 @@
     m_nodesWithQueuedScrollEvents.clear();
 
+    RefPtr<EventQueue> protector(this);
+
     for (size_t i = 0; i < queuedEvents.size(); i++)
         dispatchEvent(queuedEvents[i].release());

trunk/Source/WebCore/dom/EventQueue.h

@@ -29 +29 @@
 
 #include <wtf/HashSet.h>
-#include <wtf/Noncopyable.h>
 #include <wtf/OwnPtr.h>
-#include <wtf/PassOwnPtr.h>
+#include <wtf/RefCounted.h>
 #include <wtf/RefPtr.h>
 #include <wtf/Vector.h>
@@ -42 +41 @@
 class ScriptExecutionContext;
 
-class EventQueue {
-    WTF_MAKE_NONCOPYABLE(EventQueue);
-
-    
+class EventQueue : public RefCounted<EventQueue> {
 public:
     enum ScrollEventTargetType {
@@ -52 +48 @@
     };
 
-    static PassOwnPtr<EventQueue> create(ScriptExecutionContext* context)
-    {
-        return adoptPtr(new EventQueue(context));
-    }
-
+    static PassRefPtr<EventQueue> create(ScriptExecutionContext*);
     ~EventQueue();