<!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>[204739] 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/204739">204739</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-22 14:31:55 -0700 (Mon, 22 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Simplify the generated message structs
https://bugs.webkit.org/show_bug.cgi?id=161057
Reviewed by Geoffrey Garen.
Use a class template to transform the Reply and Argument tuple types for encoding/decoding
instead of generating them for each message.
* Platform/IPC/HandleMessage.h:
(IPC::handleMessage):
(IPC::handleMessageDelayed):
* Scripts/webkit/messages.py:
(reply_type):
(message_to_struct_declaration):
(decode_type): Deleted.</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (204738 => 204739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-22 21:21:57 UTC (rev 204738)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-22 21:31:55 UTC (rev 204739)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2016-08-22 Anders Carlsson <andersca@apple.com>
+
+ Simplify the generated message structs
+ https://bugs.webkit.org/show_bug.cgi?id=161057
+
+ Reviewed by Geoffrey Garen.
+
+ Use a class template to transform the Reply and Argument tuple types for encoding/decoding
+ instead of generating them for each message.
+
+ * Platform/IPC/HandleMessage.h:
+ (IPC::handleMessage):
+ (IPC::handleMessageDelayed):
+ * Scripts/webkit/messages.py:
+ (reply_type):
+ (message_to_struct_declaration):
+ (decode_type): Deleted.
+
</ins><span class="cx"> 2016-08-19 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Remove MessageRecorder
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCHandleMessageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/HandleMessage.h (204738 => 204739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2016-08-22 21:21:57 UTC (rev 204738)
+++ trunk/Source/WebKit2/Platform/IPC/HandleMessage.h 2016-08-22 21:31:55 UTC (rev 204739)
</span><span class="lines">@@ -80,10 +80,20 @@
</span><span class="cx">
</span><span class="cx"> // Main dispatch functions
</span><span class="cx">
</span><ins>+template<typename T>
+struct CodingType {
+ typedef std::remove_const_t<std::remove_reference_t<T>> Type;
+};
+
+template<typename... Ts>
+struct CodingType<std::tuple<Ts...>> {
+ typedef std::tuple<typename CodingType<Ts>::Type...> Type;
+};
+
</ins><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessage(Decoder& decoder, C* object, MF function)
</span><span class="cx"> {
</span><del>- typename T::DecodeType arguments;
</del><ins>+ typename CodingType<typename T::Arguments>::Type arguments;
</ins><span class="cx"> if (!decoder.decode(arguments)) {
</span><span class="cx"> ASSERT(decoder.isInvalid());
</span><span class="cx"> return;
</span><span class="lines">@@ -95,13 +105,13 @@
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessage(Decoder& decoder, Encoder& replyEncoder, C* object, MF function)
</span><span class="cx"> {
</span><del>- typename T::DecodeType arguments;
</del><ins>+ typename CodingType<typename T::Arguments>::Type arguments;
</ins><span class="cx"> if (!decoder.decode(arguments)) {
</span><span class="cx"> ASSERT(decoder.isInvalid());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typename T::Reply::ValueType replyArguments;
</del><ins>+ typename CodingType<typename T::Reply>::Type replyArguments;
</ins><span class="cx"> callMemberFunction(WTFMove(arguments), replyArguments, object, function);
</span><span class="cx"> replyEncoder << replyArguments;
</span><span class="cx"> }
</span><span class="lines">@@ -109,13 +119,13 @@
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessage(Connection& connection, Decoder& decoder, Encoder& replyEncoder, C* object, MF function)
</span><span class="cx"> {
</span><del>- typename T::DecodeType arguments;
</del><ins>+ typename CodingType<typename T::Arguments>::Type arguments;
</ins><span class="cx"> if (!decoder.decode(arguments)) {
</span><span class="cx"> ASSERT(decoder.isInvalid());
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- typename T::Reply::ValueType replyArguments;
</del><ins>+ typename CodingType<typename T::Reply>::Type replyArguments;
</ins><span class="cx"> callMemberFunction(connection, WTFMove(arguments), replyArguments, object, function);
</span><span class="cx"> replyEncoder << replyArguments;
</span><span class="cx"> }
</span><span class="lines">@@ -123,7 +133,7 @@
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessage(Connection& connection, Decoder& decoder, C* object, MF function)
</span><span class="cx"> {
</span><del>- typename T::DecodeType arguments;
</del><ins>+ typename CodingType<typename T::Arguments>::Type arguments;
</ins><span class="cx"> if (!decoder.decode(arguments)) {
</span><span class="cx"> ASSERT(decoder.isInvalid());
</span><span class="cx"> return;
</span><span class="lines">@@ -134,7 +144,7 @@
</span><span class="cx"> template<typename T, typename C, typename MF>
</span><span class="cx"> void handleMessageDelayed(Connection& connection, Decoder& decoder, std::unique_ptr<Encoder>& replyEncoder, C* object, MF function)
</span><span class="cx"> {
</span><del>- typename T::DecodeType arguments;
</del><ins>+ typename CodingType<typename T::Arguments>::Type arguments;
</ins><span class="cx"> if (!decoder.decode(arguments)) {
</span><span class="cx"> ASSERT(decoder.isInvalid());
</span><span class="cx"> return;
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (204738 => 204739)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-08-22 21:21:57 UTC (rev 204738)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-08-22 21:31:55 UTC (rev 204739)
</span><span class="lines">@@ -97,19 +97,15 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def reply_type(message):
</span><del>- return 'IPC::Arguments<%s>' % (', '.join(reply_parameter_type(parameter.type) for parameter in message.reply_parameters))
</del><ins>+ return 'std::tuple<%s>' % (', '.join(reply_parameter_type(parameter.type) for parameter in message.reply_parameters))
</ins><span class="cx">
</span><span class="cx">
</span><del>-def decode_type(message):
- return 'std::tuple<%s>' % ', '.join(parameter.type for parameter in message.parameters)
-
-
</del><span class="cx"> def message_to_struct_declaration(message):
</span><span class="cx"> result = []
</span><span class="cx"> function_parameters = [(function_parameter_type(x.type), x.name) for x in message.parameters]
</span><span class="cx"> result.append('class %s {\n' % message.name)
</span><span class="cx"> result.append('public:\n')
</span><del>- result.append(' typedef %s DecodeType;\n' % decode_type(message))
</del><ins>+ result.append(' typedef %s Arguments;\n' % arguments_type(message))
</ins><span class="cx"> result.append('\n')
</span><span class="cx"> result.append(' static IPC::StringReference receiverName() { return messageReceiverName(); }\n')
</span><span class="cx"> result.append(' static IPC::StringReference name() { return IPC::StringReference("%s"); }\n' % message.name)
</span><span class="lines">@@ -136,13 +132,13 @@
</span><span class="cx"> result.append('\n : m_arguments(%s)\n' % ', '.join([x[1] for x in function_parameters]))
</span><span class="cx"> result.append(' {\n')
</span><span class="cx"> result.append(' }\n\n')
</span><del>- result.append(' const %s& arguments() const\n' % arguments_type(message))
</del><ins>+ result.append(' const Arguments& arguments() const\n')
</ins><span class="cx"> result.append(' {\n')
</span><span class="cx"> result.append(' return m_arguments;\n')
</span><span class="cx"> result.append(' }\n')
</span><span class="cx"> result.append('\n')
</span><span class="cx"> result.append('private:\n')
</span><del>- result.append(' %s m_arguments;\n' % arguments_type(message))
</del><ins>+ result.append(' Arguments m_arguments;\n')
</ins><span class="cx"> result.append('};\n')
</span><span class="cx"> return surround_in_condition(''.join(result), message.condition)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>