<!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>[204742] 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/204742">204742</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2016-08-22 15:10:43 -0700 (Mon, 22 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move tuple coding to ArgumentCoders.h
https://bugs.webkit.org/show_bug.cgi?id=161059
Reviewed by Tim Horton.
* Platform/IPC/ArgumentCoders.h:
(IPC::TupleCoder::encode):
(IPC::TupleCoder::decode):
* Platform/IPC/Arguments.h:
(IPC::TupleCoder::encode): Deleted.
(IPC::TupleCoder::decode): Deleted.
* Scripts/webkit/messages.py:
(forward_declarations_and_headers):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentCodersh">trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h</a></li>
<li><a href="#trunkSourceWebKit2PlatformIPCArgumentsh">trunk/Source/WebKit2/Platform/IPC/Arguments.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 (204741 => 204742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-08-22 21:59:18 UTC (rev 204741)
+++ trunk/Source/WebKit2/ChangeLog 2016-08-22 22:10:43 UTC (rev 204742)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2016-08-22 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Move tuple coding to ArgumentCoders.h
+ https://bugs.webkit.org/show_bug.cgi?id=161059
+
+ Reviewed by Tim Horton.
+
+ * Platform/IPC/ArgumentCoders.h:
+ (IPC::TupleCoder::encode):
+ (IPC::TupleCoder::decode):
+ * Platform/IPC/Arguments.h:
+ (IPC::TupleCoder::encode): Deleted.
+ (IPC::TupleCoder::decode): Deleted.
+ * Scripts/webkit/messages.py:
+ (forward_declarations_and_headers):
+
+2016-08-22 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Simplify the generated message structs
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161057
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentCodersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h (204741 => 204742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-08-22 21:59:18 UTC (rev 204741)
+++ trunk/Source/WebKit2/Platform/IPC/ArgumentCoders.h 2016-08-22 22:10:43 UTC (rev 204742)
</span><span class="lines">@@ -23,8 +23,7 @@
</span><span class="cx"> * THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><del>-#ifndef ArgumentCoders_h
-#define ArgumentCoders_h
</del><ins>+#pragma once
</ins><span class="cx">
</span><span class="cx"> #include "Decoder.h"
</span><span class="cx"> #include "Encoder.h"
</span><span class="lines">@@ -123,6 +122,47 @@
</span><span class="cx"> }
</span><span class="cx"> };
</span><span class="cx">
</span><ins>+template<size_t index, typename... Elements>
+struct TupleCoder {
+ static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
+ {
+ encoder << std::get<sizeof...(Elements) - index>(tuple);
+ TupleCoder<index - 1, Elements...>::encode(encoder, tuple);
+ }
+
+ static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
+ {
+ if (!decoder.decode(std::get<sizeof...(Elements) - index>(tuple)))
+ return false;
+ return TupleCoder<index - 1, Elements...>::decode(decoder, tuple);
+ }
+};
+
+template<typename... Elements>
+struct TupleCoder<0, Elements...> {
+ static void encode(Encoder&, const std::tuple<Elements...>&)
+ {
+ }
+
+ static bool decode(Decoder&, std::tuple<Elements...>&)
+ {
+ return true;
+ }
+};
+
+template<typename... Elements> struct ArgumentCoder<std::tuple<Elements...>> {
+ static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
+ {
+ TupleCoder<sizeof...(Elements), Elements...>::encode(encoder, tuple);
+ }
+
+ static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
+ {
+ return TupleCoder<sizeof...(Elements), Elements...>::decode(decoder, tuple);
+ }
+};
+
+
</ins><span class="cx"> template<typename Rep, typename Period> struct ArgumentCoder<std::chrono::duration<Rep, Period>> {
</span><span class="cx"> static void encode(Encoder& encoder, const std::chrono::duration<Rep, Period>& duration)
</span><span class="cx"> {
</span><span class="lines">@@ -359,5 +399,3 @@
</span><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace IPC
</span><del>-
-#endif // ArgumentCoders_h
</del></span></pre></div>
<a id="trunkSourceWebKit2PlatformIPCArgumentsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Platform/IPC/Arguments.h (204741 => 204742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Platform/IPC/Arguments.h 2016-08-22 21:59:18 UTC (rev 204741)
+++ trunk/Source/WebKit2/Platform/IPC/Arguments.h 2016-08-22 22:10:43 UTC (rev 204742)
</span><span class="lines">@@ -31,46 +31,7 @@
</span><span class="cx">
</span><span class="cx"> namespace IPC {
</span><span class="cx">
</span><del>-template<size_t index, typename... Elements>
-struct TupleCoder {
- static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
- {
- encoder << std::get<sizeof...(Elements) - index>(tuple);
- TupleCoder<index - 1, Elements...>::encode(encoder, tuple);
- }
</del><span class="cx">
</span><del>- static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
- {
- if (!decoder.decode(std::get<sizeof...(Elements) - index>(tuple)))
- return false;
- return TupleCoder<index - 1, Elements...>::decode(decoder, tuple);
- }
-};
-
-template<typename... Elements>
-struct TupleCoder<0, Elements...> {
- static void encode(Encoder&, const std::tuple<Elements...>&)
- {
- }
-
- static bool decode(Decoder&, std::tuple<Elements...>&)
- {
- return true;
- }
-};
-
-template<typename... Elements> struct ArgumentCoder<std::tuple<Elements...>> {
- static void encode(Encoder& encoder, const std::tuple<Elements...>& tuple)
- {
- TupleCoder<sizeof...(Elements), Elements...>::encode(encoder, tuple);
- }
-
- static bool decode(Decoder& decoder, std::tuple<Elements...>& tuple)
- {
- return TupleCoder<sizeof...(Elements), Elements...>::decode(decoder, tuple);
- }
-};
-
</del><span class="cx"> template<typename... Types>
</span><span class="cx"> struct Arguments {
</span><span class="cx"> typedef std::tuple<typename std::decay<Types>::type...> ValueType;
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkitmessagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit/messages.py (204741 => 204742)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-08-22 21:59:18 UTC (rev 204741)
+++ trunk/Source/WebKit2/Scripts/webkit/messages.py 2016-08-22 22:10:43 UTC (rev 204742)
</span><span class="lines">@@ -165,8 +165,7 @@
</span><span class="cx"> types_by_namespace = collections.defaultdict(set)
</span><span class="cx">
</span><span class="cx"> headers = set([
</span><del>- '"Arguments.h"',
- '"Encoder.h"',
</del><ins>+ '"ArgumentCoders.h"',
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> non_template_wtf_types = frozenset([
</span></span></pre>
</div>
</div>
</body>
</html>