Changeset 53226 in webkit

Timestamp:

Jan 13, 2010 6:23:08 PM (14 years ago)

Author:

ukai@chromium.org

Message:

2010-01-13 Fumitoshi Ukai <​ukai@chromium.org>

Reviewed by David Levin.

Fix websocket/tests/worker/worker-simple.html crash on Leopard Intel Debug (Tests) builder
​https://bugs.webkit.org/show_bug.cgi?id=33581

unref m_workerContext when websocket is disconnected, so that avoid
keeping reference to workerContext longer than worker thread runs.

• websockets/WorkerThreadableWebSocketChannel.cpp: (WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect): (WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/WorkerThreadableWebSocketChannel.cpp (modified) (2 diffs)

trunk/WebCore/ChangeLog

@@ +1 @@
+2010-01-13  Fumitoshi Ukai  <ukai@chromium.org>
+
+        Reviewed by David Levin.
+
+        Fix websocket/tests/worker/worker-simple.html crash on Leopard Intel Debug (Tests) builder
+        https://bugs.webkit.org/show_bug.cgi?id=33581
+
+        unref m_workerContext when websocket is disconnected, so that avoid
+        keeping reference to workerContext longer than worker thread runs.
+
+        * websockets/WorkerThreadableWebSocketChannel.cpp:
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
+        (WebCore::WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion):
+
 2010-01-12  Jon Honeycutt  <jhoneycutt@apple.com>
 

trunk/WebCore/websockets/WorkerThreadableWebSocketChannel.cpp

@@ -331 +331 @@
         m_loaderProxy.postTaskToLoader(createCallbackTask(&mainThreadDestroy, peer));
     }
+    m_workerContext = 0;
 }
 
@@ -346 +347 @@
 void WorkerThreadableWebSocketChannel::Bridge::waitForMethodCompletion()
 {
+    if (!m_workerContext)
+        return;
     WorkerRunLoop& runLoop = m_workerContext->thread()->runLoop();
     MessageQueueWaitResult result = MessageQueueMessageReceived;