<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[172887] trunk/Source/WebCore</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/172887">172887</a></dd>
<dt>Author</dt> <dd>zandobersek@gmail.com</dd>
<dt>Date</dt> <dd>2014-08-23 00:15:37 -0700 (Sat, 23 Aug 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove uses of CrossThreadTask in ThreadableWebSocketChannelClientWrapper, WorkerThreadableWebSocketChannel
https://bugs.webkit.org/show_bug.cgi?id=133954
Reviewed by Darin Adler.
Replace uses of CrossThreadTask with C++11 lambdas in the ThreadableWebSocketChannelClientWrapper
and WorkerThreadableWebSocketChannel classes.
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
(WebCore::ThreadableWebSocketChannelClientWrapper::didConnect):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessage):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
(WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount):
(WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake):
(WebCore::ThreadableWebSocketChannelClientWrapper::didClose):
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageError):
(WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks):
(WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback): Deleted.
(WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback): Deleted.
* Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
* Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
(WebCore::WorkerThreadableWebSocketChannel::Peer::send):
(WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
(WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::connect):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::close):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::fail):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::suspend):
(WebCore::WorkerThreadableWebSocketChannel::Bridge::resume):
(WebCore::workerGlobalScopeDidSend): Deleted.
(WebCore::workerGlobalScopeDidGetBufferedAmount): Deleted.
(WebCore::workerGlobalScopeDidConnect): Deleted.
(WebCore::workerGlobalScopeDidReceiveMessage): Deleted.
(WebCore::workerGlobalScopeDidReceiveBinaryData): Deleted.
(WebCore::workerGlobalScopeDidUpdateBufferedAmount): Deleted.
(WebCore::workerGlobalScopeDidStartClosingHandshake): Deleted.
(WebCore::workerGlobalScopeDidClose): Deleted.
(WebCore::workerGlobalScopeDidReceiveMessageError): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadConnect): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSend): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadBufferedAmount): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadClose): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadFail): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadDestroy): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadSuspend): Deleted.
(WebCore::WorkerThreadableWebSocketChannel::mainThreadResume): Deleted.
* Modules/websockets/WorkerThreadableWebSocketChannel.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh">trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh">trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (172886 => 172887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-08-23 07:12:59 UTC (rev 172886)
+++ trunk/Source/WebCore/ChangeLog 2014-08-23 07:15:37 UTC (rev 172887)
</span><span class="lines">@@ -1,3 +1,71 @@
</span><ins>+2014-08-23 Zan Dobersek <zdobersek@igalia.com>
+
+ Remove uses of CrossThreadTask in ThreadableWebSocketChannelClientWrapper, WorkerThreadableWebSocketChannel
+ https://bugs.webkit.org/show_bug.cgi?id=133954
+
+ Reviewed by Darin Adler.
+
+ Replace uses of CrossThreadTask with C++11 lambdas in the ThreadableWebSocketChannelClientWrapper
+ and WorkerThreadableWebSocketChannel classes.
+
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp:
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didConnect):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessage):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didClose):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageError):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasks):
+ (WebCore::ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didConnectCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didCloseCallback): Deleted.
+ (WebCore::ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback): Deleted.
+ * Modules/websockets/ThreadableWebSocketChannelClientWrapper.h:
+ * Modules/websockets/WorkerThreadableWebSocketChannel.cpp:
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::send):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didConnect):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessage):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didClose):
+ (WebCore::WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::mainThreadInitialize):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::connect):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::send):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::bufferedAmount):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::close):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::fail):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::disconnect):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::suspend):
+ (WebCore::WorkerThreadableWebSocketChannel::Bridge::resume):
+ (WebCore::workerGlobalScopeDidSend): Deleted.
+ (WebCore::workerGlobalScopeDidGetBufferedAmount): Deleted.
+ (WebCore::workerGlobalScopeDidConnect): Deleted.
+ (WebCore::workerGlobalScopeDidReceiveMessage): Deleted.
+ (WebCore::workerGlobalScopeDidReceiveBinaryData): Deleted.
+ (WebCore::workerGlobalScopeDidUpdateBufferedAmount): Deleted.
+ (WebCore::workerGlobalScopeDidStartClosingHandshake): Deleted.
+ (WebCore::workerGlobalScopeDidClose): Deleted.
+ (WebCore::workerGlobalScopeDidReceiveMessageError): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadConnect): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSend): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSendBlob): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadBufferedAmount): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadClose): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadFail): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadDestroy): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadSuspend): Deleted.
+ (WebCore::WorkerThreadableWebSocketChannel::mainThreadResume): Deleted.
+ * Modules/websockets/WorkerThreadableWebSocketChannel.h:
+
</ins><span class="cx"> 2014-08-23 Yusuke Suzuki <utatane.tea@gmail.com>
</span><span class="cx">
</span><span class="cx"> Clean up build warnings: control reaches end of non-void function
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrappercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp (172886 => 172887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-08-23 07:12:59 UTC (rev 172886)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.cpp 2014-08-23 07:15:37 UTC (rev 172887)
</span><span class="lines">@@ -32,7 +32,6 @@
</span><span class="cx"> #if ENABLE(WEB_SOCKETS)
</span><span class="cx"> #include "ThreadableWebSocketChannelClientWrapper.h"
</span><span class="cx">
</span><del>-#include "CrossThreadTask.h"
</del><span class="cx"> #include "ScriptExecutionContext.h"
</span><span class="cx"> #include "WebSocketChannelClient.h"
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="lines">@@ -156,49 +155,93 @@
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didConnect()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didConnectCallback, this));
</del><ins>+ ref();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didConnect();
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveMessage(const String& message)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didReceiveMessageCallback, this, message));
</del><ins>+ ref();
+ String messageCopy = message.isolatedCopy();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didReceiveMessage(message);
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didReceiveBinaryDataCallback, this, binaryData));
</del><ins>+ ref();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didReceiveBinaryData(binaryData);
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmount(unsigned long bufferedAmount)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didUpdateBufferedAmountCallback, this, bufferedAmount));
</del><ins>+ ref();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didUpdateBufferedAmount(bufferedAmount);
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshake()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didStartClosingHandshakeCallback, this));
</del><ins>+ ref();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didStartClosingHandshake();
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didClose(unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didCloseCallback, this, unhandledBufferedAmount, closingHandshakeCompletion, code, reason));
</del><ins>+ ref();
+ String reasonCopy = reason.isolatedCopy();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reasonCopy);
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void ThreadableWebSocketChannelClientWrapper::didReceiveMessageError()
</span><span class="cx"> {
</span><del>- m_pendingTasks.append(std::make_unique<CrossThreadTask>(&didReceiveMessageErrorCallback, this));
</del><ins>+ ref();
+ m_pendingTasks.append(std::make_unique<ScriptExecutionContext::Task>([=](ScriptExecutionContext&) {
+ if (m_client)
+ m_client->didReceiveMessageError();
+ deref();
+ }));
+
</ins><span class="cx"> if (!m_suspended)
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="lines">@@ -214,12 +257,6 @@
</span><span class="cx"> processPendingTasks();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- wrapper->processPendingTasks();
-}
-
</del><span class="cx"> void ThreadableWebSocketChannelClientWrapper::processPendingTasks()
</span><span class="cx"> {
</span><span class="cx"> if (m_suspended)
</span><span class="lines">@@ -227,7 +264,12 @@
</span><span class="cx"> if (!m_syncMethodDone) {
</span><span class="cx"> // When a synchronous operation is in progress (i.e. the execution stack contains
</span><span class="cx"> // WorkerThreadableWebSocketChannel::waitForMethodCompletion()), we cannot invoke callbacks in this run loop.
</span><del>- m_context->postTask(CrossThreadTask(&ThreadableWebSocketChannelClientWrapper::processPendingTasksCallback, this));
</del><ins>+ ref();
+ m_context->postTask([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ processPendingTasks();
+ deref();
+ });
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -236,55 +278,6 @@
</span><span class="cx"> task->performTask(*m_context);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void ThreadableWebSocketChannelClientWrapper::didConnectCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didConnect();
-}
-
-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, const String& message)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didReceiveMessage(message);
-}
-
-void ThreadableWebSocketChannelClientWrapper::didReceiveBinaryDataCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, PassOwnPtr<Vector<char>> binaryData)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didReceiveBinaryData(binaryData);
-}
-
-void ThreadableWebSocketChannelClientWrapper::didUpdateBufferedAmountCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long bufferedAmount)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didUpdateBufferedAmount(bufferedAmount);
-}
-
-void ThreadableWebSocketChannelClientWrapper::didStartClosingHandshakeCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didStartClosingHandshake();
-}
-
-void ThreadableWebSocketChannelClientWrapper::didCloseCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
-}
-
-void ThreadableWebSocketChannelClientWrapper::didReceiveMessageErrorCallback(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> wrapper)
-{
- UNUSED_PARAM(context);
- if (wrapper->m_client)
- wrapper->m_client->didReceiveMessageError();
-}
-
</del><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsThreadableWebSocketChannelClientWrapperh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h (172886 => 172887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-08-23 07:12:59 UTC (rev 172886)
+++ trunk/Source/WebCore/Modules/websockets/ThreadableWebSocketChannelClientWrapper.h 2014-08-23 07:15:37 UTC (rev 172887)
</span><span class="lines">@@ -92,17 +92,8 @@
</span><span class="cx"> private:
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper(ScriptExecutionContext*, WebSocketChannelClient*);
</span><span class="cx">
</span><del>- static void processPendingTasksCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
</del><span class="cx"> void processPendingTasks();
</span><span class="cx">
</span><del>- static void didConnectCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didReceiveMessageCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, const String& message);
- static void didReceiveBinaryDataCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, PassOwnPtr<Vector<char>>);
- static void didUpdateBufferedAmountCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long bufferedAmount);
- static void didStartClosingHandshakeCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
- static void didCloseCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus, unsigned short code, const String& reason);
- static void didReceiveMessageErrorCallback(ScriptExecutionContext&, PassRefPtr<ThreadableWebSocketChannelClientWrapper>);
-
</del><span class="cx"> ScriptExecutionContext* m_context;
</span><span class="cx"> WebSocketChannelClient* m_client;
</span><span class="cx"> WorkerThreadableWebSocketChannel::Peer* m_peer;
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp (172886 => 172887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-08-23 07:12:59 UTC (rev 172886)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.cpp 2014-08-23 07:15:37 UTC (rev 172887)
</span><span class="lines">@@ -168,19 +168,17 @@
</span><span class="cx"> m_mainWebSocketChannel->connect(url, protocol);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidSend(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, ThreadableWebSocketChannel::SendResult sendRequestResult)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->setSendRequestResult(sendRequestResult);
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::send(const String& message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (!m_mainWebSocketChannel || !m_workerClientWrapper)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(message);
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext&) {
+ workerClientWrapper->setSendRequestResult(sendRequestResult);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::send(const ArrayBuffer& binaryData)
</span><span class="lines">@@ -188,8 +186,12 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (!m_mainWebSocketChannel || !m_workerClientWrapper)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData, 0, binaryData.byteLength());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext&) {
+ workerClientWrapper->setSendRequestResult(sendRequestResult);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::send(Blob& binaryData)
</span><span class="lines">@@ -197,23 +199,26 @@
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (!m_mainWebSocketChannel || !m_workerClientWrapper)
</span><span class="cx"> return;
</span><ins>+
</ins><span class="cx"> ThreadableWebSocketChannel::SendResult sendRequestResult = m_mainWebSocketChannel->send(binaryData);
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidSend, m_workerClientWrapper, sendRequestResult), m_taskMode);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext&) {
+ workerClientWrapper->setSendRequestResult(sendRequestResult);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidGetBufferedAmount(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->setBufferedAmount(bufferedAmount);
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::bufferedAmount()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> if (!m_mainWebSocketChannel || !m_workerClientWrapper)
</span><span class="cx"> return;
</span><ins>+
+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
</ins><span class="cx"> unsigned long bufferedAmount = m_mainWebSocketChannel->bufferedAmount();
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidGetBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
</del><ins>+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->setBufferedAmount(bufferedAmount);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::close(int code, const String& reason)
</span><span class="lines">@@ -257,91 +262,88 @@
</span><span class="cx"> m_mainWebSocketChannel->resume();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void workerGlobalScopeDidConnect(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& subprotocol, const String& extensions)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->setSubprotocol(subprotocol);
- workerClientWrapper->setExtensions(extensions);
- workerClientWrapper->didConnect();
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didConnect()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidConnect, m_workerClientWrapper, m_mainWebSocketChannel->subprotocol(), m_mainWebSocketChannel->extensions()), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveMessage(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, const String& message)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didReceiveMessage(message);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ String subprotocolCopy = m_mainWebSocketChannel->subprotocol().isolatedCopy();
+ String extensionsCopy = m_mainWebSocketChannel->extensions().isolatedCopy();
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->setSubprotocol(subprotocolCopy);
+ workerClientWrapper->setExtensions(extensionsCopy);
+ workerClientWrapper->didConnect();
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didReceiveMessage(const String& message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveMessage, m_workerClientWrapper, message), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveBinaryData(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassOwnPtr<Vector<char>> binaryData)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didReceiveBinaryData(binaryData);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ String messageCopy = message.isolatedCopy();
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didReceiveMessage(messageCopy);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didReceiveBinaryData(PassOwnPtr<Vector<char>> binaryData)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveBinaryData, m_workerClientWrapper, binaryData), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidUpdateBufferedAmount(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long bufferedAmount)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didUpdateBufferedAmount(bufferedAmount);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didReceiveBinaryData(binaryData);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didUpdateBufferedAmount(unsigned long bufferedAmount)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidUpdateBufferedAmount, m_workerClientWrapper, bufferedAmount), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidStartClosingHandshake(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didStartClosingHandshake();
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didUpdateBufferedAmount(bufferedAmount);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didStartClosingHandshake()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidStartClosingHandshake, m_workerClientWrapper), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidClose(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, unsigned long unhandledBufferedAmount, WebSocketChannelClient::ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reason);
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didStartClosingHandshake();
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didClose(unsigned long unhandledBufferedAmount, ClosingHandshakeCompletionStatus closingHandshakeCompletion, unsigned short code, const String& reason)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><span class="cx"> m_mainWebSocketChannel = 0;
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidClose, m_workerClientWrapper, unhandledBufferedAmount, closingHandshakeCompletion, code, reason), m_taskMode);
-}
</del><span class="cx">
</span><del>-static void workerGlobalScopeDidReceiveMessageError(ScriptExecutionContext& context, PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper)
-{
- ASSERT_UNUSED(context, context.isWorkerGlobalScope());
- workerClientWrapper->didReceiveMessageError();
</del><ins>+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ String reasonCopy = reason.isolatedCopy();
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didClose(unhandledBufferedAmount, closingHandshakeCompletion, code, reasonCopy);
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Peer::didReceiveMessageError()
</span><span class="cx"> {
</span><span class="cx"> ASSERT(isMainThread());
</span><del>- m_loaderProxy.postTaskForModeToWorkerGlobalScope(CrossThreadTask(&workerGlobalScopeDidReceiveMessageError, m_workerClientWrapper), m_taskMode);
</del><ins>+
+ RefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper = m_workerClientWrapper;
+ m_loaderProxy.postTaskForModeToWorkerGlobalScope([=](ScriptExecutionContext& context) {
+ ASSERT_UNUSED(context, context.isWorkerGlobalScope());
+ workerClientWrapper->didReceiveMessageError();
+ }, m_taskMode);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> WorkerThreadableWebSocketChannel::Bridge::Bridge(PassRefPtr<ThreadableWebSocketChannelClientWrapper> workerClientWrapper, PassRefPtr<WorkerGlobalScope> workerGlobalScope, const String& taskMode)
</span><span class="lines">@@ -371,7 +373,11 @@
</span><span class="cx"> ASSERT_UNUSED(context, context.isWorkerGlobalScope());
</span><span class="cx"> if (clientWrapper->failedWebSocketChannelCreation()) {
</span><span class="cx"> // If Bridge::initialize() quitted earlier, we need to kick mainThreadDestroy() to delete the peer.
</span><del>- loaderProxy->postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, AllowCrossThreadAccess(peerPtr)));
</del><ins>+ loaderProxy->postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ delete peerPtr;
+ });
</ins><span class="cx"> } else
</span><span class="cx"> clientWrapper->didCreateWebSocketChannel(peerPtr);
</span><span class="cx"> } }, taskMode);
</span><span class="lines">@@ -394,58 +400,40 @@
</span><span class="cx"> m_workerClientWrapper->setFailedWebSocketChannelCreation();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadConnect(ScriptExecutionContext& context, Peer* peer, const URL& url, const String& protocol)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- peer->connect(url, protocol);
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::connect(const URL& url, const String& protocol)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_workerClientWrapper);
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadConnect, AllowCrossThreadAccess(m_peer), url, protocol));
-}
</del><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSend(ScriptExecutionContext& context, Peer* peer, const String& message)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
</del><ins>+ Peer* peer = m_peer;
+ URL urlCopy = url.copy();
+ String protocolCopy = protocol.isolatedCopy();
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
</ins><span class="cx">
</span><del>- peer->send(message);
</del><ins>+ peer->connect(url, protocol);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer(ScriptExecutionContext& context, Peer* peer, PassOwnPtr<Vector<char>> data)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::create(data->data(), data->size());
- peer->send(*arrayBuffer);
-}
-
-void WorkerThreadableWebSocketChannel::mainThreadSendBlob(ScriptExecutionContext& context, Peer* peer, const URL& url, const String& type, long long size)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- RefPtr<Blob> blob = Blob::deserialize(url, type, size);
- peer->send(*blob);
-}
-
</del><span class="cx"> ThreadableWebSocketChannel::SendResult WorkerThreadableWebSocketChannel::Bridge::send(const String& message)
</span><span class="cx"> {
</span><span class="cx"> if (!m_workerClientWrapper || !m_peer)
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="cx"> setMethodNotCompleted();
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadSend, AllowCrossThreadAccess(m_peer), message));
</del><ins>+
+ Peer* peer = m_peer;
+ String messageCopy = message.isolatedCopy();
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ peer->send(message);
+ });
+
</ins><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper* clientWrapper = m_workerClientWrapper.get();
</span><span class="lines">@@ -458,12 +446,24 @@
</span><span class="cx"> {
</span><span class="cx"> if (!m_workerClientWrapper || !m_peer)
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><ins>+
</ins><span class="cx"> // ArrayBuffer isn't thread-safe, hence the content of ArrayBuffer is copied into Vector<char>.
</span><del>- OwnPtr<Vector<char>> data = adoptPtr(new Vector<char>(byteLength));
</del><ins>+ Vector<char>* dataPtr = std::make_unique<Vector<char>>(byteLength).release();
</ins><span class="cx"> if (binaryData.byteLength())
</span><del>- memcpy(data->data(), static_cast<const char*>(binaryData.data()) + byteOffset, byteLength);
</del><ins>+ memcpy(dataPtr->data(), static_cast<const char*>(binaryData.data()) + byteOffset, byteLength);
</ins><span class="cx"> setMethodNotCompleted();
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadSendArrayBuffer, AllowCrossThreadAccess(m_peer), data.release()));
</del><ins>+
+ Peer* peer = m_peer;
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ std::unique_ptr<Vector<char>> data(dataPtr);
+ RefPtr<ArrayBuffer> arrayBuffer = ArrayBuffer::create(data->data(), data->size());
+ peer->send(*arrayBuffer);
+ });
+
</ins><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper* clientWrapper = m_workerClientWrapper.get();
</span><span class="lines">@@ -477,7 +477,20 @@
</span><span class="cx"> if (!m_workerClientWrapper || !m_peer)
</span><span class="cx"> return ThreadableWebSocketChannel::SendFail;
</span><span class="cx"> setMethodNotCompleted();
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadSendBlob, AllowCrossThreadAccess(m_peer), binaryData.url(), binaryData.type(), binaryData.size()));
</del><ins>+
+ Peer* peer = m_peer;
+ URL urlCopy = binaryData.url().copy();
+ String typeCopy = binaryData.type().isolatedCopy();
+ long long size = binaryData.size();
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ RefPtr<Blob> blob = Blob::deserialize(urlCopy, typeCopy, size);
+ peer->send(*blob);
+ });
+
</ins><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper* clientWrapper = m_workerClientWrapper.get();
</span><span class="lines">@@ -486,21 +499,21 @@
</span><span class="cx"> return clientWrapper->sendRequestResult();
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadBufferedAmount(ScriptExecutionContext& context, Peer* peer)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- peer->bufferedAmount();
-}
-
</del><span class="cx"> unsigned long WorkerThreadableWebSocketChannel::Bridge::bufferedAmount()
</span><span class="cx"> {
</span><span class="cx"> if (!m_workerClientWrapper || !m_peer)
</span><span class="cx"> return 0;
</span><span class="cx"> setMethodNotCompleted();
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadBufferedAmount, AllowCrossThreadAccess(m_peer)));
</del><ins>+
+ Peer* peer = m_peer;
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ peer->bufferedAmount();
+ });
+
</ins><span class="cx"> Ref<Bridge> protect(*this);
</span><span class="cx"> waitForMethodCompletion();
</span><span class="cx"> ThreadableWebSocketChannelClientWrapper* clientWrapper = m_workerClientWrapper.get();
</span><span class="lines">@@ -509,85 +522,81 @@
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadClose(ScriptExecutionContext& context, Peer* peer, int code, const String& reason)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- peer->close(code, reason);
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::close(int code, const String& reason)
</span><span class="cx"> {
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadClose, AllowCrossThreadAccess(m_peer), code, reason));
-}
</del><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadFail(ScriptExecutionContext& context, Peer* peer, const String& reason)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
</del><ins>+ Peer* peer = m_peer;
+ String reasonCopy = reason.isolatedCopy();
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
</ins><span class="cx">
</span><del>- peer->fail(reason);
</del><ins>+ peer->close(code, reasonCopy);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::fail(const String& reason)
</span><span class="cx"> {
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadFail, AllowCrossThreadAccess(m_peer), reason));
-}
</del><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadDestroy(ScriptExecutionContext& context, Peer* peerPtr)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- std::unique_ptr<Peer> peer(peerPtr);
</del><ins>+ Peer* peer = m_peer;
+ String reasonCopy = reason.isolatedCopy();
+ m_loaderProxy.postTaskToLoader([=] (ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ peer->fail(reason);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::disconnect()
</span><span class="cx"> {
</span><span class="cx"> clearClientWrapper();
</span><span class="cx"> if (m_peer) {
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadDestroy, AllowCrossThreadAccess(m_peer)));
</del><ins>+ Peer* peer = m_peer;
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ delete peer;
+ });
</ins><span class="cx"> m_peer = nullptr;
</span><span class="cx"> }
</span><span class="cx"> m_workerGlobalScope = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadSuspend(ScriptExecutionContext& context, Peer* peer)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
-
- peer->suspend();
-}
-
</del><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::suspend()
</span><span class="cx"> {
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadSuspend, AllowCrossThreadAccess(m_peer)));
-}
</del><span class="cx">
</span><del>-void WorkerThreadableWebSocketChannel::mainThreadResume(ScriptExecutionContext& context, Peer* peer)
-{
- ASSERT(isMainThread());
- ASSERT_UNUSED(context, context.isDocument());
- ASSERT(peer);
</del><ins>+ Peer* peer = m_peer;
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
</ins><span class="cx">
</span><del>- peer->resume();
</del><ins>+ peer->suspend();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::resume()
</span><span class="cx"> {
</span><span class="cx"> if (!m_peer)
</span><span class="cx"> return;
</span><del>- m_loaderProxy.postTaskToLoader(CrossThreadTask(&WorkerThreadableWebSocketChannel::mainThreadResume, AllowCrossThreadAccess(m_peer)));
</del><ins>+
+ Peer* peer = m_peer;
+ m_loaderProxy.postTaskToLoader([=](ScriptExecutionContext& context) {
+ ASSERT(isMainThread());
+ ASSERT_UNUSED(context, context.isDocument());
+ ASSERT(peer);
+
+ peer->resume();
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void WorkerThreadableWebSocketChannel::Bridge::clearClientWrapper()
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebsocketsWorkerThreadableWebSocketChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h (172886 => 172887)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-08-23 07:12:59 UTC (rev 172886)
+++ trunk/Source/WebCore/Modules/websockets/WorkerThreadableWebSocketChannel.h 2014-08-23 07:15:37 UTC (rev 172887)
</span><span class="lines">@@ -169,17 +169,6 @@
</span><span class="cx">
</span><span class="cx"> WorkerThreadableWebSocketChannel(WorkerGlobalScope*, WebSocketChannelClient*, const String& taskMode);
</span><span class="cx">
</span><del>- static void mainThreadConnect(ScriptExecutionContext&, Peer*, const URL&, const String& protocol);
- static void mainThreadSend(ScriptExecutionContext&, Peer*, const String& message);
- static void mainThreadSendArrayBuffer(ScriptExecutionContext&, Peer*, PassOwnPtr<Vector<char>>);
- static void mainThreadSendBlob(ScriptExecutionContext&, Peer*, const URL&, const String& type, long long size);
- static void mainThreadBufferedAmount(ScriptExecutionContext&, Peer*);
- static void mainThreadClose(ScriptExecutionContext&, Peer*, int code, const String& reason);
- static void mainThreadFail(ScriptExecutionContext&, Peer*, const String& reason);
- static void mainThreadDestroy(ScriptExecutionContext&, Peer*);
- static void mainThreadSuspend(ScriptExecutionContext&, Peer*);
- static void mainThreadResume(ScriptExecutionContext&, Peer*);
-
</del><span class="cx"> class WorkerGlobalScopeDidInitializeTask;
</span><span class="cx">
</span><span class="cx"> RefPtr<WorkerGlobalScope> m_workerGlobalScope;
</span></span></pre>
</div>
</div>
</body>
</html>