<!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>[174904] 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/174904">174904</a></dd>

<dt>Author</dt> <dd>bfulgham@apple.com</dd>

<dt>Date</dt> <dd>2014-10-20 13:17:43 -0700 (Mon, 20 Oct 2014)</dd>

</dl>

<h3>Log Message</h3>

<pre>[Win] Build fix for generated inspector files.

Patch by Joseph Pecoraro &lt;pecoraro@apple.com&gt; on 2014-10-20

Rubberstamped by Brent Fulgham.

* inspector/scripts/codegen/generate_backend_dispatcher_header.py:

(BackendDispatcherHeaderGenerator._generate_async_handler_declaration_for_command):

* inspector/scripts/codegen/generator_templates.py:

(GeneratorTemplates):</pre>

<h3>Modified Paths</h3>

<ul>

<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

<a id="trunkSourceJavaScriptCoreChangeLog"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (174903 => 174904)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2014-10-20 19:55:13 UTC (rev 174903)

+++ trunk/Source/JavaScriptCore/ChangeLog        2014-10-20 20:17:43 UTC (rev 174904)

</span><span class="lines">@@ -1,3 +1,14 @@

</span><ins>+2014-10-20  Joseph Pecoraro  &lt;pecoraro@apple.com&gt;

+

+        [Win] Build fix for generated inspector files.

+

+        Rubberstamped by Brent Fulgham.

+

+        * inspector/scripts/codegen/generate_backend_dispatcher_header.py:

+        (BackendDispatcherHeaderGenerator._generate_async_handler_declaration_for_command):

+        * inspector/scripts/codegen/generator_templates.py:

+        (GeneratorTemplates):

+

</ins><span class="cx"> 2014-10-20  Brent Fulgham  &lt;bfulgham@apple.com&gt;

</span><span class="cx"> 

</span><span class="cx">         [Win] Unreviewed build fix.

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_backend_dispatcher_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py (174903 => 174904)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py        2014-10-20 19:55:13 UTC (rev 174903)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py        2014-10-20 20:17:43 UTC (rev 174904)

</span><span class="lines">@@ -148,7 +148,13 @@

</span><span class="cx">         for _parameter in command.return_parameters:

</span><span class="cx">             out_parameters.append(&quot;%s %s&quot; % (Generator.type_string_for_formal_async_parameter(_parameter), _parameter.parameter_name))

</span><span class="cx"> 

</span><ins>+        class_components = ['class']

+        export_macro = self.model().framework.setting('export_macro', None)

+        if export_macro:

+            class_components.append(export_macro)

+

</ins><span class="cx">         command_args = {

</span><ins>+            'classAndExportMacro': ' '.join(class_components),

</ins><span class="cx">             'callbackName': callbackName,

</span><span class="cx">             'commandName': command.command_name,

</span><span class="cx">             'inParameters': &quot;, &quot;.join(in_parameters),

</span></span></pre></div>

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerator_templatespy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py (174903 => 174904)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py        2014-10-20 19:55:13 UTC (rev 174903)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator_templates.py        2014-10-20 20:17:43 UTC (rev 174904)

</span><span class="lines">@@ -31,7 +31,6 @@

</span><span class="cx"> class GeneratorTemplates:

</span><span class="cx">     CopyrightBlock = (

</span><span class="cx">     &quot;&quot;&quot;/*

</del><span class="cx">  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.

</span><span class="cx">  * Copyright (C) 2014 University of Washington. All rights reserved.

</span><span class="cx">  *

</span><span class="lines">@@ -115,7 +114,7 @@

</span><span class="cx"> };&quot;&quot;&quot;)

</span><span class="cx"> 

</span><span class="cx">     BackendDispatcherHeaderAsyncCommandDeclaration = (

</span><del>-    &quot;&quot;&quot;    class ${callbackName} : public Inspector::InspectorBackendDispatcher::CallbackBase {

</del><ins>+    &quot;&quot;&quot;    ${classAndExportMacro} ${callbackName} : public Inspector::InspectorBackendDispatcher::CallbackBase {

</ins><span class="cx">     public:

</span><span class="cx">         ${callbackName}(PassRefPtr&lt;Inspector::InspectorBackendDispatcher&gt;, int id);

</span><span class="cx">         void sendSuccess(${outParameters});

</span></span></pre>

</div>

</div>

</body>

</html>