<!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>[177914] 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/177914">177914</a></dd>

<dt>Author</dt> <dd>andersca@apple.com</dd>

<dt>Date</dt> <dd>2015-01-05 10:17:11 -0800 (Mon, 05 Jan 2015)</dd>

</dl>

<h3>Log Message</h3>

<pre>Pass IPC::Connection by reference to IPC message handlers

https://bugs.webkit.org/show_bug.cgi?id=140082

Reviewed by Darin Adler.

* Platform/IPC/HandleMessage.h:

(IPC::callMemberFunctionImpl):

(IPC::callMemberFunction):

(IPC::handleMessage):

(IPC::handleMessageDelayed):

* Scripts/webkit/messages.py:

(async_message_statement):

(sync_message_statement):

* UIProcess/Storage/StorageManager.cpp:

(WebKit::StorageManager::createLocalStorageMap):

(WebKit::StorageManager::createTransientLocalStorageMap):

(WebKit::StorageManager::createSessionStorageMap):

(WebKit::StorageManager::destroyStorageMap):

(WebKit::StorageManager::getValues):

(WebKit::StorageManager::setItem):

(WebKit::StorageManager::removeItem):

(WebKit::StorageManager::clear):

* UIProcess/Storage/StorageManager.h:

* UIProcess/UserContent/WebUserContentControllerProxy.cpp:

(WebKit::WebUserContentControllerProxy::didPostMessage):

* UIProcess/UserContent/WebUserContentControllerProxy.h:

* UIProcess/WebGeolocationManagerProxy.cpp:

(WebKit::WebGeolocationManagerProxy::startUpdating):

(WebKit::WebGeolocationManagerProxy::stopUpdating):

(WebKit::WebGeolocationManagerProxy::setEnableHighAccuracy):

* UIProcess/WebGeolocationManagerProxy.h:

* UIProcess/WebOriginDataManagerProxy.cpp:

(WebKit::WebOriginDataManagerProxy::didGetOrigins):

(WebKit::WebOriginDataManagerProxy::didDeleteEntries):

(WebKit::WebOriginDataManagerProxy::didDeleteAllEntries):

* UIProcess/WebOriginDataManagerProxy.h:

* UIProcess/WebProcessPool.cpp:

(WebKit::WebProcessPool::handleMessage):

(WebKit::WebProcessPool::handleSynchronousMessage):

* UIProcess/WebProcessPool.h:

* UIProcess/mac/SecItemShimProxy.cpp:

(WebKit::SecItemShimProxy::secItemRequest):

* UIProcess/mac/SecItemShimProxy.h:</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2PlatformIPCHandleMessageh">trunk/Source/WebKit2/Platform/IPC/HandleMessage.h</a></li>

<li><a href="#trunkSourceWebKit2Scriptswebkitmessagespy">trunk/Source/WebKit2/Scripts/webkit/messages.py</a></li>

<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagercpp">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessStorageStorageManagerh">trunk/Source/WebKit2/UIProcess/Storage/StorageManager.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxycpp">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessUserContentWebUserContentControllerProxyh">trunk/Source/WebKit2/UIProcess/UserContent/WebUserContentControllerProxy.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebGeolocationManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebGeolocationManagerProxyh">trunk/Source/WebKit2/UIProcess/WebGeolocationManagerProxy.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxycpp">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebOriginDataManagerProxyh">trunk/Source/WebKit2/UIProcess/WebOriginDataManagerProxy.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolcpp">trunk/Source/WebKit2/UIProcess/WebProcessPool.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessWebProcessPoolh">trunk/Source/WebKit2/UIProcess/WebProcessPool.h</a></li>

<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxycpp">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessmacSecItemShimProxyh">trunk/Source/WebKit2/UIProcess/mac/SecItemShimProxy.h</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceWebKit2ChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (177913 => 177914)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/ChangeLog        2015-01-05 18:16:07 UTC (rev 177913)

+++ trunk/Source/WebKit2/ChangeLog        2015-01-05 18:17:11 UTC (rev 177914)

</span><span class="lines">@@ -1,3 +1,49 @@

