Diff
Modified: trunk/Source/_javascript_Core/ChangeLog (228195 => 228196)
--- trunk/Source/_javascript_Core/ChangeLog 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/ChangeLog 2018-02-06 23:10:52 UTC (rev 228196)
@@ -1,3 +1,68 @@
+2018-02-06 Brian Burg <[email protected]>
+
+ Web Inspector: protocol generator should automatically deduce the correct include style to use
+ https://bugs.webkit.org/show_bug.cgi?id=182505
+
+ Reviewed by Timothy Hatcher.
+
+ Currently the generated imports use a mix of system header imports (powered by forwarding headers)
+ and framework-style includes. Since forwarding headers are going away, this patch stops
+ using system header includes for headers that are _javascript_Core private headers. Instead,
+ use either a relative include or a framework include.
+
+ * inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py:
+ (CppAlternateBackendDispatcherHeaderGenerator.generate_output):
+ (CppAlternateBackendDispatcherHeaderGenerator):
+ (CppAlternateBackendDispatcherHeaderGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
+ (CppBackendDispatcherHeaderGenerator.generate_output):
+ (CppBackendDispatcherHeaderGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+ (CppBackendDispatcherImplementationGenerator.generate_output):
+ (CppBackendDispatcherImplementationGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
+ (CppFrontendDispatcherHeaderGenerator.generate_output):
+ (CppFrontendDispatcherHeaderGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
+ (CppFrontendDispatcherImplementationGenerator.generate_output):
+ (CppFrontendDispatcherImplementationGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
+ (CppProtocolTypesHeaderGenerator.generate_output):
+ (CppProtocolTypesHeaderGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
+ (CppProtocolTypesImplementationGenerator.generate_output):
+ (CppProtocolTypesImplementationGenerator._generate_secondary_header_includes):
+ * inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py:
+ (ObjCBackendDispatcherHeaderGenerator):
+ Convert existing header lists to the new entries format, which includes the
+ allowable target frameworks and the relative path to the header.
+
+ * inspector/scripts/codegen/generator.py:
+ (Generator.generate_includes_from_entries):
+ Copied from the same in the builtins code generator. It still works great.
+
+ * inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result:
+ * inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result:
+ * inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result:
+ * inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result:
+ * inspector/scripts/tests/generic/expected/domain-availability.json-result:
+ * inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result:
+ * inspector/scripts/tests/generic/expected/enum-values.json-result:
+ * inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result:
+ * inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result:
+ * inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result:
+ * inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result:
+ * inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result:
+ * inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result:
+ * inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result:
+ * inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result:
+ * inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result:
+ * inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result:
+ * inspector/scripts/tests/generic/expected/worker-supported-domains.json-result:
+ * inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result:
+ * inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result:
+ Rebaseline.
+
2018-02-06 Keith Miller <[email protected]>
put_to_scope/get_from_scope should not cache lexical scopes when expecting a global object
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -44,24 +44,30 @@
return '%sAlternateBackendDispatchers.h' % self.protocol_name()
def generate_output(self):
- headers = [
- '"%sProtocolTypes.h"' % self.protocol_name(),
- '<inspector/InspectorFrontendRouter.h>',
- '<_javascript_Core/InspectorBackendDispatcher.h>',
- ]
-
- header_args = {
- 'includes': '\n'.join(['#include ' + header for header in headers]),
+ template_args = {
+ 'includes': self._generate_secondary_header_includes()
}
domains = self.domains_to_generate()
sections = []
sections.append(self.generate_license())
- sections.append(Template(CppTemplates.AlternateDispatchersHeaderPrelude).substitute(None, **header_args))
+ sections.append(Template(CppTemplates.AlternateDispatchersHeaderPrelude).substitute(None, **template_args))
sections.append('\n'.join(filter(None, map(self._generate_handler_declarations_for_domain, domains))))
- sections.append(Template(CppTemplates.AlternateDispatchersHeaderPostlude).substitute(None, **header_args))
+ sections.append(Template(CppTemplates.AlternateDispatchersHeaderPostlude).substitute(None, **template_args))
return '\n\n'.join(sections)
+ # Private methods.
+
+ def _generate_secondary_header_includes(self):
+ target_framework_name = self.model().framework.name
+ header_includes = [
+ ([target_framework_name], (target_framework_name, "%sProtocolTypes.h" % self.protocol_name())),
+ (["_javascript_Core"], ("_javascript_Core", "inspector/InspectorFrontendRouter.h")),
+ (["_javascript_Core"], ("_javascript_Core", "inspector/InspectorBackendDispatcher.h")),
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_handler_declarations_for_domain(self, domain):
commands = self.commands_for_domain(domain)
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -49,15 +49,9 @@
return filter(lambda domain: len(self.commands_for_domain(domain)) > 0, Generator.domains_to_generate(self))
def generate_output(self):
- headers = [
- '"%sProtocolObjects.h"' % self.protocol_name(),
- '<inspector/InspectorBackendDispatcher.h>',
- '<wtf/text/WTFString.h>']
-
typedefs = [('String', 'ErrorString')]
-
header_args = {
- 'includes': '\n'.join(['#include ' + header for header in headers]),
+ 'includes': self._generate_secondary_header_includes(),
'typedefs': '\n'.join(['typedef %s %s;' % typedef for typedef in typedefs]),
}
@@ -75,6 +69,15 @@
# Private methods.
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], (self.model().framework.name, "%sProtocolObjects.h" % self.protocol_name())),
+ (["_javascript_Core", "WebKit"], ("_javascript_Core", "inspector/InspectorBackendDispatcher.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/text/WTFString.h"))
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_alternate_handler_forward_declarations_for_domains(self, domains):
if not domains:
return ''
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -48,14 +48,8 @@
return filter(lambda domain: len(self.commands_for_domain(domain)) > 0, Generator.domains_to_generate(self))
def generate_output(self):
- secondary_headers = [
- '<inspector/InspectorFrontendRouter.h>',
- '<wtf/JSONValues.h>',
- '<wtf/NeverDestroyed.h>',
- '<wtf/text/CString.h>']
+ secondary_includes = self._generate_secondary_header_includes()
- secondary_includes = ['#include %s' % header for header in secondary_headers]
-
if self.model().framework.setting('alternate_dispatchers', False):
secondary_includes.append('')
secondary_includes.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
@@ -77,6 +71,17 @@
# Private methods.
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], ("_javascript_Core", "inspector/InspectorFrontendRouter.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/JSONValues.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/NeverDestroyed.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/text/CString.h"))
+ ]
+
+ return self.generate_includes_from_entries(header_includes)
+
+
def _generate_handler_class_destructor_for_domain(self, domain):
destructor_args = {
'domainName': domain.domain_name
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -49,13 +49,8 @@
return filter(lambda domain: len(self.events_for_domain(domain)) > 0, Generator.domains_to_generate(self))
def generate_output(self):
- headers = [
- '"%sProtocolObjects.h"' % self.protocol_name(),
- '<wtf/JSONValues.h>',
- '<wtf/text/WTFString.h>']
-
header_args = {
- 'includes': '\n'.join(['#include ' + header for header in headers]),
+ 'includes': self._generate_secondary_header_includes(),
'typedefs': 'class FrontendRouter;',
}
@@ -68,6 +63,15 @@
# Private methods.
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], (self.model().framework.name, "%sProtocolObjects.h" % self.protocol_name())),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/JSONValues.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/text/WTFString.h"))
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_anonymous_enum_for_parameter(self, parameter, event):
enum_args = {
'parameterName': parameter.parameter_name,
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -48,14 +48,9 @@
return filter(lambda domain: len(self.events_for_domain(domain)) > 0, Generator.domains_to_generate(self))
def generate_output(self):
- secondary_headers = [
- '<inspector/InspectorFrontendRouter.h>',
- '<wtf/text/CString.h>',
- ]
-
header_args = {
'primaryInclude': '"%sFrontendDispatchers.h"' % self.protocol_name(),
- 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
+ 'secondaryIncludes': self._generate_secondary_header_includes(),
}
sections = []
@@ -67,6 +62,14 @@
# Private methods.
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], ("_javascript_Core", "inspector/InspectorFrontendRouter.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/text/CString.h"))
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_dispatcher_implementations_for_domain(self, domain):
implementations = []
events = self.events_for_domain(domain)
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_header.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -50,13 +50,8 @@
domains = self.domains_to_generate()
self.calculate_types_requiring_shape_assertions(domains)
- headers = set([
- '<inspector/InspectorProtocolTypes.h>',
- '<wtf/Assertions.h>',
- ])
-
header_args = {
- 'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),
+ 'includes': self._generate_secondary_header_includes(),
'typedefs': '',
}
@@ -79,6 +74,14 @@
# FIXME: move builders out of classes, uncomment forward declaration
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], ("_javascript_Core", "inspector/InspectorProtocolTypes.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/Assertions.h"))
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_forward_declarations(self, domains):
sections = []
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -56,7 +56,7 @@
header_args = {
'primaryInclude': '"%sProtocolObjects.h"' % self.protocol_name(),
- 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
+ 'secondaryIncludes': self._generate_secondary_header_includes(),
}
sections = []
@@ -74,6 +74,14 @@
# Private methods.
+ def _generate_secondary_header_includes(self):
+ header_includes = [
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/Optional.h")),
+ (["_javascript_Core", "WebKit"], ("WTF", "wtf/text/CString.h")),
+ ]
+
+ return '\n'.join(self.generate_includes_from_entries(header_includes))
+
def _generate_enum_mapping(self):
if not self.assigned_enum_values():
return []
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -68,6 +68,8 @@
sections.append(Template(ObjCTemplates.BackendDispatcherHeaderPostlude).substitute(None, **header_args))
return '\n\n'.join(sections)
+ # Private methods.
+
def _generate_objc_forward_declarations(self):
lines = []
for domain in self.domains_to_generate():
Modified: trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/codegen/generator.py 2018-02-06 23:10:52 UTC (rev 228196)
@@ -119,6 +119,25 @@
def generate_license(self):
return Template(Templates.CopyrightBlock).substitute(None, inputFilename=os.path.basename(self._input_filepath))
+ def generate_includes_from_entries(self, entries):
+ includes = set()
+ for entry in entries:
+ (allowed_framework_names, data) = entry
+ (framework_name, header_path) = data
+
+ allowed_frameworks = allowed_framework_names + ["Test"]
+ if self.model().framework.name not in allowed_frameworks:
+ continue
+
+ if framework_name == "WTF":
+ includes.add("#include <%s>" % header_path)
+ elif self.model().framework.name != framework_name:
+ includes.add("#include <%s/%s>" % (framework_name, os.path.basename(header_path)))
+ else:
+ includes.add("#include \"%s\"" % os.path.basename(header_path))
+
+ return sorted(list(includes))
+
# These methods are overridden by subclasses.
def non_supplemental_domains(self):
return filter(lambda domain: not domain.is_supplemental, self.model().domains)
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -72,8 +72,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -131,7 +131,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -203,7 +203,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -350,7 +350,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -400,7 +400,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -75,8 +75,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -137,7 +137,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -232,7 +232,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -566,7 +566,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -608,7 +608,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -72,8 +72,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -132,7 +132,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -213,7 +213,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -467,7 +467,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -509,7 +509,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domain-availability.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -74,8 +74,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -138,7 +138,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -235,7 +235,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -419,7 +419,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -461,7 +461,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -80,8 +80,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -150,7 +150,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -259,7 +259,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -581,7 +581,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -623,7 +623,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/enum-values.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/enum-values.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/enum-values.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -80,8 +80,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -139,7 +139,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -218,7 +218,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -375,7 +375,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -428,7 +428,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -72,8 +72,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -127,7 +127,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -173,7 +173,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -277,7 +277,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -366,7 +366,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -75,8 +75,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -136,7 +136,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -214,7 +214,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -367,7 +367,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -419,7 +419,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -70,8 +70,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -125,7 +125,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -171,7 +171,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -266,7 +266,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -308,7 +308,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -71,8 +71,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -126,7 +126,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -172,7 +172,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -267,7 +267,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -309,7 +309,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -72,8 +72,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -127,7 +127,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -173,7 +173,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -268,7 +268,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -310,7 +310,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -71,8 +71,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -126,7 +126,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -172,7 +172,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -267,7 +267,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -309,7 +309,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -75,8 +75,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -139,7 +139,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -236,7 +236,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -420,7 +420,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -462,7 +462,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -66,8 +66,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -121,7 +121,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -167,7 +167,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -262,7 +262,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -304,7 +304,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
Modified: trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result (228195 => 228196)
--- trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result 2018-02-06 22:49:53 UTC (rev 228195)
+++ trunk/Source/_javascript_Core/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result 2018-02-06 23:10:52 UTC (rev 228196)
@@ -72,8 +72,8 @@
#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
#include "TestProtocolTypes.h"
-#include <inspector/InspectorFrontendRouter.h>
#include <_javascript_Core/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
namespace Inspector {
@@ -131,7 +131,7 @@
#pragma once
#include "TestProtocolObjects.h"
-#include <inspector/InspectorBackendDispatcher.h>
+#include <_javascript_Core/InspectorBackendDispatcher.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
@@ -203,7 +203,7 @@
#include "config.h"
#include "TestBackendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/JSONValues.h>
#include <wtf/NeverDestroyed.h>
#include <wtf/text/CString.h>
@@ -350,7 +350,7 @@
#include "config.h"
#include "TestFrontendDispatchers.h"
-#include <inspector/InspectorFrontendRouter.h>
+#include <_javascript_Core/InspectorFrontendRouter.h>
#include <wtf/text/CString.h>
namespace Inspector {
@@ -400,7 +400,7 @@
#pragma once
-#include <inspector/InspectorProtocolTypes.h>
+#include <_javascript_Core/InspectorProtocolTypes.h>
#include <wtf/Assertions.h>
namespace Inspector {
