<!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>[198678] trunk/Source</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/198678">198678</a></dd>

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

<dt>Date</dt> <dd>2016-03-25 11:18:50 -0700 (Fri, 25 Mar 2016)</dd>

</dl>

<h3>Log Message</h3>

<pre>Web Inspector: protocol generator should prefix C++ filenames with the protocol group

https://bugs.webkit.org/show_bug.cgi?id=155859

&lt;rdar://problem/25349859&gt;

Reviewed by Alex Christensen and Joseph Pecoraro.

Source/JavaScriptCore:

Like for generated Objective-C files, we should use the 'protocol group' name

as the prefix for generated C++ files so that headers from different protocol

groups have unambiguous names.

* inspector/scripts/codegen/cpp_generator.py:

(CppGenerator):

(CppGenerator.__init__):

(CppGenerator.protocol_name):

Make all C++ code generators extend the CppGenerator python class and use the

protocol_name() instance method. This matches a recent change to the ObjC generator.

* inspector/scripts/codegen/cpp_generator_templates.py:

(CppGeneratorTemplates):

Drive-by cleanup to use #pragma once instead of header guards.

* inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py:

(CppAlternateBackendDispatcherHeaderGenerator):

(CppAlternateBackendDispatcherHeaderGenerator.__init__):

(CppAlternateBackendDispatcherHeaderGenerator.output_filename):

(CppAlternateBackendDispatcherHeaderGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:

(CppBackendDispatcherHeaderGenerator):

(CppBackendDispatcherHeaderGenerator.__init__):

(CppBackendDispatcherHeaderGenerator.output_filename):

(CppBackendDispatcherHeaderGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:

(CppBackendDispatcherImplementationGenerator):

(CppBackendDispatcherImplementationGenerator.__init__):

(CppBackendDispatcherImplementationGenerator.output_filename):

(CppBackendDispatcherImplementationGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:

(CppFrontendDispatcherHeaderGenerator):

(CppFrontendDispatcherHeaderGenerator.__init__):

(CppFrontendDispatcherHeaderGenerator.output_filename):

(CppFrontendDispatcherHeaderGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:

(CppFrontendDispatcherImplementationGenerator):

(CppFrontendDispatcherImplementationGenerator.__init__):

(CppFrontendDispatcherImplementationGenerator.output_filename):

(CppFrontendDispatcherImplementationGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_protocol_types_header.py:

(CppProtocolTypesHeaderGenerator):

(CppProtocolTypesHeaderGenerator.__init__):

(CppProtocolTypesHeaderGenerator.output_filename):

(CppProtocolTypesHeaderGenerator.generate_output):

* inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:

(CppProtocolTypesImplementationGenerator):

(CppProtocolTypesImplementationGenerator.__init__):

(CppProtocolTypesImplementationGenerator.output_filename):

(CppProtocolTypesImplementationGenerator.generate_output):

Use the protocol_name() instance method to compute generated protocol file names.

* inspector/scripts/codegen/models.py:

Explicitly set the 'protocol_group' for the Inspector protocol.

Rebaseline generator test results.

* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:

* inspector/scripts/tests/expected/enum-values.json-result:

* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:

* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:

* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:

* inspector/scripts/tests/expected/type-declaration-array-type.json-result:

* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:

* inspector/scripts/tests/expected/type-declaration-object-type.json-result:

* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:

Source/WebKit2:

Adjust header include and build system paths.

* CMakeLists.txt:

Revert the workaround introduced in <a href="http://trac.webkit.org/projects/webkit/changeset/198659">r198659</a> since this change fixes the

underlying issue.

* DerivedSources.make:

* UIProcess/Automation/WebAutomationSession.cpp:

* UIProcess/Automation/WebAutomationSession.h:

* WebKit2.xcodeproj/project.pbxproj:</pre>

<h3>Modified Paths</h3>

<ul>

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

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

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

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

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

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

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

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

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

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

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

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result</a></li>

<li><a href="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result</a></li>

<li><a href="#trunkSourceWebKit2CMakeListstxt">trunk/Source/WebKit2/CMakeLists.txt</a></li>

<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>

<li><a href="#trunkSourceWebKit2DerivedSourcesmake">trunk/Source/WebKit2/DerivedSources.make</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessioncpp">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp</a></li>

<li><a href="#trunkSourceWebKit2UIProcessAutomationWebAutomationSessionh">trunk/Source/WebKit2/UIProcess/Automation/WebAutomationSession.h</a></li>

<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>

</ul>

</div>

<div id="patch">

<h3>Diff</h3>

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

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

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/ChangeLog        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><ins>+2016-03-25  Brian Burg  &lt;bburg@apple.com&gt;

+

+        Web Inspector: protocol generator should prefix C++ filenames with the protocol group

+        https://bugs.webkit.org/show_bug.cgi?id=155859

+        &lt;rdar://problem/25349859&gt;

+

+        Reviewed by Alex Christensen and Joseph Pecoraro.

+

+        Like for generated Objective-C files, we should use the 'protocol group' name

+        as the prefix for generated C++ files so that headers from different protocol

+        groups have unambiguous names.

+

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

+        (CppGenerator):

+        (CppGenerator.__init__):

+        (CppGenerator.protocol_name):

+        Make all C++ code generators extend the CppGenerator python class and use the

+        protocol_name() instance method. This matches a recent change to the ObjC generator.

+

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

+        (CppGeneratorTemplates):

+        Drive-by cleanup to use #pragma once instead of header guards.

+

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

+        (CppAlternateBackendDispatcherHeaderGenerator):

+        (CppAlternateBackendDispatcherHeaderGenerator.__init__):

+        (CppAlternateBackendDispatcherHeaderGenerator.output_filename):

+        (CppAlternateBackendDispatcherHeaderGenerator.generate_output):

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

+        (CppBackendDispatcherHeaderGenerator):

+        (CppBackendDispatcherHeaderGenerator.__init__):

+        (CppBackendDispatcherHeaderGenerator.output_filename):

+        (CppBackendDispatcherHeaderGenerator.generate_output):

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

+        (CppBackendDispatcherImplementationGenerator):

+        (CppBackendDispatcherImplementationGenerator.__init__):

+        (CppBackendDispatcherImplementationGenerator.output_filename):

+        (CppBackendDispatcherImplementationGenerator.generate_output):

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

+        (CppFrontendDispatcherHeaderGenerator):

+        (CppFrontendDispatcherHeaderGenerator.__init__):

+        (CppFrontendDispatcherHeaderGenerator.output_filename):

+        (CppFrontendDispatcherHeaderGenerator.generate_output):

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

+        (CppFrontendDispatcherImplementationGenerator):

+        (CppFrontendDispatcherImplementationGenerator.__init__):

+        (CppFrontendDispatcherImplementationGenerator.output_filename):

+        (CppFrontendDispatcherImplementationGenerator.generate_output):

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

+        (CppProtocolTypesHeaderGenerator):

+        (CppProtocolTypesHeaderGenerator.__init__):

+        (CppProtocolTypesHeaderGenerator.output_filename):

+        (CppProtocolTypesHeaderGenerator.generate_output):

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

+        (CppProtocolTypesImplementationGenerator):

+        (CppProtocolTypesImplementationGenerator.__init__):

+        (CppProtocolTypesImplementationGenerator.output_filename):

+        (CppProtocolTypesImplementationGenerator.generate_output):

+        Use the protocol_name() instance method to compute generated protocol file names.

+

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

+        Explicitly set the 'protocol_group' for the Inspector protocol.

+

+        Rebaseline generator test results.

+

+        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:

+        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:

+        * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:

+        * inspector/scripts/tests/expected/enum-values.json-result:

+        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:

+        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:

+        * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:

+        * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:

+        * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-array-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:

+        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:

+        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:

+

</ins><span class="cx"> 2016-03-25  Keith Miller  &lt;keith_miller@apple.com&gt;

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

</span><span class="cx">         putByIndexBeyondVectorLengthWithoutAttributes should not crash if it can't ensureLength

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generatorpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

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

</span><span class="cx"> import os.path

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

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

</span><del>-from generator import ucfirst

</del><ins>+from generator import ucfirst, Generator

</ins><span class="cx"> from models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks

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

</span><span class="cx"> log = logging.getLogger('global')

</span><span class="lines">@@ -43,11 +43,13 @@

</span><span class="cx">     'any': 'Inspector::InspectorValue'

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

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

</span><del>-# This class contains extra static methods used for generation, but does

-# not participate in any inheritance hierarchy. File generators should

-# extend the generic &quot;Generator&quot; class instead.

-class CppGenerator:

</del><ins>+class CppGenerator(Generator):

+    def __init__(self, model, input_filepath):

+        Generator.__init__(self, model, input_filepath)

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

</span><ins>+    def protocol_name(self):

+        return self.model().framework.setting('protocol_group', '')

+

</ins><span class="cx">     # Miscellaneous text manipulation routines.

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

</span><span class="cx">     def cpp_getter_method_for_type(_type):

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegencpp_generator_templatespy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py        2016-03-25 18:18:50 UTC (rev 198678)

</span><span class="lines">@@ -30,8 +30,7 @@

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

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

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

</span><del>-    &quot;&quot;&quot;#ifndef ${headerGuardString}

-#define ${headerGuardString}

</del><ins>+    &quot;&quot;&quot;#pragma once

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

</span><span class="cx"> ${includes}

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

</span><span class="lines">@@ -40,10 +39,8 @@

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

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

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

</span><del>-    &quot;&quot;&quot;} // namespace Inspector

</del><ins>+    &quot;&quot;&quot;} // namespace Inspector&quot;&quot;&quot;)

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

</span><del>-#endif // !defined(${headerGuardString})&quot;&quot;&quot;)

-

</del><span class="cx">     ImplementationPrelude = (

</span><span class="cx">     &quot;&quot;&quot;#include &quot;config.h&quot;

</span><span class="cx"> #include ${primaryInclude}

</span><span class="lines">@@ -57,8 +54,7 @@

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

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

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

</span><del>-    &quot;&quot;&quot;#ifndef ${headerGuardString}

-#define ${headerGuardString}

</del><ins>+    &quot;&quot;&quot;#pragma once

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

</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)

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

</span><span class="lines">@@ -78,10 +74,8 @@

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

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

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

</span><del>-#endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)

</del><ins>+#endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)&quot;&quot;&quot;)

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

</span><del>-#endif // !defined(${headerGuardString})&quot;&quot;&quot;)

-

</del><span class="cx">     AlternateBackendDispatcherHeaderDomainHandlerInterfaceDeclaration = (

</span><span class="cx">     &quot;&quot;&quot;class Alternate${domainName}BackendDispatcher : public AlternateBackendDispatcher {

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_alternate_backend_dispatcher_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -32,27 +32,25 @@

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

</span><span class="cx"> from cpp_generator import CppGenerator

</span><span class="cx"> from cpp_generator_templates import CppGeneratorTemplates as CppTemplates

</span><del>-from generator import Generator

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

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppAlternateBackendDispatcherHeaderGenerator(Generator):

</del><ins>+class CppAlternateBackendDispatcherHeaderGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return 'InspectorAlternateBackendDispatchers.h'

</del><ins>+        return '%sAlternateBackendDispatchers.h' % self.protocol_name()

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

</span><span class="cx">     def generate_output(self):

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

</span><del>-            '&quot;InspectorProtocolTypes.h&quot;',

</del><ins>+            '&quot;%sProtocolTypes.h&quot;' % self.protocol_name(),

</ins><span class="cx">             '&lt;inspector/InspectorFrontendRouter.h&gt;',

</span><span class="cx">             '&lt;JavaScriptCore/InspectorBackendDispatcher.h&gt;',

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

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

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

</span><del>-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),

</del><span class="cx">             'includes': '\n'.join(['#include ' + header for header in headers]),

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -38,26 +38,25 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppBackendDispatcherHeaderGenerator(Generator):

</del><ins>+class CppBackendDispatcherHeaderGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorBackendDispatchers.h&quot;

</del><ins>+        return &quot;%sBackendDispatchers.h&quot; % self.protocol_name()

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

</span><span class="cx">     def domains_to_generate(self):

</span><span class="cx">         return filter(lambda domain: len(domain.commands) &gt; 0, Generator.domains_to_generate(self))

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

</span><span class="cx">     def generate_output(self):

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

</span><del>-            '&quot;InspectorProtocolObjects.h&quot;',

</del><ins>+            '&quot;%sProtocolObjects.h&quot;' % self.protocol_name(),

</ins><span class="cx">             '&lt;inspector/InspectorBackendDispatcher.h&gt;',

</span><span class="cx">             '&lt;wtf/text/WTFString.h&gt;']

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

</span><span class="cx">         typedefs = [('String', 'ErrorString')]

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

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

</span><del>-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),

</del><span class="cx">             'includes': '\n'.join(['#include ' + header for header in headers]),

</span><span class="cx">             'typedefs': '\n'.join(['typedef %s %s;' % typedef for typedef in typedefs]),

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_backend_dispatcher_implementationpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -37,12 +37,12 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppBackendDispatcherImplementationGenerator(Generator):

</del><ins>+class CppBackendDispatcherImplementationGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorBackendDispatchers.cpp&quot;

</del><ins>+        return &quot;%sBackendDispatchers.cpp&quot; % self.protocol_name()

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

</span><span class="cx">     def domains_to_generate(self):

</span><span class="cx">         return filter(lambda domain: len(domain.commands) &gt; 0, Generator.domains_to_generate(self))

</span><span class="lines">@@ -59,11 +59,11 @@

</span><span class="cx">         if self.model().framework.setting('alternate_dispatchers', False):

</span><span class="cx">             secondary_includes.append('')

</span><span class="cx">             secondary_includes.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')

</span><del>-            secondary_includes.append('#include &quot;InspectorAlternateBackendDispatchers.h&quot;')

</del><ins>+            secondary_includes.append('#include &quot;%sAlternateBackendDispatchers.h&quot;' % self.protocol_name())

</ins><span class="cx">             secondary_includes.append('#endif')

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

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

</span><del>-            'primaryInclude': '&quot;InspectorBackendDispatchers.h&quot;',

</del><ins>+            'primaryInclude': '&quot;%sBackendDispatchers.h&quot;' % self.protocol_name(),

</ins><span class="cx">             'secondaryIncludes': '\n'.join(secondary_includes),

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -38,24 +38,23 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppFrontendDispatcherHeaderGenerator(Generator):

</del><ins>+class CppFrontendDispatcherHeaderGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorFrontendDispatchers.h&quot;

</del><ins>+        return &quot;%sFrontendDispatchers.h&quot; % self.protocol_name()

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

</span><span class="cx">     def domains_to_generate(self):

</span><span class="cx">         return filter(lambda domain: len(domain.events) &gt; 0, Generator.domains_to_generate(self))

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

</span><span class="cx">     def generate_output(self):

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

</span><del>-            '&quot;InspectorProtocolObjects.h&quot;',

</del><ins>+            '&quot;%sProtocolObjects.h&quot;' % self.protocol_name(),

</ins><span class="cx">             '&lt;inspector/InspectorValues.h&gt;',

</span><span class="cx">             '&lt;wtf/text/WTFString.h&gt;']

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

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

</span><del>-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),

