<!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>[176036] trunk/Source/WebKit2</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/176036">176036</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2014-11-12 13:48:51 -0800 (Wed, 12 Nov 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/175806">r175806</a>.
https://bugs.webkit.org/show_bug.cgi?id=138666
Capturing CString is not thread safe (Requested by anttik on
#webkit).
Reverted changeset:
"[WK2] Use C++ lambdas in IPC::Connection"
https://bugs.webkit.org/show_bug.cgi?id=138018
http://trac.webkit.org/changeset/175806</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCConnectioncpp">trunk/Source/WebKit2/Platform/IPC/Connection.cpp</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCmacConnectionMacmm">trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp">trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (176035 => 176036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-11-12 21:13:13 UTC (rev 176035)
+++ trunk/Source/WebKit2/ChangeLog 2014-11-12 21:48:51 UTC (rev 176036)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2014-11-12 Commit Queue <commit-queue@webkit.org>
+
+ Unreviewed, rolling out r175806.
+ https://bugs.webkit.org/show_bug.cgi?id=138666
+
+ Capturing CString is not thread safe (Requested by anttik on
+ #webkit).
+
+ Reverted changeset:
+
+ "[WK2] Use C++ lambdas in IPC::Connection"
+ https://bugs.webkit.org/show_bug.cgi?id=138018
+ http://trac.webkit.org/changeset/175806
+
</ins><span class="cx"> 2014-11-12 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Make action menus much more reliable
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (176035 => 176036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-11-12 21:13:13 UTC (rev 176035)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-11-12 21:48:51 UTC (rev 176036)
</span><span class="lines">@@ -164,13 +164,8 @@
</span><span class="cx"> {
</span><span class="cx"> MutexLocker locker(m_mutex);
</span><span class="cx">
</span><del>- if (m_didScheduleDispatchMessagesWorkSet.add(connection).isNewEntry) {
- RefPtr<SyncMessageState> protectedThis(this);
- RefPtr<Connection> protectedConnection(connection);
- m_runLoop.dispatch([protectedThis, protectedConnection] {
- protectedThis->dispatchMessageAndResetDidScheduleDispatchMessagesForConnection(protectedConnection.get());
- });
- }
</del><ins>+ if (m_didScheduleDispatchMessagesWorkSet.add(connection).isNewEntry)
+ m_runLoop.dispatch(bind(&SyncMessageState::dispatchMessageAndResetDidScheduleDispatchMessagesForConnection, this, RefPtr<Connection>(connection)));
</ins><span class="cx">
</span><span class="cx"> m_messagesToDispatchWhileWaitingForSyncReply.append(WTF::move(connectionAndIncomingMessage));
</span><span class="cx"> }
</span><span class="lines">@@ -301,8 +296,10 @@
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver* workQueueMessageReceiver, MessageDecoder* decoder)
</del><ins>+void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver* workQueueMessageReceiver, MessageDecoder* incomingMessageDecoder)
</ins><span class="cx"> {
</span><ins>+ std::unique_ptr<MessageDecoder> decoder(incomingMessageDecoder);
+
</ins><span class="cx"> if (!decoder->isSyncMessage()) {
</span><span class="cx"> workQueueMessageReceiver->didReceiveMessage(this, *decoder);
</span><span class="cx"> return;
</span><span class="lines">@@ -343,12 +340,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // Reset the client.
</span><del>- m_client = nullptr;
</del><ins>+ m_client = 0;
</ins><span class="cx">
</span><del>- RefPtr<Connection> protectedThis(this);
- m_connectionQueue->dispatch([protectedThis] {
- protectedThis->platformInvalidate();
- });
</del><ins>+ m_connectionQueue->dispatch(WTF::bind(&Connection::platformInvalidate, this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Connection::markCurrentlyDispatchedMessageAsInvalid()
</span><span class="lines">@@ -387,10 +381,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // FIXME: We should add a boolean flag so we don't call this when work has already been scheduled.
</span><del>- RefPtr<Connection> protectedThis(this);
- m_connectionQueue->dispatch([protectedThis] {
- protectedThis->sendOutgoingMessages();
- });
</del><ins>+ m_connectionQueue->dispatch(WTF::bind(&Connection::sendOutgoingMessages, this));
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -638,27 +629,23 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!m_workQueueMessageReceivers.isValidKey(message->messageReceiverName())) {
</span><del>- // Something might have gone wrong when decoding the message. In that case, encode the message length
- // so we can figure out if this happens for certain message lengths.
- CString messageReceiverName = message->messageReceiverName().isEmpty() ? "<unknown message>" : message->messageReceiverName().toString();
- CString messageName = message->messageName().isEmpty() ? String::format("<message length: %zu bytes>", message->length()).utf8() : message->messageReceiverName().toString();
</del><ins>+ if (message->messageReceiverName().isEmpty() && message->messageName().isEmpty()) {
+ // Something went wrong when decoding the message. Encode the message length so we can figure out if this
+ // happens for certain message lengths.
+ CString messageReceiverName = "<unknown message>";
+ CString messageName = String::format("<message length: %zu bytes>", message->length()).utf8();
</ins><span class="cx">
</span><del>- RefPtr<Connection> protectedThis(this);
- m_clientRunLoop.dispatch([protectedThis, messageReceiverName, messageName] {
- protectedThis->dispatchDidReceiveInvalidMessage(messageReceiverName, messageName);
- });
</del><ins>+ m_clientRunLoop.dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, messageReceiverName, messageName));
+ return;
+ }
+
+ m_clientRunLoop.dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, message->messageReceiverName().toString(), message->messageName().toString()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> auto it = m_workQueueMessageReceivers.find(message->messageReceiverName());
</span><span class="cx"> if (it != m_workQueueMessageReceivers.end()) {
</span><del>- RefPtr<Connection> protectedThis(this);
- RefPtr<WorkQueueMessageReceiver>& workQueueMessageReceiver = it->value.second;
- MessageDecoder* decoderPtr = message.release();
- it->value.first->dispatch([protectedThis, workQueueMessageReceiver, decoderPtr] {
- std::unique_ptr<MessageDecoder> decoder(decoderPtr);
- protectedThis->dispatchWorkQueueMessageReceiverMessage(workQueueMessageReceiver.get(), decoder.get());
- });
</del><ins>+ it->value.first->dispatch(bind(&Connection::dispatchWorkQueueMessageReceiverMessage, this, it->value.second, message.release()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -814,10 +801,7 @@
</span><span class="cx"> m_incomingMessages.append(WTF::move(incomingMessage));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Connection> protectedThis(this);
- m_clientRunLoop.dispatch([protectedThis] {
- protectedThis->dispatchOneMessage();
- });
</del><ins>+ m_clientRunLoop.dispatch(WTF::bind(&Connection::dispatchOneMessage, this));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Connection::dispatchMessage(MessageDecoder& decoder)
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCmacConnectionMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm (176035 => 176036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-11-12 21:13:13 UTC (rev 176035)
+++ trunk/Source/WebKit2/Platform/IPC/mac/ConnectionMac.mm 2014-11-12 21:48:51 UTC (rev 176036)
</span><span class="lines">@@ -361,12 +361,8 @@
</span><span class="cx"> void Connection::initializeDeadNameSource()
</span><span class="cx"> {
</span><span class="cx"> m_deadNameSource = dispatch_source_create(DISPATCH_SOURCE_TYPE_MACH_SEND, m_sendPort, 0, m_connectionQueue->dispatchQueue());
</span><ins>+ dispatch_source_set_event_handler(m_deadNameSource, bind(&Connection::connectionDidClose, this));
</ins><span class="cx">
</span><del>- RefPtr<Connection> protectedThis(this);
- dispatch_source_set_event_handler(m_deadNameSource, ^{
- protectedThis->connectionDidClose();
- });
-
</del><span class="cx"> mach_port_t sendPort = m_sendPort;
</span><span class="cx"> dispatch_source_set_cancel_handler(m_deadNameSource, ^{
</span><span class="cx"> // Release our send right.
</span><span class="lines">@@ -508,12 +504,7 @@
</span><span class="cx"> if (decoder->messageReceiverName() == "IPC" && decoder->messageName() == "SetExceptionPort") {
</span><span class="cx"> if (m_isServer) {
</span><span class="cx"> // Server connections aren't supposed to have their exception ports overriden. Treat this as an invalid message.
</span><del>- RefPtr<Connection> protectedThis(this);
- CString messageReceiverNameString = decoder->messageReceiverName().toString();
- CString messageNameString = decoder->messageName().toString();
- m_clientRunLoop.dispatch([protectedThis, messageReceiverNameString, messageNameString] {
- protectedThis->dispatchDidReceiveInvalidMessage(messageReceiverNameString, messageNameString);
- });
</del><ins>+ m_clientRunLoop.dispatch(bind(&Connection::dispatchDidReceiveInvalidMessage, this, decoder->messageReceiverName().toString(), decoder->messageName().toString()));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> MachPort exceptionPort;
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCunixConnectionUnixcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp (176035 => 176036)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2014-11-12 21:13:13 UTC (rev 176035)
+++ trunk/Source/WebKit2/Platform/IPC/unix/ConnectionUnix.cpp 2014-11-12 21:48:51 UTC (rev 176036)
</span><span class="lines">@@ -388,27 +388,27 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- RefPtr<Connection> protectedThis(this);
</del><span class="cx"> m_isConnected = true;
</span><span class="cx"> #if PLATFORM(GTK)
</span><ins>+ RefPtr<Connection> protector(this);
</ins><span class="cx"> m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
</span><del>- [protectedThis] {
- protectedThis->readyReadHandler();
</del><ins>+ [=] {
+ protector->readyReadHandler();
</ins><span class="cx"> },
</span><del>- [protectedThis] {
- protectedThis->connectionDidClose();
</del><ins>+ [=] {
+ protector->connectionDidClose();
</ins><span class="cx"> });
</span><span class="cx"> #elif PLATFORM(EFL)
</span><ins>+ RefPtr<Connection> protector(this);
</ins><span class="cx"> m_connectionQueue->registerSocketEventHandler(m_socketDescriptor,
</span><del>- [protectedThis] {
- protectedThis->readyReadHandler();
</del><ins>+ [protector] {
+ protector->readyReadHandler();
</ins><span class="cx"> });
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal handler.
- m_connectionQueue->dispatch([protectedThis] {
- protectedThis->readyReadHandler();
- });
</del><ins>+ // Schedule a call to readyReadHandler. Data may have arrived before installation of the signal
+ // handler.
+ m_connectionQueue->dispatch(WTF::bind(&Connection::readyReadHandler, this));
</ins><span class="cx">
</span><span class="cx"> return true;
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>