Changeset 98799 in webkit

Timestamp:

Oct 29, 2011, 12:19:26 AM (15 years ago)

Author:

commit-queue@webkit.org

Message:

Unreviewed, rolling out r98795.
​http://trac.webkit.org/changeset/98795
​https://bugs.webkit.org/show_bug.cgi?id=71171

Causes worker tests to crash (Requested by abarth on #webkit).

Patch by Sheriff Bot <​webkit.review.bot@gmail.com> on 2011-10-29

• dom/ActiveDOMObject.cpp:

(WebCore::ContextDestructionObserver::contextDestroyed):

• dom/MessagePort.cpp:

(WebCore::MessagePort::MessagePort):
(WebCore::MessagePort::contextDestroyed):

• dom/MessagePort.h:
• dom/ScriptExecutionContext.cpp:

(WebCore::ScriptExecutionContext::~ScriptExecutionContext):
(WebCore::ScriptExecutionContext::closeMessagePorts):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• dom/ActiveDOMObject.cpp (modified) (1 diff)
• dom/MessagePort.cpp (modified) (2 diffs)
• dom/MessagePort.h (modified) (3 diffs)
• dom/ScriptExecutionContext.cpp (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-10-29  Sheriff Bot  <webkit.review.bot@gmail.com>
+
+        Unreviewed, rolling out r98795.
+        http://trac.webkit.org/changeset/98795
+        https://bugs.webkit.org/show_bug.cgi?id=71171
+
+        Causes worker tests to crash (Requested by abarth on #webkit).
+
+        * dom/ActiveDOMObject.cpp:
+        (WebCore::ContextDestructionObserver::contextDestroyed):
+        * dom/MessagePort.cpp:
+        (WebCore::MessagePort::MessagePort):
+        (WebCore::MessagePort::contextDestroyed):
+        * dom/MessagePort.h:
+        * dom/ScriptExecutionContext.cpp:
+        (WebCore::ScriptExecutionContext::~ScriptExecutionContext):
+        (WebCore::ScriptExecutionContext::closeMessagePorts):
+
 2011-10-28  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/dom/ActiveDOMObject.cpp

@@ -55 +55 @@
 void ContextDestructionObserver::contextDestroyed()
 {
-    ASSERT(m_scriptExecutionContext);
     m_scriptExecutionContext = 0;
 }

trunk/Source/WebCore/dom/MessagePort.cpp

@@ -42 +42 @@
 
 MessagePort::MessagePort(ScriptExecutionContext& scriptExecutionContext)
-    : ContextDestructionObserver(&scriptExecutionContext)
-    , m_started(false)
+    : m_started(false)
     , m_closed(false)
+    , m_scriptExecutionContext(&scriptExecutionContext)
 {
     m_scriptExecutionContext->createdMessagePort(this);
@@ -153 +153 @@
 void MessagePort::contextDestroyed()
 {
+    ASSERT(m_scriptExecutionContext);
     // Must be closed before blowing away the cached context, to ensure that we get no more calls to messageAvailable().
     // ScriptExecutionContext::closeMessagePorts() takes care of that.
     ASSERT(m_closed);
-    ContextDestructionObserver::contextDestroyed();
+    m_scriptExecutionContext = 0;
 }
 

trunk/Source/WebCore/dom/MessagePort.h

@@ -28 +28 @@
 #define MessagePort_h
 
-#include "ActiveDOMObject.h"
 #include "EventListener.h"
 #include "EventTarget.h"
@@ -54 +53 @@
     // ActiveDOMObject's features and relying on JavaScript garbage collection
     // to get its lifetime right.
-    class MessagePort : public RefCounted<MessagePort>, public EventTarget, public ContextDestructionObserver {
+    class MessagePort : public RefCounted<MessagePort>, public EventTarget {
     public:
         static PassRefPtr<MessagePort> create(ScriptExecutionContext& scriptExecutionContext) { return adoptRef(new MessagePort(scriptExecutionContext)); }
@@ -123 +122 @@
         bool m_closed;
 
+        ScriptExecutionContext* m_scriptExecutionContext;
         EventTargetData m_eventTargetData;
     };

trunk/Source/WebCore/dom/ScriptExecutionContext.cpp

@@ -113 +113 @@
     }
 
+    HashSet<MessagePort*>::iterator messagePortsEnd = m_messagePorts.end();
+    for (HashSet<MessagePort*>::iterator iter = m_messagePorts.begin(); iter != messagePortsEnd; ++iter) {
+        ASSERT((*iter)->scriptExecutionContext() == this);
+        (*iter)->contextDestroyed();
+    }
 #if ENABLE(SQL_DATABASE)
     if (m_databaseThread) {
@@ -296 +301 @@
 }
 
-void ScriptExecutionContext::closeMessagePorts()
-{
+void ScriptExecutionContext::closeMessagePorts() {
     HashSet<MessagePort*>::iterator messagePortsEnd = m_messagePorts.end();
     for (HashSet<MessagePort*>::iterator iter = m_messagePorts.begin(); iter != messagePortsEnd; ++iter) {