</del><span class="cx">             'includes': '\n'.join(['#include ' + header for header in headers]),

</span><span class="cx">             'typedefs': 'class FrontendRouter;',

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_frontend_dispatcher_implementationpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -37,12 +37,12 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppFrontendDispatcherImplementationGenerator(Generator):

</del><ins>+class CppFrontendDispatcherImplementationGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorFrontendDispatchers.cpp&quot;

</del><ins>+        return &quot;%sFrontendDispatchers.cpp&quot; % self.protocol_name()

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

</span><span class="cx">     def domains_to_generate(self):

</span><span class="cx">         return filter(lambda domain: len(domain.events) &gt; 0, Generator.domains_to_generate(self))

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

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

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

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

</span><del>-            'primaryInclude': '&quot;InspectorFrontendDispatchers.h&quot;',

</del><ins>+            'primaryInclude': '&quot;%sFrontendDispatchers.h&quot;' % self.protocol_name(),

</ins><span class="cx">             'secondaryIncludes': &quot;\n&quot;.join(['#include %s' % header for header in secondary_headers]),

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_headerpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -38,12 +38,12 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppProtocolTypesHeaderGenerator(Generator):

</del><ins>+class CppProtocolTypesHeaderGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorProtocolObjects.h&quot;

</del><ins>+        return &quot;%sProtocolObjects.h&quot; % self.protocol_name()

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

