<!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>[190905] 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/190905">190905</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2015-10-12 16:37:51 -0700 (Mon, 12 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Web Inspector: Rebaseline Inspector generator tests and make better use of RWIProtocol constant
https://bugs.webkit.org/show_bug.cgi?id=150044
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2015-10-12
Reviewed by Brian Burg.
* inspector/scripts/codegen/generate_objc_configuration_header.py:
(ObjCConfigurationHeaderGenerator.generate_output):
(ObjCConfigurationHeaderGenerator._generate_configuration_interface_for_domains):
* inspector/scripts/codegen/generate_objc_configuration_implementation.py:
(ObjCBackendDispatcherImplementationGenerator._generate_configuration_implementation_for_domains):
* inspector/scripts/codegen/generate_objc_header.py:
(ObjCHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_objc_internal_header.py:
(ObjCInternalHeaderGenerator.generate_output):
* 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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceJavaScriptCoreChangeLog">trunk/Source/JavaScriptCore/ChangeLog</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_implementationpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py</a></li>
<li><a href="#trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy">trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceJavaScriptCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/ChangeLog (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/ChangeLog 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -1,3 +1,33 @@
</span><ins>+2015-10-12 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Rebaseline Inspector generator tests and make better use of RWIProtocol constant
+ https://bugs.webkit.org/show_bug.cgi?id=150044
+
+ Reviewed by Brian Burg.
+
+ * inspector/scripts/codegen/generate_objc_configuration_header.py:
+ (ObjCConfigurationHeaderGenerator.generate_output):
+ (ObjCConfigurationHeaderGenerator._generate_configuration_interface_for_domains):
+ * inspector/scripts/codegen/generate_objc_configuration_implementation.py:
+ (ObjCBackendDispatcherImplementationGenerator._generate_configuration_implementation_for_domains):
+ * inspector/scripts/codegen/generate_objc_header.py:
+ (ObjCHeaderGenerator.generate_output):
+ * inspector/scripts/codegen/generate_objc_internal_header.py:
+ (ObjCInternalHeaderGenerator.generate_output):
+ * 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"> 2015-10-12 Myles C. Maxfield <mmaxfield@apple.com>
</span><span class="cx">
</span><span class="cx"> Unreviewed build fix
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_header.py 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = [
</span><del>- '"%s.h"' % ObjCGenerator.OBJC_PREFIX,
</del><ins>+ '<WebInspector/%s.h>' % ObjCGenerator.OBJC_PREFIX,
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx"> header_args = {
</span><span class="lines">@@ -66,7 +66,7 @@
</span><span class="cx"> def _generate_configuration_interface_for_domains(self, domains):
</span><span class="cx"> lines = []
</span><span class="cx"> lines.append('__attribute__((visibility ("default")))')
</span><del>- lines.append('@interface RWIProtocolConfiguration : NSObject')
</del><ins>+ lines.append('@interface %sConfiguration : NSObject' % ObjCGenerator.OBJC_PREFIX)
</ins><span class="cx"> for domain in domains:
</span><span class="cx"> lines.extend(self._generate_properties_for_domain(domain))
</span><span class="cx"> lines.append('@end')
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_configuration_implementationpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_configuration_implementation.py 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -71,7 +71,7 @@
</span><span class="cx">
</span><span class="cx"> def _generate_configuration_implementation_for_domains(self, domains):
</span><span class="cx"> lines = []
</span><del>- lines.append('@implementation RWIProtocolConfiguration')
</del><ins>+ lines.append('@implementation %sConfiguration' % ObjCGenerator.OBJC_PREFIX)
</ins><span class="cx"> lines.append('{')
</span><span class="cx"> lines.append(' AugmentableInspectorController* _controller;')
</span><span class="cx"> lines.extend(self._generate_ivars(domains))
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_header.py 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -52,7 +52,7 @@
</span><span class="cx">
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span><del>- '<WebInspector/RWIProtocolJSONObject.h>',
</del><ins>+ '<WebInspector/%sJSONObject.h>' % ObjCGenerator.OBJC_PREFIX,
</ins><span class="cx"> ])
</span><span class="cx">
</span><span class="cx"> header_args = {
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptscodegengenerate_objc_internal_headerpy"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_internal_header.py 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> def generate_output(self):
</span><span class="cx"> headers = set([
</span><span class="cx"> '"%s.h"' % ObjCGenerator.OBJC_PREFIX,
</span><del>- '"RWIProtocolJSONObjectInternal.h"',
</del><ins>+ '"%sJSONObjectInternal.h"' % ObjCGenerator.OBJC_PREFIX,
</ins><span class="cx"> '<JavaScriptCore/InspectorValues.h>',
</span><span class="cx"> '<JavaScriptCore/AugmentableInspectorController.h>',
</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 (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -186,7 +187,7 @@
</span><span class="cx">
</span><span class="cx"> class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<DatabaseBackendDispatcher> create(BackendDispatcher*, DatabaseBackendDispatcherHandler*);
</del><ins>+ static Ref<DatabaseBackendDispatcher> create(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
</ins><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 executeSQLSyncOptionalReturnValues(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="lines">@@ -243,7 +244,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -256,9 +257,9 @@
</span><span class="cx">
</span><span class="cx"> DatabaseBackendDispatcherHandler::~DatabaseBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher* backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</del><ins>+Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new DatabaseBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</span><span class="lines">@@ -537,14 +538,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -584,6 +584,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -931,7 +932,7 @@
</span><span class="cx"> _databaseHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorDatabaseBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -976,7 +977,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -1022,7 +1023,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1407,7 +1407,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</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 (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -169,7 +170,7 @@
</span><span class="cx">
</span><span class="cx"> class DatabaseBackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<DatabaseBackendDispatcher> create(BackendDispatcher*, DatabaseBackendDispatcherHandler*);
</del><ins>+ static Ref<DatabaseBackendDispatcher> create(BackendDispatcher&, DatabaseBackendDispatcherHandler*);
</ins><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 executeAllOptionalParameters(long requestId, RefPtr<InspectorObject>&& parameters);
</span><span class="lines">@@ -224,7 +225,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -237,9 +238,9 @@
</span><span class="cx">
</span><span class="cx"> DatabaseBackendDispatcherHandler::~DatabaseBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher* backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</del><ins>+Ref<DatabaseBackendDispatcher> DatabaseBackendDispatcher::create(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new DatabaseBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new DatabaseBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> DatabaseBackendDispatcher::DatabaseBackendDispatcher(BackendDispatcher& backendDispatcher, DatabaseBackendDispatcherHandler* agent)
</span><span class="lines">@@ -438,14 +439,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -485,6 +485,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -830,7 +831,7 @@
</span><span class="cx"> _databaseHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorDatabaseBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<DatabaseBackendDispatcher, AlternateDatabaseBackendDispatcher>>(ASCIILiteral("Database"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -875,7 +876,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -921,7 +922,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1264,7 +1264,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</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 (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -187,7 +188,7 @@
</span><span class="cx">
</span><span class="cx"> class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<Network1BackendDispatcher> create(BackendDispatcher*, Network1BackendDispatcherHandler*);
</del><ins>+ static Ref<Network1BackendDispatcher> create(BackendDispatcher&, Network1BackendDispatcherHandler*);
</ins><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><span class="lines">@@ -204,7 +205,7 @@
</span><span class="cx">
</span><span class="cx"> class Network3BackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<Network3BackendDispatcher> create(BackendDispatcher*, Network3BackendDispatcherHandler*);
</del><ins>+ static Ref<Network3BackendDispatcher> create(BackendDispatcher&, Network3BackendDispatcherHandler*);
</ins><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><span class="lines">@@ -264,7 +265,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -278,9 +279,9 @@
</span><span class="cx"> Network1BackendDispatcherHandler::~Network1BackendDispatcherHandler() { }
</span><span class="cx"> Network3BackendDispatcherHandler::~Network3BackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network1BackendDispatcherHandler* agent)
</del><ins>+Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Network1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network1BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</span><span class="lines">@@ -325,9 +326,9 @@
</span><span class="cx"> m_backendDispatcher->reportProtocolError(BackendDispatcher::ServerError, WTF::move(error));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-Ref<Network3BackendDispatcher> Network3BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network3BackendDispatcherHandler* agent)
</del><ins>+Ref<Network3BackendDispatcher> Network3BackendDispatcher::create(BackendDispatcher& backendDispatcher, Network3BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Network3BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network3BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Network3BackendDispatcher::Network3BackendDispatcher(BackendDispatcher& backendDispatcher, Network3BackendDispatcherHandler* agent)
</span><span class="lines">@@ -549,14 +550,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -596,6 +596,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -871,7 +872,7 @@
</span><span class="cx"> _network1Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork1BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -889,7 +890,7 @@
</span><span class="cx"> _network3Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork3BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network3BackendDispatcher, AlternateNetwork3BackendDispatcher>>(ASCIILiteral("Network3"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network3BackendDispatcher, AlternateNetwork3BackendDispatcher>>(ASCIILiteral("Network3"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -934,7 +935,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -981,7 +982,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1189,7 +1189,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedenumvaluesjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -168,7 +169,7 @@
</span><span class="cx">
</span><span class="cx"> class CommandDomainBackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<CommandDomainBackendDispatcher> create(BackendDispatcher*, CommandDomainBackendDispatcherHandler*);
</del><ins>+ static Ref<CommandDomainBackendDispatcher> create(BackendDispatcher&, CommandDomainBackendDispatcherHandler*);
</ins><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><span class="lines">@@ -222,7 +223,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -235,9 +236,9 @@
</span><span class="cx">
</span><span class="cx"> CommandDomainBackendDispatcherHandler::~CommandDomainBackendDispatcherHandler() { }
</span><span class="cx">
</span><del>-Ref<CommandDomainBackendDispatcher> CommandDomainBackendDispatcher::create(BackendDispatcher* backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
</del><ins>+Ref<CommandDomainBackendDispatcher> CommandDomainBackendDispatcher::create(BackendDispatcher& backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new CommandDomainBackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new CommandDomainBackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> CommandDomainBackendDispatcher::CommandDomainBackendDispatcher(BackendDispatcher& backendDispatcher, CommandDomainBackendDispatcherHandler* agent)
</span><span class="lines">@@ -325,17 +326,16 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class EventDomainFrontendDispatcher {
</span><span class="cx"> public:
</span><del>- EventDomainFrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</del><ins>+ EventDomainFrontendDispatcher(FrontendRouter& frontendRouter) : m_frontendRouter(frontendRouter) { }
</ins><span class="cx"> // Named after parameter 'parameter' while generating command/event eventWithEnumParameter.
</span><span class="cx"> enum class Parameter {
</span><span class="cx"> Shared = 0,
</span><span class="lines">@@ -344,7 +344,7 @@
</span><span class="cx"> }; // enum class Parameter
</span><span class="cx"> void eventWithEnumParameter(Parameter parameter);
</span><span class="cx"> private:
</span><del>- FrontendChannel* m_frontendChannel;
</del><ins>+ FrontendRouter& m_frontendRouter;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -386,6 +386,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -398,7 +399,7 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("parameter"), Inspector::Protocol::getEnumConstantValue(parameter));
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendRouter.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -678,7 +679,7 @@
</span><span class="cx"> _commandDomainHandler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorCommandDomainBackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<CommandDomainBackendDispatcher, AlternateCommandDomainBackendDispatcher>>(ASCIILiteral("CommandDomain"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<CommandDomainBackendDispatcher, AlternateCommandDomainBackendDispatcher>>(ASCIILiteral("CommandDomain"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -730,7 +731,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -777,7 +778,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -970,7 +970,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="lines">@@ -996,16 +995,14 @@
</span><span class="cx">
</span><span class="cx"> - (void)eventWithEnumParameterWithParameter:(RWIProtocolEventDomainEventWithEnumParameterParameter)parameter
</span><span class="cx"> {
</span><del>- FrontendChannel* frontendChannel = _controller->frontendChannel();
- if (!frontendChannel)
- return;
</del><ins>+ const FrontendRouter& router = _controller->frontendRouter();
</ins><span class="cx">
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("EventDomain.eventWithEnumParameter"));
</span><span class="cx"> Ref<InspectorObject> paramsObject = InspectorObject::create();
</span><span class="cx"> paramsObject->setString(ASCIILiteral("parameter"), toProtocolString(parameter));
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><del>- frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ router.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedeventswithoptionalparametersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -178,7 +179,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -230,21 +231,20 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> class DatabaseFrontendDispatcher {
</span><span class="cx"> public:
</span><del>- DatabaseFrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</del><ins>+ DatabaseFrontendDispatcher(FrontendRouter& frontendRouter) : m_frontendRouter(frontendRouter) { }
</ins><span class="cx"> void didExecuteOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String* const notes, const double* const timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors* const screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String* const printColor);
</span><span class="cx"> void didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String& printColor);
</span><span class="cx"> private:
</span><del>- FrontendChannel* m_frontendChannel;
</del><ins>+ FrontendRouter& m_frontendRouter;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -286,6 +286,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -315,7 +316,7 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), *printColor);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendRouter.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void DatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector::Protocol::Array<String>> columnNames, const String& notes, double timestamp, RefPtr<Inspector::InspectorObject> values, RefPtr<Inspector::InspectorValue> payload, RefPtr<Inspector::Protocol::Database::Error> sqlError, const Inspector::Protocol::Database::PrimaryColors& screenColor, RefPtr<Inspector::Protocol::Database::ColorList> alternateColors, const String& printColor)
</span><span class="lines">@@ -334,7 +335,7 @@
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), printColor);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><span class="cx">
</span><del>- m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendRouter.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace Inspector
</span><span class="lines">@@ -692,7 +693,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -738,7 +739,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -828,7 +828,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="lines">@@ -850,9 +849,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)didExecuteOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ **)columnNames notes:(NSString **)notes timestamp:(double *)timestamp values:(RWIProtocolJSONObject **)values payload:(RWIProtocolJSONObject **)payload sqlError:(RWIProtocolDatabaseError **)sqlError screenColor:(NSString **)screenColor alternateColors:(NSArray/*<NSString>*/ **)alternateColors printColor:(NSString **)printColor
</span><span class="cx"> {
</span><del>- FrontendChannel* frontendChannel = _controller->frontendChannel();
- if (!frontendChannel)
- return;
</del><ins>+ const FrontendRouter& router = _controller->frontendRouter();
</ins><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_BAD_OPTIONAL_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -885,14 +882,12 @@
</span><span class="cx"> if (printColor)
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), (*printColor));
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><del>- frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ router.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (void)didExecuteNoOptionalParametersWithColumnNames:(NSArray/*<NSString>*/ *)columnNames notes:(NSString *)notes timestamp:(double)timestamp values:(RWIProtocolJSONObject *)values payload:(RWIProtocolJSONObject *)payload sqlError:(RWIProtocolDatabaseError *)sqlError screenColor:(NSString *)screenColor alternateColors:(NSArray/*<NSString>*/ *)alternateColors printColor:(NSString *)printColor
</span><span class="cx"> {
</span><del>- FrontendChannel* frontendChannel = _controller->frontendChannel();
- if (!frontendChannel)
- return;
</del><ins>+ const FrontendRouter& router = _controller->frontendRouter();
</ins><span class="cx">
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(columnNames, @"columnNames");
</span><span class="cx"> THROW_EXCEPTION_FOR_REQUIRED_PARAMETER(notes, @"notes");
</span><span class="lines">@@ -916,7 +911,7 @@
</span><span class="cx"> paramsObject->setArray(ASCIILiteral("alternateColors"), inspectorStringArray(alternateColors));
</span><span class="cx"> paramsObject->setString(ASCIILiteral("printColor"), printColor);
</span><span class="cx"> jsonMessage->setObject(ASCIILiteral("params"), WTF::move(paramsObject));
</span><del>- frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ router.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</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 (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -164,7 +165,7 @@
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><span class="cx"> class Network1BackendDispatcher final : public SupplementalBackendDispatcher {
</span><span class="cx"> public:
</span><del>- static Ref<Network1BackendDispatcher> create(BackendDispatcher*, Network1BackendDispatcherHandler*);
</del><ins>+ static Ref<Network1BackendDispatcher> create(BackendDispatcher&, Network1BackendDispatcherHandler*);
</ins><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><span class="lines">@@ -219,7 +220,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -235,9 +236,9 @@
</span><span class="cx"> #endif // PLATFORM(WEB_COMMANDS)
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(WEB_COMMANDS)
</span><del>-Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher* backendDispatcher, Network1BackendDispatcherHandler* agent)
</del><ins>+Ref<Network1BackendDispatcher> Network1BackendDispatcher::create(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new Network1BackendDispatcher(*backendDispatcher, agent));
</del><ins>+ return adoptRef(*new Network1BackendDispatcher(backendDispatcher, agent));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Network1BackendDispatcher::Network1BackendDispatcher(BackendDispatcher& backendDispatcher, Network1BackendDispatcherHandler* agent)
</span><span class="lines">@@ -322,21 +323,20 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> #if PLATFORM(WEB_EVENTS)
</span><span class="cx"> class Network3FrontendDispatcher {
</span><span class="cx"> public:
</span><del>- Network3FrontendDispatcher(FrontendChannel* frontendChannel) : m_frontendChannel(frontendChannel) { }
</del><ins>+ Network3FrontendDispatcher(FrontendRouter& frontendRouter) : m_frontendRouter(frontendRouter) { }
</ins><span class="cx"> void resourceLoaded();
</span><span class="cx"> private:
</span><del>- FrontendChannel* m_frontendChannel;
</del><ins>+ FrontendRouter& m_frontendRouter;
</ins><span class="cx"> };
</span><span class="cx"> #endif // PLATFORM(WEB_EVENTS)
</span><span class="cx">
</span><span class="lines">@@ -379,6 +379,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -389,7 +390,7 @@
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Network3.resourceLoaded"));
</span><span class="cx">
</span><del>- m_frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ m_frontendRouter.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx"> #endif // PLATFORM(WEB_EVENTS)
</span><span class="cx">
</span><span class="lines">@@ -724,7 +725,7 @@
</span><span class="cx"> _network1Handler = [handler retain];
</span><span class="cx">
</span><span class="cx"> auto alternateDispatcher = std::make_unique<ObjCInspectorNetwork1BackendDispatcher>(handler);
</span><del>- auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), WTF::move(alternateDispatcher));
</del><ins>+ auto alternateAgent = std::make_unique<AlternateDispatchableAgent<Network1BackendDispatcher, AlternateNetwork1BackendDispatcher>>(ASCIILiteral("Network1"), *_controller, WTF::move(alternateDispatcher));
</ins><span class="cx"> _controller->appendExtraAgent(WTF::move(alternateAgent));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -776,7 +777,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -823,7 +824,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -936,7 +936,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span><span class="lines">@@ -962,13 +961,11 @@
</span><span class="cx">
</span><span class="cx"> - (void)resourceLoaded
</span><span class="cx"> {
</span><del>- FrontendChannel* frontendChannel = _controller->frontendChannel();
- if (!frontendChannel)
- return;
</del><ins>+ const FrontendRouter& router = _controller->frontendRouter();
</ins><span class="cx">
</span><span class="cx"> Ref<InspectorObject> jsonMessage = InspectorObject::create();
</span><span class="cx"> jsonMessage->setString(ASCIILiteral("method"), ASCIILiteral("Network3.resourceLoaded"));
</span><del>- frontendChannel->sendMessageToFrontend(jsonMessage->toJSONString());
</del><ins>+ router.sendEvent(jsonMessage->toJSONString());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> @end
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedsametypeiddifferentdomainjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -172,7 +173,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -224,14 +225,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -553,7 +554,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -598,7 +599,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -692,7 +692,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedshadowedoptionaltypesettersjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -172,7 +173,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -224,14 +225,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -624,7 +625,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -669,7 +670,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -783,7 +783,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationaliasedprimitivetypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -172,7 +173,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -224,14 +225,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -546,7 +547,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -591,7 +592,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -681,7 +681,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationarraytypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -175,7 +176,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -227,14 +228,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -274,6 +274,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -576,7 +577,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -621,7 +622,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -739,7 +739,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationenumtypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -176,7 +177,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -228,14 +229,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -575,7 +576,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -620,7 +621,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -767,7 +767,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtypedeclarationobjecttypejsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -172,7 +173,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -224,14 +225,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -271,6 +271,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1013,7 +1014,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -1058,7 +1059,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1152,7 +1152,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre></div>
<a id="trunkSourceJavaScriptCoreinspectorscriptstestsexpectedtyperequiringruntimecastsjsonresult"></a>
<div class="modfile"><h4>Modified: trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result (190904 => 190905)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-10-12 23:26:36 UTC (rev 190904)
+++ trunk/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result 2015-10-12 23:37:51 UTC (rev 190905)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolTypes.h"
</span><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <JavaScriptCore/InspectorBackendDispatcher.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -176,7 +177,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorBackendDispatchers.h"
</span><span class="cx">
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><ins>+#include <inspector/InspectorFrontendRouter.h>
</ins><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/NeverDestroyed.h>
</span><span class="cx"> #include <wtf/text/CString.h>
</span><span class="lines">@@ -228,14 +229,13 @@
</span><span class="cx"> #define InspectorFrontendDispatchers_h
</span><span class="cx">
</span><span class="cx"> #include "InspectorProtocolObjects.h"
</span><del>-#include <inspector/InspectorFrontendChannel.h>
</del><span class="cx"> #include <inspector/InspectorValues.h>
</span><span class="cx"> #include <wtf/text/WTFString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="cx">
</span><ins>+class FrontendRouter;
</ins><span class="cx">
</span><del>-
</del><span class="cx"> } // namespace Inspector
</span><span class="cx">
</span><span class="cx"> #endif // !defined(InspectorFrontendDispatchers_h)
</span><span class="lines">@@ -275,6 +275,7 @@
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "InspectorFrontendDispatchers.h"
</span><span class="cx">
</span><ins>+#include "InspectorFrontendRouter.h"
</ins><span class="cx"> #include <wtf/text/CString.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -902,7 +903,7 @@
</span><span class="cx"> // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
</span><span class="cx"> // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
</span><span class="cx">
</span><del>-#import "RWIProtocol.h"
</del><ins>+#import <WebInspector/RWIProtocol.h>
</ins><span class="cx">
</span><span class="cx"> __attribute__((visibility ("default")))
</span><span class="cx"> @interface RWIProtocolConfiguration : NSObject
</span><span class="lines">@@ -947,7 +948,6 @@
</span><span class="cx">
</span><span class="cx"> #include "RWIProtocolInternal.h"
</span><span class="cx"> #include "RWIProtocolEnumConversionHelpers.h"
</span><del>-#include <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #include <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> namespace Inspector {
</span><span class="lines">@@ -1094,7 +1094,6 @@
</span><span class="cx"> #import "RWIProtocolInternal.h"
</span><span class="cx">
</span><span class="cx"> #import "RWIProtocolEnumConversionHelpers.h"
</span><del>-#import <JavaScriptCore/InspectorFrontendChannel.h>
</del><span class="cx"> #import <JavaScriptCore/InspectorValues.h>
</span><span class="cx">
</span><span class="cx"> using namespace Inspector;
</span></span></pre>
</div>
</div>
</body>
</html>