</span><ins>+2015-01-05  Anders Carlsson  &lt;andersca@apple.com&gt;

+

+        Pass IPC::Connection by reference to IPC message handlers

+        https://bugs.webkit.org/show_bug.cgi?id=140082

+

+        Reviewed by Darin Adler.

+

+        * Platform/IPC/HandleMessage.h:

+        (IPC::callMemberFunctionImpl):

+        (IPC::callMemberFunction):

+        (IPC::handleMessage):

+        (IPC::handleMessageDelayed):

+        * Scripts/webkit/messages.py:

+        (async_message_statement):

+        (sync_message_statement):

+        * UIProcess/Storage/StorageManager.cpp:

+        (WebKit::StorageManager::createLocalStorageMap):

+        (WebKit::StorageManager::createTransientLocalStorageMap):

+        (WebKit::StorageManager::createSessionStorageMap):

+        (WebKit::StorageManager::destroyStorageMap):

+        (WebKit::StorageManager::getValues):

+        (WebKit::StorageManager::setItem):

+        (WebKit::StorageManager::removeItem):

+        (WebKit::StorageManager::clear):

+        * UIProcess/Storage/StorageManager.h:

+        * UIProcess/UserContent/WebUserContentControllerProxy.cpp:

+        (WebKit::WebUserContentControllerProxy::didPostMessage):

+        * UIProcess/UserContent/WebUserContentControllerProxy.h:

+        * UIProcess/WebGeolocationManagerProxy.cpp:

+        (WebKit::WebGeolocationManagerProxy::startUpdating):

+        (WebKit::WebGeolocationManagerProxy::stopUpdating):

+        (WebKit::WebGeolocationManagerProxy::setEnableHighAccuracy):

+        * UIProcess/WebGeolocationManagerProxy.h:

+        * UIProcess/WebOriginDataManagerProxy.cpp:

+        (WebKit::WebOriginDataManagerProxy::didGetOrigins):

+        (WebKit::WebOriginDataManagerProxy::didDeleteEntries):

+        (WebKit::WebOriginDataManagerProxy::didDeleteAllEntries):

+        * UIProcess/WebOriginDataManagerProxy.h:

+        * UIProcess/WebProcessPool.cpp:

+        (WebKit::WebProcessPool::handleMessage):

+        (WebKit::WebProcessPool::handleSynchronousMessage):

+        * UIProcess/WebProcessPool.h:

+        * UIProcess/mac/SecItemShimProxy.cpp:

+        (WebKit::SecItemShimProxy::secItemRequest):

+        * UIProcess/mac/SecItemShimProxy.h:

+

</ins><span class="cx"> 2015-01-04  Anders Carlsson  &lt;andersca@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         Clean up some of the IPC code

</span></span></pre></div>

<a id="trunkSourceWebKit2PlatformIPCHandleMessageh"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (177913 => 177914)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h        2015-01-05 18:16:07 UTC (rev 177913)

+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h        2015-01-05 18:17:11 UTC (rev 177914)

</span><span class="lines">@@ -53,13 +53,13 @@

<span class="cx"> // Dispatch functions with connection parameter with no reply arguments.

</span><span class="cx"> 

</span><span class="cx"> template &lt;typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex&gt;

</span><del>-void callMemberFunctionImpl(C* object, MF function, Connection* connection, ArgsTuple&amp;&amp; args, std::index_sequence&lt;ArgsIndex...&gt;)

</del><ins>+void callMemberFunctionImpl(C* object, MF function, Connection&amp; connection, ArgsTuple&amp;&amp; args, std::index_sequence&lt;ArgsIndex...&gt;)