</span><span class="cx">     def generate_output(self):

</span><span class="cx">         domains = self.domains_to_generate()

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

</span><span class="cx">         export_macro = self.model().framework.setting('export_macro', None)

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

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

</span><del>-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),

</del><span class="cx">             'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),

</span><span class="cx">             'typedefs': '',

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_cpp_protocol_types_implementationpy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> #!/usr/bin/env python

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

</span><del>-# Copyright (c) 2014 Apple Inc. All rights reserved.

</del><ins>+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.

</ins><span class="cx"> # Copyright (c) 2014 University of Washington. All rights reserved.

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

</span><span class="cx"> # Redistribution and use in source and binary forms, with or without

</span><span class="lines">@@ -37,12 +37,12 @@

</span><span class="cx"> log = logging.getLogger('global')

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

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

</span><del>-class CppProtocolTypesImplementationGenerator(Generator):

</del><ins>+class CppProtocolTypesImplementationGenerator(CppGenerator):

</ins><span class="cx">     def __init__(self, model, input_filepath):

</span><del>-        Generator.__init__(self, model, input_filepath)

</del><ins>+        CppGenerator.__init__(self, model, input_filepath)

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

</span><span class="cx">     def output_filename(self):

</span><del>-        return &quot;InspectorProtocolObjects.cpp&quot;

