<!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>[165931] 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/165931">165931</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-03-19 16:45:46 -0700 (Wed, 19 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Get rid of two IPC::Connection functions by folding them into lambdas
https://bugs.webkit.org/show_bug.cgi?id=130482
Reviewed by Tim Horton.
* Platform/IPC/Connection.cpp:
(IPC::Connection::addWorkQueueMessageReceiver):
(IPC::Connection::removeWorkQueueMessageReceiver):
* Platform/IPC/Connection.h:</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="#trunkSourceWebKit2PlatformIPCConnectionh">trunk/Source/WebKit2/Platform/IPC/Connection.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (165930 => 165931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-03-19 23:44:39 UTC (rev 165930)
+++ trunk/Source/WebKit2/ChangeLog 2014-03-19 23:45:46 UTC (rev 165931)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2014-03-19 Anders Carlsson <andersca@apple.com>
+
+ Get rid of two IPC::Connection functions by folding them into lambdas
+ https://bugs.webkit.org/show_bug.cgi?id=130482
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/Connection.cpp:
+ (IPC::Connection::addWorkQueueMessageReceiver):
+ (IPC::Connection::removeWorkQueueMessageReceiver):
+ * Platform/IPC/Connection.h:
+
</ins><span class="cx"> 2014-03-19 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Expose text and page zoom in WK2 SPI, and hook them up in MiniBrowser
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.cpp (165930 => 165931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-03-19 23:44:39 UTC (rev 165930)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.cpp 2014-03-19 23:45:46 UTC (rev 165931)
</span><span class="lines">@@ -256,31 +256,25 @@
</span><span class="cx"> ASSERT(&RunLoop::current() == &m_clientRunLoop);
</span><span class="cx"> ASSERT(!m_isConnected);
</span><span class="cx">
</span><del>- m_connectionQueue->dispatch(bind(&Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue, this, messageReceiverName, RefPtr<WorkQueue>(workQueue), RefPtr<WorkQueueMessageReceiver>(workQueueMessageReceiver)));
</del><ins>+ RefPtr<Connection> connection(this);
+ m_connectionQueue->dispatch([connection, messageReceiverName, workQueue, workQueueMessageReceiver] {
+ ASSERT(!connection->m_workQueueMessageReceivers.contains(messageReceiverName));
+
+ connection->m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(workQueue, workQueueMessageReceiver));
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Connection::removeWorkQueueMessageReceiver(StringReference messageReceiverName)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(&RunLoop::current() == &m_clientRunLoop);
</span><span class="cx">
</span><del>- m_connectionQueue->dispatch(bind(&Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue, this, messageReceiverName));
</del><ins>+ RefPtr<Connection> connection(this);
+ m_connectionQueue->dispatch([connection, messageReceiverName] {
+ ASSERT(connection->m_workQueueMessageReceivers.contains(messageReceiverName));
+ connection->m_workQueueMessageReceivers.remove(messageReceiverName);
+ });
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void Connection::addWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName, WorkQueue* workQueue, WorkQueueMessageReceiver* workQueueMessageReceiver)
-{
- ASSERT(workQueue);
- ASSERT(workQueueMessageReceiver);
- ASSERT(!m_workQueueMessageReceivers.contains(messageReceiverName));
-
- m_workQueueMessageReceivers.add(messageReceiverName, std::make_pair(workQueue, workQueueMessageReceiver));
-}
-
-void Connection::removeWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName)
-{
- ASSERT(m_workQueueMessageReceivers.contains(messageReceiverName));
- m_workQueueMessageReceivers.remove(messageReceiverName);
-}
-
</del><span class="cx"> void Connection::dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver* workQueueMessageReceiver, MessageDecoder* incomingMessageDecoder)
</span><span class="cx"> {
</span><span class="cx"> OwnPtr<MessageDecoder> decoder = adoptPtr(incomingMessageDecoder);
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Connection.h (165930 => 165931)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-03-19 23:44:39 UTC (rev 165930)
+++ trunk/Source/WebKit2/Platform/IPC/Connection.h 2014-03-19 23:45:46 UTC (rev 165931)
</span><span class="lines">@@ -191,8 +191,6 @@
</span><span class="cx"> void processIncomingMessage(std::unique_ptr<MessageDecoder>);
</span><span class="cx"> void processIncomingSyncReply(std::unique_ptr<MessageDecoder>);
</span><span class="cx">
</span><del>- void addWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName, WorkQueue*, WorkQueueMessageReceiver*);
- void removeWorkQueueMessageReceiverOnConnectionWorkQueue(StringReference messageReceiverName);
</del><span class="cx"> void dispatchWorkQueueMessageReceiverMessage(WorkQueueMessageReceiver*, MessageDecoder*);
</span><span class="cx">
</span><span class="cx"> bool canSendOutgoingMessages() const;
</span></span></pre>
</div>
</div>
</body>
</html>