<!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>[196881] 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/196881">196881</a></dd>
<dt>Author</dt> <dd>bburg@apple.com</dd>
<dt>Date</dt> <dd>2016-02-21 16:08:37 -0800 (Sun, 21 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: it should be possible to omit generated code guarded by INSPECTOR_ALTERNATE_DISPATCHERS
https://bugs.webkit.org/show_bug.cgi?id=154508
<rdar://problem/24759077>
Reviewed by Timothy Hatcher.
In preparation for being able to generate protocol files for WebKit2,
make it possible to not emit generated code that's guarded by
ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS). This code is not needed by
backend dispatchers generated outside of JavaScriptCore. We can't just
define it to 0 for WebKit2, since it's defined to 1 in <wtf/Platform.h>
in the configurations where the code is actually used.
Add a new opt-in Framework configuration option that turns on generating
this code. Adjust how the code is generated so that it can be easily excluded.
* inspector/scripts/codegen/cpp_generator_templates.py:
Make a separate template for the declarations that are guarded.
Add an initializer expression so the order of initalizers doesn't matter.
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
(CppBackendDispatcherHeaderGenerator.generate_output): Add a setting check.
(CppBackendDispatcherHeaderGenerator._generate_dispatcher_declarations_for_domain):
If the declarations are needed, they will be appended to the end of the
declarations list.
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
(CppBackendDispatcherImplementationGenerator.generate_output): Add a setting check.
(CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command): Add a setting check.
* inspector/scripts/codegen/models.py: Set the 'alternate_dispatchers' setting
to True for Framework.JavaScriptCore only. It's not needed elsewhere.
Rebaseline affected tests.
* 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/generate-domains-with-feature-guards.json-result:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</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_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="#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="#trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult">trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/ChangeLog 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -1,5 +1,48 @@
</span><span class="cx"> 2016-02-21 Brian Burg <bburg@apple.com>
</span><span class="cx">
</span><ins>+ Web Inspector: it should be possible to omit generated code guarded by INSPECTOR_ALTERNATE_DISPATCHERS
+ https://bugs.webkit.org/show_bug.cgi?id=154508
+ <rdar://problem/24759077>
+
+ Reviewed by Timothy Hatcher.
+
+ In preparation for being able to generate protocol files for WebKit2,
+ make it possible to not emit generated code that's guarded by
+ ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS). This code is not needed by
+ backend dispatchers generated outside of JavaScriptCore. We can't just
+ define it to 0 for WebKit2, since it's defined to 1 in <wtf/Platform.h>
+ in the configurations where the code is actually used.
+
+ Add a new opt-in Framework configuration option that turns on generating
+ this code. Adjust how the code is generated so that it can be easily excluded.
+
+ * inspector/scripts/codegen/cpp_generator_templates.py:
+ Make a separate template for the declarations that are guarded.
+ Add an initializer expression so the order of initalizers doesn't matter.
+
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
+ (CppBackendDispatcherHeaderGenerator.generate_output): Add a setting check.
+ (CppBackendDispatcherHeaderGenerator._generate_dispatcher_declarations_for_domain):
+ If the declarations are needed, they will be appended to the end of the
+ declarations list.
+
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ (CppBackendDispatcherImplementationGenerator.generate_output): Add a setting check.
+ (CppBackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command): Add a setting check.
+
+ * inspector/scripts/codegen/models.py: Set the 'alternate_dispatchers' setting
+ to True for Framework.JavaScriptCore only. It's not needed elsewhere.
+
+ Rebaseline affected tests.
+
+ * 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/generate-domains-with-feature-guards.json-result:
+
+2016-02-21 Brian Burg <bburg@apple.com>
+
</ins><span class="cx"> Web Inspector: clean up generator selection in generate-inspector-protocol-bindings.py
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=154505
</span><span class="cx"> <rdar://problem/24758042>
</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 (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -105,14 +105,16 @@
</span><span class="cx"> ${commandDeclarations}
</span><span class="cx"> private:
</span><span class="cx"> ${domainName}BackendDispatcher(BackendDispatcher&, ${domainName}BackendDispatcherHandler*);
</span><del>- ${domainName}BackendDispatcherHandler* m_agent;
-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</del><ins>+ ${domainName}BackendDispatcherHandler* m_agent { nullptr };
+};""")
+
+ BackendDispatcherHeaderDomainDispatcherAlternatesDeclaration = (
+ """#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</ins><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(Alternate${domainName}BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- Alternate${domainName}BackendDispatcher* m_alternateDispatcher;
-#endif
-};""")
</del><ins>+ Alternate${domainName}BackendDispatcher* m_alternateDispatcher { nullptr };
+#endif""")
</ins><span class="cx">
</span><span class="cx"> BackendDispatcherHeaderAsyncCommandDeclaration = (
</span><span class="cx"> """ ${classAndExportMacro} ${callbackName} : public BackendDispatcher::CallbackBase {
</span><span class="lines">@@ -176,9 +178,6 @@
</span><span class="cx"> ${domainName}BackendDispatcher::${domainName}BackendDispatcher(BackendDispatcher& backendDispatcher, ${domainName}BackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("${domainName}"), this);
</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 (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -67,7 +67,8 @@
</span><span class="cx"> sections = []
</span><span class="cx"> sections.append(self.generate_license())
</span><span class="cx"> sections.append(Template(CppTemplates.HeaderPrelude).substitute(None, **header_args))
</span><del>- sections.append(self._generate_alternate_handler_forward_declarations_for_domains(domains))
</del><ins>+ if self.model().framework.setting('alternate_dispatchers', False):
+ sections.append(self._generate_alternate_handler_forward_declarations_for_domains(domains))
</ins><span class="cx"> sections.extend(map(self._generate_handler_declarations_for_domain, domains))
</span><span class="cx"> sections.extend(map(self._generate_dispatcher_declarations_for_domain, domains))
</span><span class="cx"> sections.append(Template(CppTemplates.HeaderPostlude).substitute(None, **header_args))
</span><span class="lines">@@ -196,6 +197,14 @@
</span><span class="cx"> declarations.append('private:')
</span><span class="cx"> declarations.extend(map(self._generate_dispatcher_declaration_for_command, domain.commands))
</span><span class="cx">
</span><ins>+ declaration_args = {
+ 'domainName': domain.domain_name,
+ }
+
+ # Add in a few more declarations at the end if needed.
+ if self.model().framework.setting('alternate_dispatchers', False):
+ declarations.append(Template(CppTemplates.BackendDispatcherHeaderDomainDispatcherAlternatesDeclaration).substitute(None, **declaration_args))
+
</ins><span class="cx"> handler_args = {
</span><span class="cx"> 'classAndExportMacro': " ".join(classComponents),
</span><span class="cx"> 'domainName': domain.domain_name,
</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 (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -55,11 +55,13 @@
</span><span class="cx"> '<wtf/text/CString.h>']
</span><span class="cx">
</span><span class="cx"> secondary_includes = ['#include %s' % header for header in secondary_headers]
</span><del>- secondary_includes.append('')
- secondary_includes.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
- secondary_includes.append('#include "InspectorAlternateBackendDispatchers.h"')
- secondary_includes.append('#endif')
</del><span class="cx">
</span><ins>+ if self.model().framework.setting('alternate_dispatchers', False):
+ secondary_includes.append('')
+ secondary_includes.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
+ secondary_includes.append('#include "InspectorAlternateBackendDispatchers.h"')
+ secondary_includes.append('#endif')
+
</ins><span class="cx"> header_args = {
</span><span class="cx"> 'primaryInclude': '"InspectorBackendDispatchers.h"',
</span><span class="cx"> 'secondaryIncludes': '\n'.join(secondary_includes),
</span><span class="lines">@@ -276,13 +278,14 @@
</span><span class="cx"> if len(command.call_parameters) > 0:
</span><span class="cx"> lines.append(Template(CppTemplates.BackendDispatcherImplementationPrepareCommandArguments).substitute(None, **command_args))
</span><span class="cx">
</span><del>- lines.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
- lines.append(' if (m_alternateDispatcher) {')
- lines.append(' m_alternateDispatcher->%(commandName)s(%(alternateInvocationParameters)s);' % command_args)
- lines.append(' return;')
- lines.append(' }')
- lines.append('#endif')
- lines.append('')
</del><ins>+ if self.model().framework.setting('alternate_dispatchers', False):
+ lines.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
+ lines.append(' if (m_alternateDispatcher) {')
+ lines.append(' m_alternateDispatcher->%(commandName)s(%(alternateInvocationParameters)s);' % command_args)
+ lines.append(' return;')
+ lines.append(' }')
+ lines.append('#endif')
+ lines.append('')
</ins><span class="cx">
</span><span class="cx"> lines.append(' ErrorString error;')
</span><span class="cx"> lines.append(' Ref<InspectorObject> result = InspectorObject::create();')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegenmodelspy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/models.py 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -42,12 +42,14 @@
</span><span class="cx"> "Global": {
</span><span class="cx"> },
</span><span class="cx"> "JavaScriptCore": {
</span><del>- "export_macro": "JS_EXPORT_PRIVATE"
</del><ins>+ "export_macro": "JS_EXPORT_PRIVATE",
+ "alternate_dispatchers": True,
</ins><span class="cx"> },
</span><span class="cx"> "WebInspector": {
</span><span class="cx"> },
</span><span class="cx"> # Used for code generator tests.
</span><span class="cx"> "Test": {
</span><ins>+ "alternate_dispatchers": True,
</ins><span class="cx"> }
</span><span class="cx"> }
</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 (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -194,15 +194,15 @@
</span><span class="cx"> void executeSQLAsyncOptionalReturnValues(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="cx"> void executeSQLSync(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="cx"> void executeSQLAsync(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
- DatabaseBackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateDatabaseBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateDatabaseBackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
+ DatabaseBackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -265,9 +265,6 @@
</span><span class="cx"> DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedcommandswithoptionalcallreturnparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -175,15 +175,15 @@
</span><span class="cx"> private:
</span><span class="cx"> void executeAllOptionalParameters(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="cx"> void executeNoOptionalParameters(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
- DatabaseBackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateDatabaseBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateDatabaseBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateDatabaseBackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ DatabaseBackendDispatcher(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
+ DatabaseBackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -246,9 +246,6 @@
</span><span class="cx"> DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Database"), this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpecteddomainswithvaryingcommandsizesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -192,15 +192,15 @@
</span><span class="cx"> virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
</span><span class="cx"> private:
</span><span class="cx"> void loadResource1(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
- Network1BackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateNetwork1BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork1BackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
+ Network1BackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> class Network3BackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="lines">@@ -215,15 +215,15 @@
</span><span class="cx"> void loadResource5(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="cx"> void loadResource6(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="cx"> void loadResource7(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- Network3BackendDispatcher(BackendDispatcher&, Network3BackendDispatcherHandler*);
- Network3BackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateNetwork3BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateNetwork3BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork3BackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ Network3BackendDispatcher(BackendDispatcher&, Network3BackendDispatcherHandler*);
+ Network3BackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -287,9 +287,6 @@
</span><span class="cx"> Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span><span class="lines">@@ -334,9 +331,6 @@
</span><span class="cx"> Network3BackendDispatcher::Network3BackendDispatcher(BackendDispatcher& backendDispatcher, Network3BackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network3"), this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -173,15 +173,15 @@
</span><span class="cx"> virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
</span><span class="cx"> private:
</span><span class="cx"> void commandWithEnumReturnValue(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- CommandDomainBackendDispatcher(BackendDispatcher&, CommandDomainBackendDispatcherHandler*);
- CommandDomainBackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateCommandDomainBackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateCommandDomainBackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateCommandDomainBackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ CommandDomainBackendDispatcher(BackendDispatcher&, CommandDomainBackendDispatcherHandler*);
+ CommandDomainBackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -244,9 +244,6 @@
</span><span class="cx"> CommandDomainBackendDispatcher::CommandDomainBackendDispatcher(BackendDispatcher& backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("CommandDomain"), this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedgeneratedomainswithfeatureguardsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result (196880 => 196881)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-22 00:05:07 UTC (rev 196880)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2016-02-22 00:08:37 UTC (rev 196881)
</span><span class="lines">@@ -169,15 +169,15 @@
</span><span class="cx"> virtual void dispatch(long requestId, const String& method, Ref<InspectorObject>&& message) override;
</span><span class="cx"> private:
</span><span class="cx"> void loadResource(long requestId, RefPtr<InspectorObject>&& parameters);
</span><del>-private:
- Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
- Network1BackendDispatcherHandler* m_agent;
</del><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx"> public:
</span><span class="cx"> void setAlternateDispatcher(AlternateNetwork1BackendDispatcher* alternateDispatcher) { m_alternateDispatcher = alternateDispatcher; }
</span><span class="cx"> private:
</span><del>- AlternateNetwork1BackendDispatcher* m_alternateDispatcher;
</del><ins>+ AlternateNetwork1BackendDispatcher* m_alternateDispatcher { nullptr };
</ins><span class="cx"> #endif
</span><ins>+private:
+ Network1BackendDispatcher(BackendDispatcher&, Network1BackendDispatcherHandler*);
+ Network1BackendDispatcherHandler* m_agent { nullptr };
</ins><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="lines">@@ -244,9 +244,6 @@
</span><span class="cx"> Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</span><span class="cx"> : SupplementalBackendDispatcher(backendDispatcher)
</span><span class="cx"> , m_agent(agent)
</span><del>-#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
- , m_alternateDispatcher(nullptr)
-#endif
</del><span class="cx"> {
</span><span class="cx"> m_backendDispatcher->registerDispatcherForDomain(ASCIILiteral("Network1"), this);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>