<!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>[159972] 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/159972">159972</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-02 15:03:53 -0800 (Mon, 02 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WK2] Improve readability of 'generate_message_handler' function
https://bugs.webkit.org/show_bug.cgi?id=125085
Patch by Nick Diego Yamane <nick.yamane@openbossa.org> on 2013-12-02
Reviewed by Sam Weinig.
* Scripts/webkit2/messages.py:
(generate_message_handler):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2Scriptswebkit2messagespy">trunk/Source/WebKit2/Scripts/webkit2/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 (159971 => 159972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2013-12-02 22:59:05 UTC (rev 159971)
+++ trunk/Source/WebKit2/ChangeLog 2013-12-02 23:03:53 UTC (rev 159972)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-02 Nick Diego Yamane <nick.yamane@openbossa.org>
+
+ [WK2] Improve readability of 'generate_message_handler' function
+ https://bugs.webkit.org/show_bug.cgi?id=125085
+
+ Reviewed by Sam Weinig.
+
+ * Scripts/webkit2/messages.py:
+ (generate_message_handler):
+
</ins><span class="cx"> 2013-12-02 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Remote Layer Tree: Support cloning layers
</span></span></pre></div>
<a id="trunkSourceWebKit2Scriptswebkit2messagespy"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Scripts/webkit2/messages.py (159971 => 159972)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-12-02 22:59:05 UTC (rev 159971)
+++ trunk/Source/WebKit2/Scripts/webkit2/messages.py 2013-12-02 23:03:53 UTC (rev 159972)
</span><span class="lines">@@ -461,7 +461,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_message_handler(file):
</span><span class="cx"> receiver = parser.parse(file)
</span><del>- headers = {
</del><ins>+ header_conditions = {
</ins><span class="cx"> '"%s"' % messages_header_filename(receiver): [None],
</span><span class="cx"> '"HandleMessage.h"': [None],
</span><span class="cx"> '"MessageDecoder.h"': [None],
</span><span class="lines">@@ -482,15 +482,15 @@
</span><span class="cx"> argument_encoder_headers = argument_coder_headers_for_type(type)
</span><span class="cx"> if argument_encoder_headers:
</span><span class="cx"> for header in argument_encoder_headers:
</span><del>- if header not in headers:
- headers[header] = []
- headers[header].extend(conditions)
</del><ins>+ if header not in header_conditions:
+ header_conditions[header] = []
+ header_conditions[header].extend(conditions)
</ins><span class="cx">
</span><span class="cx"> type_headers = headers_for_type(type)
</span><span class="cx"> for header in type_headers:
</span><del>- if header not in headers:
- headers[header] = []
- headers[header].extend(conditions)
</del><ins>+ if header not in header_conditions:
+ header_conditions[header] = []
+ header_conditions[header].extend(conditions)
</ins><span class="cx">
</span><span class="cx"> for message in receiver.messages:
</span><span class="cx"> if message.reply_parameters is not None:
</span><span class="lines">@@ -499,15 +499,15 @@
</span><span class="cx"> argument_encoder_headers = argument_coder_headers_for_type(type)
</span><span class="cx"> if argument_encoder_headers:
</span><span class="cx"> for header in argument_encoder_headers:
</span><del>- if header not in headers:
- headers[header] = []
- headers[header].append(message.condition)
</del><ins>+ if header not in header_conditions:
+ header_conditions[header] = []
+ header_conditions[header].append(message.condition)
</ins><span class="cx">
</span><span class="cx"> type_headers = headers_for_type(type)
</span><span class="cx"> for header in type_headers:
</span><del>- if header not in headers:
- headers[header] = []
- headers[header].append(message.condition)
</del><ins>+ if header not in header_conditions:
+ header_conditions[header] = []
+ header_conditions[header].append(message.condition)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> result = []
</span><span class="lines">@@ -520,13 +520,13 @@
</span><span class="cx"> result.append('#if %s\n\n' % receiver.condition)
</span><span class="cx">
</span><span class="cx"> result.append('#include "%s.h"\n\n' % receiver.name)
</span><del>- for headercondition in sorted(headers):
- if headers[headercondition] and not None in headers[headercondition]:
- result.append('#if %s\n' % ' || '.join(set(headers[headercondition])))
- result += ['#include %s\n' % headercondition]
</del><ins>+ for header in sorted(header_conditions):
+ if header_conditions[header] and not None in header_conditions[header]:
+ result.append('#if %s\n' % ' || '.join(set(header_conditions[header])))
+ result += ['#include %s\n' % header]
</ins><span class="cx"> result.append('#endif\n')
</span><span class="cx"> else:
</span><del>- result += ['#include %s\n' % headercondition]
</del><ins>+ result += ['#include %s\n' % header]
</ins><span class="cx"> result.append('\n')
</span><span class="cx">
</span><span class="cx"> sync_delayed_messages = []
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx">
</span><span class="cx"> if message.condition:
</span><span class="cx"> result.append('#if %s\n\n' % message.condition)
</span><del>-
</del><ins>+
</ins><span class="cx"> result.append('%s::DelayedReply::DelayedReply(PassRefPtr<CoreIPC::Connection> connection, std::unique_ptr<CoreIPC::MessageEncoder> encoder)\n' % message.name)
</span><span class="cx"> result.append(' : m_connection(connection)\n')
</span><span class="cx"> result.append(' , m_encoder(std::move(encoder))\n')
</span></span></pre>
</div>
</div>
</body>
</html>