<!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>[160565] trunk/Source/JavaScriptCore</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/160565">160565</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2013-12-13 13:57:35 -0800 (Fri, 13 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Cleanup CodeGeneratorInspectorStrings a bit
https://bugs.webkit.org/show_bug.cgi?id=125705
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2013-12-13
Reviewed by Timothy Hatcher.
* inspector/scripts/CodeGeneratorInspectorStrings.py:
Use ${foo} variable syntax and add an ASCIILiteral.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptsCodeGeneratorInspectorStringspy">trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (160564 => 160565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2013-12-13 21:52:33 UTC (rev 160564)
+++ trunk/Source/JavaScriptCore/ChangeLog 2013-12-13 21:57:35 UTC (rev 160565)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Cleanup CodeGeneratorInspectorStrings a bit
+ https://bugs.webkit.org/show_bug.cgi?id=125705
+
+ Reviewed by Timothy Hatcher.
+
+ * inspector/scripts/CodeGeneratorInspectorStrings.py:
+ Use ${foo} variable syntax and add an ASCIILiteral.
+
</ins><span class="cx"> 2013-12-13 Brent Fulgham <bfulgham@apple.com>
</span><span class="cx">
</span><span class="cx"> [Win] Unreviewed build fix after r160563
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptsCodeGeneratorInspectorStringspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py (160564 => 160565)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py 2013-12-13 21:52:33 UTC (rev 160564)
+++ trunk/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py 2013-12-13 21:57:35 UTC (rev 160565)
</span><span class="lines">@@ -102,11 +102,11 @@
</span><span class="cx"> }
</span><span class="cx"> """)
</span><span class="cx">
</span><del>-frontend_method = ("""void Inspector${domainName}FrontendDispatcher::$eventName(${parameters})
</del><ins>+frontend_method = ("""void Inspector${domainName}FrontendDispatcher::${eventName}(${parameters})
</ins><span class="cx"> {
</span><span class="cx"> RefPtr<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("${domainName}.${eventName}"));
</span><del>-$code
</del><ins>+${code}
</ins><span class="cx"> m_inspectorFrontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</span><span class="cx"> }
</span><span class="cx"> """)
</span><span class="lines">@@ -135,7 +135,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INSPECTOR)
</span><span class="cx">
</span><del>-$domainClassList
</del><ins>+${domainClassList}
</ins><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="cx">
</span><span class="lines">@@ -157,9 +157,9 @@
</span><span class="cx">
</span><span class="cx"> typedef String ErrorString;
</span><span class="cx">
</span><del>-$handlerInterfaces
</del><ins>+${handlerInterfaces}
</ins><span class="cx">
</span><del>-$dispatcherInterfaces
</del><ins>+${dispatcherInterfaces}
</ins><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(Inspector${outputFileNamePrefix}BackendDispatchers_h)
</span><span class="lines">@@ -179,7 +179,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-$methods
</del><ins>+${methods}
</ins><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(INSPECTOR)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><del>-$methods
</del><ins>+${methods}
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="lines">@@ -251,7 +251,7 @@
</span><span class="cx"> namespace TypeBuilder {
</span><span class="cx">
</span><span class="cx"> const char* const enum_constant_values[] = {
</span><del>-$enumConstantValues};
</del><ins>+${enumConstantValues}};
</ins><span class="cx">
</span><span class="cx"> String getEnumConstantValue(int code) {
</span><span class="cx"> return enum_constant_values[code];
</span><span class="lines">@@ -259,13 +259,13 @@
</span><span class="cx">
</span><span class="cx"> } // namespace TypeBuilder
</span><span class="cx">
</span><del>-$implCode
</del><ins>+${implCode}
</ins><span class="cx">
</span><del>-#if $validatorIfdefName
</del><ins>+#if ${validatorIfdefName}
</ins><span class="cx">
</span><del>-$validatorCode
</del><ins>+${validatorCode}
</ins><span class="cx">
</span><del>-#endif // $validatorIfdefName
</del><ins>+#endif // ${validatorIfdefName}
</ins><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="lines">@@ -275,7 +275,7 @@
</span><span class="cx"> backend_js = (
</span><span class="cx"> """
</span><span class="cx">
</span><del>-$domainInitializers
</del><ins>+${domainInitializers}
</ins><span class="cx"> """)
</span><span class="cx">
</span><span class="cx"> param_container_access_code = """
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> Builder<STATE | %s>& set%s(%s value)
</span><span class="cx"> {
</span><span class="cx"> COMPILE_ASSERT(!(STATE & %s), property_%s_already_set);
</span><del>- m_result->set%s("%s", %s);
</del><ins>+ m_result->set%s(ASCIILiteral("%s"), %s);
</ins><span class="cx"> return castState<%s>();
</span><span class="cx"> }
</span><span class="cx"> """)
</span></span></pre>
</div>
</div>
</body>
</html>