</del><ins>+        return &quot;%sProtocolObjects.cpp&quot; % self.protocol_name()

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

</span><span class="cx">     def generate_output(self):

</span><span class="cx">         domains = self.domains_to_generate()

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

</span><span class="cx">         secondary_headers = ['&lt;wtf/text/CString.h&gt;']

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

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

</span><del>-            'primaryInclude': '&quot;InspectorProtocolObjects.h&quot;',

</del><ins>+            'primaryInclude': '&quot;%sProtocolObjects.h&quot;' % self.protocol_name(),

</ins><span class="cx">             'secondaryIncludes': &quot;\n&quot;.join(['#include %s' % header for header in secondary_headers]),

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

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx">     &quot;Global&quot;: {

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

</span><span class="cx">     &quot;JavaScriptCore&quot;: {

</span><ins>+        &quot;protocol_group&quot;: &quot;Inspector&quot;,

</ins><span class="cx">         &quot;export_macro&quot;: &quot;JS_EXPORT_PRIVATE&quot;,

</span><span class="cx">         &quot;alternate_dispatchers&quot;: True,

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

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

<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithasyncattributejsonresult"></a>

<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result (198677 => 198678)</h4>

<pre class="diff"><span>

<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-25 18:14:14 UTC (rev 198677)

+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result        2016-03-25 18:18:50 UTC (rev 198678)

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

</span><span class="cx"> InspectorBackend.activateDomain(&quot;Database&quot;);

</span><span class="cx"> ### End File: InspectorBackendCommands.js

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

</span><del>-### Begin File: InspectorAlternateBackendDispatchers.h

</del><ins>+### Begin File: TestAlternateBackendDispatchers.h

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