Changeset 86829 in webkit

Timestamp:

May 19, 2011 2:33:12 AM (13 years ago)

Author:

yutak@chromium.org

Message:

2011-05-19 Yuta Kitamura <​yutak@chromium.org>

Reviewed by Kent Tamura.

WebSocket: Use ScriptContext::Task to hold pending events of ThreadableWebSocketChannelClientWrapper
​https://bugs.webkit.org/show_bug.cgi?id=61034

Refactoring only. No new tests.

• websockets/ThreadableWebSocketChannelClientWrapper.cpp: (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper): (WebCore::ThreadableWebSocketChannelClientWrapper::didConnect): (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessage): (WebCore::ThreadableWebSocketChannelClientWrapper::didClose): (WebCore::ThreadableWebSocketChannelClientWrapper::resume): (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks): (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback): (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback): (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
• websockets/ThreadableWebSocketChannelClientWrapper.h: Remove m_pendingConnected, m_pendingMessages and m_pendingClosed, and use ScriptContext::Task to hold these pending events.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• websockets/ThreadableWebSocketChannelClientWrapper.cpp (modified) (4 diffs)
• websockets/ThreadableWebSocketChannelClientWrapper.h (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2011-05-19  Yuta Kitamura  <yutak@chromium.org>
+
+        Reviewed by Kent Tamura.
+
+        WebSocket: Use ScriptContext::Task to hold pending events of ThreadableWebSocketChannelClientWrapper
+        https://bugs.webkit.org/show_bug.cgi?id=61034
+
+        Refactoring only. No new tests.
+
+        * websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+        (WebCore::ThreadableWebSocketChannelClientWrapper::ThreadableWebSocketChannelClientWrapper):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didConnect):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessage):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didClose):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::resume):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback):
+        (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback):
+        * websockets/ThreadableWebSocketChannelClientWrapper.h:
+        Remove m_pendingConnected, m_pendingMessages and m_pendingClosed, and use ScriptContext::Task
+        to hold these pending events.
+
 2011-05-19  Emil A Eklund  <eae@chromium.org>
 

trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.cpp

@@ -33 +33 @@
 #include "ThreadableWebSocketChannelClientWrapper.h"
 
+#include "CrossThreadCopier.h"
+#include "CrossThreadTask.h"
 #include "WebSocketChannelClient.h"
 #include <wtf/PassRefPtr.h>
+#include <wtf/RefPtr.h>
 
 namespace WebCore {
@@ -44 +47 @@
     , m_bufferedAmount(0)
     , m_suspended(false)
-    , m_pendingConnected(false)
-    , m_pendingClosed(false)
 {
 }
@@ -98 +99 @@
 void ThreadableWebSocketChannelClientWrapper::didConnect()
 {
-    m_pendingConnected = true;
+    m_pendingTasks.append(createCallbackTask(&ThreadableWebSocketChannelClientWrapper::didConnectCallback, AllowCrossThreadAccess(this)));
     if (!m_suspended)
-        processPendingEvents();
+        processPendingTasks();
 }
 
 void ThreadableWebSocketChannelClientWrapper::didReceiveMessage(const String& message)
 {
-    m_pendingMessages.append(message);
+    m_pendingTasks.append(createCallbackTask(&ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback, AllowCrossThreadAccess(this), message));
     if (!m_suspended)
-        processPendingEvents();
+        processPendingTasks();
 }
 
 void ThreadableWebSocketChannelClientWrapper::didClose(unsigned long unhandledBufferedAmount)
 {
-    m_pendingClosed = true;
-    m_bufferedAmount = unhandledBufferedAmount;
+    m_pendingTasks.append(createCallbackTask(&ThreadableWebSocketChannelClientWrapper::didCloseCallback, AllowCrossThreadAccess(this), unhandledBufferedAmount));
     if (!m_suspended)
-        processPendingEvents();
+        processPendingTasks();
 }
 
@@ -126 +126 @@
 {
     m_suspended = false;
-    processPendingEvents();
+    processPendingTasks();
 }
 
-void ThreadableWebSocketChannelClientWrapper::processPendingEvents()
+void ThreadableWebSocketChannelClientWrapper::processPendingTasks()
 {
     ASSERT(!m_suspended);
-    if (m_pendingConnected) {
-        m_pendingConnected = false;
-        if (m_client)
-            m_client->didConnect();
-    }
+    Vector<OwnPtr<ScriptExecutionContext::Task> > tasks;
+    tasks.swap(m_pendingTasks);
+    for (Vector<OwnPtr<ScriptExecutionContext::Task> >::const_iterator iter = tasks.begin(); iter != tasks.end(); ++iter)
+        (*iter)->performTask(0);
+}
 
-    Vector<String> messages;
-    messages.swap(m_pendingMessages);
-    for (Vector<String>::const_iterator iter = messages.begin(); iter != messages.end(); ++iter) {
-        if (m_client)
-            m_client->didReceiveMessage(*iter);
-    }
+void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
+{
+    ASSERT_UNUSED(context, !context);
+    if (wrapper->m_client)
+        wrapper->m_client->didConnect();
+}
 
-    if (m_pendingClosed) {
-        m_pendingClosed = false;
-        if (m_client)
-            m_client->didClose(m_bufferedAmount);
-    }
+void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, String message)
+{
+    ASSERT_UNUSED(context, !context);
+    if (wrapper->m_client)
+        wrapper->m_client->didReceiveMessage(message);
+}
+
+void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext* context, RefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount)
+{
+    ASSERT_UNUSED(context, !context);
+    if (wrapper->m_client)
+        wrapper->m_client->didClose(unhandledBufferedAmount);
 }
 

trunk/Source/WebCore/websockets/ThreadableWebSocketChannelClientWrapper.h

@@ -35 +35 @@
 
 #include "PlatformString.h"
+#include "ScriptExecutionContext.h"
 #include <wtf/Forward.h>
+#include <wtf/OwnPtr.h>
 #include <wtf/Threading.h>
 #include <wtf/Vector.h>
@@ -69 +71 @@
     ThreadableWebSocketChannelClientWrapper(WebSocketChannelClient*);
 
-    void processPendingEvents();
+    void processPendingTasks();
+    static void didConnectCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>);
+    static void didReceiveMessageCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, String message);
+    static void didCloseCallback(ScriptExecutionContext*, RefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount);
 
     WebSocketChannelClient* m_client;
@@ -76 +81 @@
     unsigned long m_bufferedAmount;
     bool m_suspended;
-    bool m_pendingConnected;
-    Vector<String> m_pendingMessages;
-    bool m_pendingClosed;
+    Vector<OwnPtr<ScriptExecutionContext::Task> > m_pendingTasks;
 };