</ins><span class="cx"> {

</span><span class="cx">     (object-&gt;*function)(connection, std::get&lt;ArgsIndex&gt;(args)...);

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence&lt;std::tuple_size&lt;ArgsTuple&gt;::value&gt;&gt;

</span><del>-void callMemberFunction(Connection* connection, ArgsTuple&amp;&amp; args, C* object, MF function)

</del><ins>+void callMemberFunction(Connection&amp; connection, ArgsTuple&amp;&amp; args, C* object, MF function)

</ins><span class="cx"> {

</span><span class="cx">     callMemberFunctionImpl(object, function, connection, std::forward&lt;ArgsTuple&gt;(args), ArgsIndicies());

</span><span class="cx"> }

</span><span class="lines">@@ -67,13 +67,13 @@

<span class="cx"> // Dispatch functions with connection parameter with reply arguments.

</span><span class="cx"> 

</span><span class="cx"> template &lt;typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex, typename ReplyArgsTuple, size_t... ReplyArgsIndex&gt;

</span><del>-void callMemberFunctionImpl(C* object, MF function, Connection* connection, ArgsTuple&amp;&amp; args, ReplyArgsTuple&amp; replyArgs, std::index_sequence&lt;ArgsIndex...&gt;, std::index_sequence&lt;ReplyArgsIndex...&gt;)

</del><ins>+void callMemberFunctionImpl(C* object, MF function, Connection&amp; connection, ArgsTuple&amp;&amp; args, ReplyArgsTuple&amp; replyArgs, std::index_sequence&lt;ArgsIndex...&gt;, std::index_sequence&lt;ReplyArgsIndex...&gt;)

</ins><span class="cx"> {

</span><span class="cx">     (object-&gt;*function)(connection, std::get&lt;ArgsIndex&gt;(std::forward&lt;ArgsTuple&gt;(args))..., std::get&lt;ReplyArgsIndex&gt;(replyArgs)...);

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template &lt;typename C, typename MF, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence&lt;std::tuple_size&lt;ArgsTuple&gt;::value&gt;, typename ReplyArgsTuple, typename ReplyArgsIndicies = std::make_index_sequence&lt;std::tuple_size&lt;ReplyArgsTuple&gt;::value&gt;&gt;

</span><del>-void callMemberFunction(Connection* connection, ArgsTuple&amp;&amp; args, ReplyArgsTuple&amp; replyArgs, C* object, MF function)

</del><ins>+void callMemberFunction(Connection&amp; connection, ArgsTuple&amp;&amp; args, ReplyArgsTuple&amp; replyArgs, C* object, MF function)

</ins><span class="cx"> {

</span><span class="cx">     callMemberFunctionImpl(object, function, connection, std::forward&lt;ArgsTuple&gt;(args), replyArgs, ArgsIndicies(), ReplyArgsIndicies());

</span><span class="cx"> }

</span><span class="lines">@@ -107,7 +107,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T, typename C, typename MF&gt;

</span><del>-void handleMessage(Connection* connection, MessageDecoder&amp; decoder, MessageEncoder&amp; replyEncoder, C* object, MF function)

</del><ins>+void handleMessage(Connection&amp; connection, MessageDecoder&amp; decoder, MessageEncoder&amp; replyEncoder, C* object, MF function)

</ins><span class="cx"> {

</span><span class="cx">     typename T::DecodeType arguments;

</span><span class="cx">     if (!decoder.decode(arguments)) {

</span><span class="lines">@@ -121,7 +121,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T, typename C, typename MF&gt;

</span><del>-void handleMessage(Connection* connection, MessageDecoder&amp; decoder, C* object, MF function)

</del><ins>+void handleMessage(Connection&amp; connection, MessageDecoder&amp; decoder, C* object, MF function)

</ins><span class="cx"> {

</span><span class="cx">     typename T::DecodeType arguments;

</span><span class="cx">     if (!decoder.decode(arguments)) {

</span><span class="lines">@@ -132,7 +132,7 @@

</span><span class="cx"> }

</span><span class="cx"> 

</span><span class="cx"> template&lt;typename T, typename C, typename MF&gt;

</span><del>-void handleMessageDelayed(Connection* connection, MessageDecoder&amp; decoder, std::unique_ptr&lt;MessageEncoder&gt;&amp; replyEncoder, C* object, MF function)

</del><ins>+void handleMessageDelayed(Connection&amp; connection, MessageDecoder&amp; decoder, std::unique_ptr&lt;MessageEncoder&gt;&amp; replyEncoder, C* object, MF function)

</ins><span class="cx"> {

</span><span class="cx">     typename T::DecodeType arguments;

</span><span class="cx">     if (!decoder.decode(arguments)) {

</span><span class="lines">@@ -140,7 +140,7 @@

</span><span class="cx">         return;

</span><span class="cx">     }

</span><span class="cx"> 

</span><del>-    RefPtr&lt;typename T::DelayedReply&gt; delayedReply = adoptRef(new typename T::DelayedReply(connection, WTF::move(replyEncoder)));

</del><ins>+    RefPtr&lt;typename T::DelayedReply&gt; delayedReply = adoptRef(new typename T::DelayedReply(&amp;connection, WTF::move(replyEncoder)));

</ins><span class="cx">     callMemberFunction(WTF::move(arguments), delayedReply.release(), object, function);

</span><span class="cx"> }

</span><span class="cx"> 

</span></span></pre></div>

<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (177913 => 177914)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py        2015-01-05 18:16:07 UTC (rev 177913)

+++ trunk/Source/WebKit2/Scripts/webkit/messages.py        2015-01-05 18:17:11 UTC (rev 177914)

</span><span class="lines">@@ -265,7 +265,7 @@

</span><span class="cx">     dispatch_function = 'handleMessage'

</span><span class="cx"> 

</span><span class="cx">     if message.has_attribute(WANTS_CONNECTION_ATTRIBUTE):

</span><del>-        dispatch_function_args.insert(0, 'connection')

</del><ins>+        dispatch_function_args.insert(0, '*connection')

</ins><span class="cx"> 

</span><span class="cx">     result = []

</span><span class="cx">     result.append('    if (decoder.messageName() == Messages::%s::%s::name()) {\n' % (receiver.name, message.name))

</span><span class="lines">@@ -284,7 +284,7 @@

</span><span class="cx"> 

</span><span class="cx">     result = []

</span><span class="cx">     result.append('    if (decoder.messageName() == Messages::%s::%s::name()) {\n' % (receiver.name, message.name))

</span><del>-    result.append('        IPC::%s&lt;Messages::%s::%s&gt;(%sdecoder, %sreplyEncoder, this, &amp;%s);\n' % (dispatch_function, receiver.name, message.name, 'connection, ' if wants_connection else '', '' if message.has_attribute(DELAYED_ATTRIBUTE) else '*', handler_function(receiver, message)))

</del><ins>+    result.append('        IPC::%s&lt;Messages::%s::%s&gt;(%sdecoder, %sreplyEncoder, this, &amp;%s);\n' % (dispatch_function, receiver.name, message.name, '*connection, ' if wants_connection else '', '' if message.has_attribute(DELAYED_ATTRIBUTE) else '*', handler_function(receiver, message)))

</ins><span class="cx">     result.append('        return;\n')

</span><span class="cx">     result.append('    }\n')

</span><span class="cx">     return surround_in_condition(''.join(result), message.condition)

</span></span></pre></div>

<a id="trunkSourceWebKit2UIProcessStorageStorageManagercpp"></a>

<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp (177913 => 177914)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2015-01-05 18:16:07 UTC (rev 177913)

+++ trunk/Source/WebKit2/UIProcess/Storage/StorageManager.cpp        2015-01-05 18:17:11 UTC (rev 177914)

</span><span class="lines">@@ -541,9 +541,9 @@

</span><span class="cx">     });

</span><span class="cx"> }

</span><span class="cx"> 

</span><del>-void StorageManager::createLocalStorageMap(IPC::Connection* connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&amp; securityOriginData)

</del><ins>+void StorageManager::createLocalStorageMap(IPC::Connection&amp; connection, uint64_t storageMapID, uint64_t storageNamespaceID, const SecurityOriginData&amp; securityOriginData)

</ins><span class="cx"> {

</span><del>-    std::pair&lt;RefPtr&lt;IPC::Connection&gt;, uint64_t&gt; connectionAndStorageMapIDPair(connection, storageMapID);

</del><ins>+    std::pair&lt;RefPtr&lt;IPC::Connection&gt;, uint64_t&gt; connectionAndStorageMapIDPair(&amp;connection, storageMapID);

</ins><span class="cx"> 