<!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>[241595] trunk/Source/WebKit</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/241595">241595</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2019-02-15 10:53:02 -0800 (Fri, 15 Feb 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>IPC code should support messages with both Delayed and WantsConnection attributes
https://bugs.webkit.org/show_bug.cgi?id=194679

Reviewed by Geoffrey Garen.

* Platform/IPC/HandleMessage.h:
(IPC::callMemberFunctionImpl):
(IPC::callMemberFunction):
(IPC::handleMessageDelayedWantsConnection):
* Scripts/webkit/messages.py:
* UIProcess/WebStorage/StorageManager.cpp:
(WebKit::StorageManager::getValues):
* UIProcess/WebStorage/StorageManager.h:
* UIProcess/WebStorage/StorageManager.messages.in:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKitChangeLog">trunk/Source/WebKit/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitPlatformIPCHandleMessageh">trunk/Source/WebKit/Platform/IPC/HandleMessage.h</a></li>
<li><a href="#trunkSourceWebKitScriptswebkitmessagespy">trunk/Source/WebKit/Scripts/webkit/messages.py</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebStorageStorageManagercpp">trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.cpp</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebStorageStorageManagerh">trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.h</a></li>
<li><a href="#trunkSourceWebKitUIProcessWebStorageStorageManagermessagesin">trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.messages.in</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKitChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/ChangeLog (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/ChangeLog    2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/ChangeLog       2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -1,3 +1,20 @@
</span><ins>+2019-02-15  Alex Christensen  <achristensen@webkit.org>
+
+        IPC code should support messages with both Delayed and WantsConnection attributes
+        https://bugs.webkit.org/show_bug.cgi?id=194679
+
+        Reviewed by Geoffrey Garen.
+
+        * Platform/IPC/HandleMessage.h:
+        (IPC::callMemberFunctionImpl):
+        (IPC::callMemberFunction):
+        (IPC::handleMessageDelayedWantsConnection):
+        * Scripts/webkit/messages.py:
+        * UIProcess/WebStorage/StorageManager.cpp:
+        (WebKit::StorageManager::getValues):
+        * UIProcess/WebStorage/StorageManager.h:
+        * UIProcess/WebStorage/StorageManager.messages.in:
+
</ins><span class="cx"> 2019-02-15  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r241559 and r241566.
</span></span></pre></div>
<a id="trunkSourceWebKitPlatformIPCHandleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Platform/IPC/HandleMessage.h (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Platform/IPC/HandleMessage.h 2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/Platform/IPC/HandleMessage.h    2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -75,6 +75,20 @@
</span><span class="cx">     callMemberFunctionImpl(object, function, WTFMove(completionHandler), std::forward<ArgsTuple>(args), ArgsIndicies());
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+// Dispatch functions with connection parameter with delayed reply arguments.
+
+template <typename C, typename MF, typename CH, typename ArgsTuple, size_t... ArgsIndex>
+void callMemberFunctionImpl(Connection& connection, C* object, MF function, CompletionHandler<CH>&& completionHandler, ArgsTuple&& args, std::index_sequence<ArgsIndex...>)
+{
+    (object->*function)(connection, std::get<ArgsIndex>(std::forward<ArgsTuple>(args))..., WTFMove(completionHandler));
+}
+
+template<typename C, typename MF, typename CH, typename ArgsTuple, typename ArgsIndicies = std::make_index_sequence<std::tuple_size<ArgsTuple>::value>>
+void callMemberFunction(Connection& connection, ArgsTuple&& args, CompletionHandler<CH>&& completionHandler, C* object, MF function)
+{
+    callMemberFunctionImpl(connection, object, function, WTFMove(completionHandler), std::forward<ArgsTuple>(args), ArgsIndicies());
+}
+
</ins><span class="cx"> // Dispatch functions with connection parameter with no reply arguments.
</span><span class="cx"> 
</span><span class="cx"> template <typename C, typename MF, typename ArgsTuple, size_t... ArgsIndex>
</span><span class="lines">@@ -188,6 +202,21 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><ins>+void handleMessageDelayedWantsConnection(Connection& connection, Decoder& decoder, std::unique_ptr<Encoder>& replyEncoder, C* object, MF function)
+{
+    typename CodingType<typename T::Arguments>::Type arguments;
+    if (!decoder.decode(arguments)) {
+        ASSERT(decoder.isInvalid());
+        return;
+    }
+    
+    typename T::DelayedReply completionHandler = [replyEncoder = WTFMove(replyEncoder), connection = makeRef(connection)] (auto&&... args) mutable {
+        T::send(WTFMove(replyEncoder), WTFMove(connection), args...);
+    };
+    callMemberFunction(connection, WTFMove(arguments), WTFMove(completionHandler), object, function);
+}
+
+template<typename T, typename C, typename MF>
</ins><span class="cx"> void handleMessageAsync(Connection& connection, Decoder& decoder, C* object, MF function)
</span><span class="cx"> {
</span><span class="cx">     Optional<uint64_t> listenerID;
</span></span></pre></div>
<a id="trunkSourceWebKitScriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/Scripts/webkit/messages.py (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/Scripts/webkit/messages.py   2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/Scripts/webkit/messages.py      2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -307,6 +307,8 @@
</span><span class="cx">     dispatch_function = 'handleMessage'
</span><span class="cx">     if message.has_attribute(DELAYED_ATTRIBUTE):
</span><span class="cx">         dispatch_function += 'Delayed'
</span><ins>+        if message.has_attribute(WANTS_CONNECTION_ATTRIBUTE):
+            dispatch_function += 'WantsConnection'
</ins><span class="cx">     if message.has_attribute(ASYNC_ATTRIBUTE):
</span><span class="cx">         dispatch_function += 'Async'
</span><span class="cx">     if message.has_attribute(LEGACY_SYNC_ATTRIBUTE):
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebStorageStorageManagercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.cpp (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.cpp      2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.cpp 2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -785,15 +785,15 @@
</span><span class="cx">     m_storageAreasByConnection.remove(connectionAndStorageMapIDPair);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void StorageManager::getValues(IPC::Connection& connection, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values)
</del><ins>+void StorageManager::getValues(IPC::Connection& connection, uint64_t storageMapID, uint64_t storageMapSeed, CompletionHandler<void(const HashMap<String, String>&)>&& completionHandler)
</ins><span class="cx"> {
</span><span class="cx">     StorageArea* storageArea = findStorageArea(connection, storageMapID);
</span><span class="cx">     if (!storageArea) {
</span><span class="cx">         // This is a session storage area for a page that has already been closed. Ignore it.
</span><del>-        return;
</del><ins>+        return completionHandler({ });
</ins><span class="cx">     }
</span><span class="cx"> 
</span><del>-    values = storageArea->items();
</del><ins>+    completionHandler(storageArea->items());
</ins><span class="cx">     connection.send(Messages::StorageAreaMap::DidGetValues(storageMapSeed), storageMapID);
</span><span class="cx"> }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebStorageStorageManagerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.h (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.h        2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.h   2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx">     void createSessionStorageMap(IPC::Connection&, uint64_t storageMapID, uint64_t storageNamespaceID, WebCore::SecurityOriginData&&);
</span><span class="cx">     void destroyStorageMap(IPC::Connection&, uint64_t storageMapID);
</span><span class="cx"> 
</span><del>-    void getValues(IPC::Connection&, uint64_t storageMapID, uint64_t storageMapSeed, HashMap<String, String>& values);
</del><ins>+    void getValues(IPC::Connection&, uint64_t storageMapID, uint64_t storageMapSeed, CompletionHandler<void(const HashMap<String, String>&)>&&);
</ins><span class="cx">     void setItem(IPC::Connection&, uint64_t storageAreaID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& value, const String& urlString);
</span><span class="cx">     void removeItem(IPC::Connection&, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& key, const String& urlString);
</span><span class="cx">     void clear(IPC::Connection&, uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, const String& urlString);
</span></span></pre></div>
<a id="trunkSourceWebKitUIProcessWebStorageStorageManagermessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.messages.in (241594 => 241595)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.messages.in      2019-02-15 18:51:09 UTC (rev 241594)
+++ trunk/Source/WebKit/UIProcess/WebStorage/StorageManager.messages.in 2019-02-15 18:53:02 UTC (rev 241595)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx">     CreateSessionStorageMap(uint64_t storageMapID, uint64_t storageNamespaceID, struct WebCore::SecurityOriginData securityOriginData) WantsConnection
</span><span class="cx">     DestroyStorageMap(uint64_t storageMapID) WantsConnection
</span><span class="cx"> 
</span><del>-    GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<String, String> values) LegacySync WantsConnection
</del><ins>+    GetValues(uint64_t storageMapID, uint64_t storageMapSeed) -> (HashMap<String, String> values) Delayed WantsConnection
</ins><span class="cx"> 
</span><span class="cx">     SetItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, String key, String value, String urlString) WantsConnection
</span><span class="cx">     RemoveItem(uint64_t storageMapID, uint64_t sourceStorageAreaID, uint64_t storageMapSeed, String key, String urlString) WantsConnection
</span></span></pre>
</div>
</div>

</body>
</html>