Changeset 228196 in webkit
- Timestamp:
- Feb 6, 2018 3:10:52 PM (6 years ago)
- Location:
- trunk/Source/JavaScriptCore
- Files:
-
- 30 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Source/JavaScriptCore/ChangeLog
r228193 r228196 1 2018-02-06 Brian Burg <bburg@apple.com> 2 3 Web Inspector: protocol generator should automatically deduce the correct include style to use 4 https://bugs.webkit.org/show_bug.cgi?id=182505 5 6 Reviewed by Timothy Hatcher. 7 8 Currently the generated imports use a mix of system header imports (powered by forwarding headers) 9 and framework-style includes. Since forwarding headers are going away, this patch stops 10 using system header includes for headers that are JavaScriptCore private headers. Instead, 11 use either a relative include or a framework include. 12 13 * inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py: 14 (CppAlternateBackendDispatcherHeaderGenerator.generate_output): 15 (CppAlternateBackendDispatcherHeaderGenerator): 16 (CppAlternateBackendDispatcherHeaderGenerator._generate_secondary_header_includes): 17 * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py: 18 (CppBackendDispatcherHeaderGenerator.generate_output): 19 (CppBackendDispatcherHeaderGenerator._generate_secondary_header_includes): 20 * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py: 21 (CppBackendDispatcherImplementationGenerator.generate_output): 22 (CppBackendDispatcherImplementationGenerator._generate_secondary_header_includes): 23 * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py: 24 (CppFrontendDispatcherHeaderGenerator.generate_output): 25 (CppFrontendDispatcherHeaderGenerator._generate_secondary_header_includes): 26 * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py: 27 (CppFrontendDispatcherImplementationGenerator.generate_output): 28 (CppFrontendDispatcherImplementationGenerator._generate_secondary_header_includes): 29 * inspector/scripts/codegen/generate_cpp_protocol_types_header.py: 30 (CppProtocolTypesHeaderGenerator.generate_output): 31 (CppProtocolTypesHeaderGenerator._generate_secondary_header_includes): 32 * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py: 33 (CppProtocolTypesImplementationGenerator.generate_output): 34 (CppProtocolTypesImplementationGenerator._generate_secondary_header_includes): 35 * inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py: 36 (ObjCBackendDispatcherHeaderGenerator): 37 Convert existing header lists to the new entries format, which includes the 38 allowable target frameworks and the relative path to the header. 39 40 * inspector/scripts/codegen/generator.py: 41 (Generator.generate_includes_from_entries): 42 Copied from the same in the builtins code generator. It still works great. 43 44 * inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result: 45 * inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result: 46 * inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result: 47 * inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result: 48 * inspector/scripts/tests/generic/expected/domain-availability.json-result: 49 * inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result: 50 * inspector/scripts/tests/generic/expected/enum-values.json-result: 51 * inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result: 52 * inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result: 53 * inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result: 54 * inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result: 55 * inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result: 56 * inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result: 57 * inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result: 58 * inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result: 59 * inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result: 60 * inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result: 61 * inspector/scripts/tests/generic/expected/worker-supported-domains.json-result: 62 * inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result: 63 * inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result: 64 Rebaseline. 65 1 66 2018-02-06 Keith Miller <keith_miller@apple.com> 2 67 -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py
r210309 r228196 45 45 46 46 def generate_output(self): 47 headers = [ 48 '"%sProtocolTypes.h"' % self.protocol_name(), 49 '<inspector/InspectorFrontendRouter.h>', 50 '<JavaScriptCore/InspectorBackendDispatcher.h>', 51 ] 52 53 header_args = { 54 'includes': '\n'.join(['#include ' + header for header in headers]), 47 template_args = { 48 'includes': self._generate_secondary_header_includes() 55 49 } 56 50 … … 58 52 sections = [] 59 53 sections.append(self.generate_license()) 60 sections.append(Template(CppTemplates.AlternateDispatchersHeaderPrelude).substitute(None, ** header_args))54 sections.append(Template(CppTemplates.AlternateDispatchersHeaderPrelude).substitute(None, **template_args)) 61 55 sections.append('\n'.join(filter(None, map(self._generate_handler_declarations_for_domain, domains)))) 62 sections.append(Template(CppTemplates.AlternateDispatchersHeaderPostlude).substitute(None, ** header_args))56 sections.append(Template(CppTemplates.AlternateDispatchersHeaderPostlude).substitute(None, **template_args)) 63 57 return '\n\n'.join(sections) 58 59 # Private methods. 60 61 def _generate_secondary_header_includes(self): 62 target_framework_name = self.model().framework.name 63 header_includes = [ 64 ([target_framework_name], (target_framework_name, "%sProtocolTypes.h" % self.protocol_name())), 65 (["JavaScriptCore"], ("JavaScriptCore", "inspector/InspectorFrontendRouter.h")), 66 (["JavaScriptCore"], ("JavaScriptCore", "inspector/InspectorBackendDispatcher.h")), 67 ] 68 69 return '\n'.join(self.generate_includes_from_entries(header_includes)) 64 70 65 71 def _generate_handler_declarations_for_domain(self, domain): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py
r225231 r228196 50 50 51 51 def generate_output(self): 52 headers = [53 '"%sProtocolObjects.h"' % self.protocol_name(),54 '<inspector/InspectorBackendDispatcher.h>',55 '<wtf/text/WTFString.h>']56 57 52 typedefs = [('String', 'ErrorString')] 58 59 53 header_args = { 60 'includes': '\n'.join(['#include ' + header for header in headers]),54 'includes': self._generate_secondary_header_includes(), 61 55 'typedefs': '\n'.join(['typedef %s %s;' % typedef for typedef in typedefs]), 62 56 } … … 76 70 # Private methods. 77 71 72 def _generate_secondary_header_includes(self): 73 header_includes = [ 74 (["JavaScriptCore", "WebKit"], (self.model().framework.name, "%sProtocolObjects.h" % self.protocol_name())), 75 (["JavaScriptCore", "WebKit"], ("JavaScriptCore", "inspector/InspectorBackendDispatcher.h")), 76 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/text/WTFString.h")) 77 ] 78 79 return '\n'.join(self.generate_includes_from_entries(header_includes)) 80 78 81 def _generate_alternate_handler_forward_declarations_for_domains(self, domains): 79 82 if not domains: -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py
r225231 r228196 49 49 50 50 def generate_output(self): 51 secondary_headers = [ 52 '<inspector/InspectorFrontendRouter.h>', 53 '<wtf/JSONValues.h>', 54 '<wtf/NeverDestroyed.h>', 55 '<wtf/text/CString.h>'] 56 57 secondary_includes = ['#include %s' % header for header in secondary_headers] 51 secondary_includes = self._generate_secondary_header_includes() 58 52 59 53 if self.model().framework.setting('alternate_dispatchers', False): … … 77 71 78 72 # Private methods. 73 74 def _generate_secondary_header_includes(self): 75 header_includes = [ 76 (["JavaScriptCore", "WebKit"], ("JavaScriptCore", "inspector/InspectorFrontendRouter.h")), 77 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/JSONValues.h")), 78 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/NeverDestroyed.h")), 79 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/text/CString.h")) 80 ] 81 82 return self.generate_includes_from_entries(header_includes) 83 79 84 80 85 def _generate_handler_class_destructor_for_domain(self, domain): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py
r225231 r228196 50 50 51 51 def generate_output(self): 52 headers = [53 '"%sProtocolObjects.h"' % self.protocol_name(),54 '<wtf/JSONValues.h>',55 '<wtf/text/WTFString.h>']56 57 52 header_args = { 58 'includes': '\n'.join(['#include ' + header for header in headers]),53 'includes': self._generate_secondary_header_includes(), 59 54 'typedefs': 'class FrontendRouter;', 60 55 } … … 68 63 69 64 # Private methods. 65 66 def _generate_secondary_header_includes(self): 67 header_includes = [ 68 (["JavaScriptCore", "WebKit"], (self.model().framework.name, "%sProtocolObjects.h" % self.protocol_name())), 69 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/JSONValues.h")), 70 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/text/WTFString.h")) 71 ] 72 73 return '\n'.join(self.generate_includes_from_entries(header_includes)) 70 74 71 75 def _generate_anonymous_enum_for_parameter(self, parameter, event): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py
r225231 r228196 49 49 50 50 def generate_output(self): 51 secondary_headers = [52 '<inspector/InspectorFrontendRouter.h>',53 '<wtf/text/CString.h>',54 ]55 56 51 header_args = { 57 52 'primaryInclude': '"%sFrontendDispatchers.h"' % self.protocol_name(), 58 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),53 'secondaryIncludes': self._generate_secondary_header_includes(), 59 54 } 60 55 … … 67 62 68 63 # Private methods. 64 65 def _generate_secondary_header_includes(self): 66 header_includes = [ 67 (["JavaScriptCore", "WebKit"], ("JavaScriptCore", "inspector/InspectorFrontendRouter.h")), 68 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/text/CString.h")) 69 ] 70 71 return '\n'.join(self.generate_includes_from_entries(header_includes)) 69 72 70 73 def _generate_dispatcher_implementations_for_domain(self, domain): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py
r225425 r228196 51 51 self.calculate_types_requiring_shape_assertions(domains) 52 52 53 headers = set([54 '<inspector/InspectorProtocolTypes.h>',55 '<wtf/Assertions.h>',56 ])57 58 53 header_args = { 59 'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),54 'includes': self._generate_secondary_header_includes(), 60 55 'typedefs': '', 61 56 } … … 80 75 # FIXME: move builders out of classes, uncomment forward declaration 81 76 77 def _generate_secondary_header_includes(self): 78 header_includes = [ 79 (["JavaScriptCore", "WebKit"], ("JavaScriptCore", "inspector/InspectorProtocolTypes.h")), 80 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/Assertions.h")) 81 ] 82 83 return '\n'.join(self.generate_includes_from_entries(header_includes)) 84 82 85 def _generate_forward_declarations(self, domains): 83 86 sections = [] -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py
r225231 r228196 57 57 header_args = { 58 58 'primaryInclude': '"%sProtocolObjects.h"' % self.protocol_name(), 59 'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),59 'secondaryIncludes': self._generate_secondary_header_includes(), 60 60 } 61 61 … … 74 74 75 75 # Private methods. 76 77 def _generate_secondary_header_includes(self): 78 header_includes = [ 79 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/Optional.h")), 80 (["JavaScriptCore", "WebKit"], ("WTF", "wtf/text/CString.h")), 81 ] 82 83 return '\n'.join(self.generate_includes_from_entries(header_includes)) 76 84 77 85 def _generate_enum_mapping(self): -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py
r210309 r228196 69 69 return '\n\n'.join(sections) 70 70 71 # Private methods. 72 71 73 def _generate_objc_forward_declarations(self): 72 74 lines = [] -
trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py
r225884 r228196 120 120 return Template(Templates.CopyrightBlock).substitute(None, inputFilename=os.path.basename(self._input_filepath)) 121 121 122 def generate_includes_from_entries(self, entries): 123 includes = set() 124 for entry in entries: 125 (allowed_framework_names, data) = entry 126 (framework_name, header_path) = data 127 128 allowed_frameworks = allowed_framework_names + ["Test"] 129 if self.model().framework.name not in allowed_frameworks: 130 continue 131 132 if framework_name == "WTF": 133 includes.add("#include <%s>" % header_path) 134 elif self.model().framework.name != framework_name: 135 includes.add("#include <%s/%s>" % (framework_name, os.path.basename(header_path))) 136 else: 137 includes.add("#include \"%s\"" % os.path.basename(header_path)) 138 139 return sorted(list(includes)) 140 122 141 # These methods are overridden by subclasses. 123 142 def non_supplemental_domains(self): -
trunk/Source/JavaScriptCore/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result
r225243 r228196 73 73 74 74 #include "TestProtocolTypes.h" 75 #include <inspector/InspectorFrontendRouter.h>76 75 #include <JavaScriptCore/InspectorBackendDispatcher.h> 76 #include <JavaScriptCore/InspectorFrontendRouter.h> 77 77 78 78 namespace Inspector { … … 132 132 133 133 #include "TestProtocolObjects.h" 134 #include < inspector/InspectorBackendDispatcher.h>134 #include <JavaScriptCore/InspectorBackendDispatcher.h> 135 135 #include <wtf/text/WTFString.h> 136 136 … … 204 204 #include "TestBackendDispatchers.h" 205 205 206 #include < inspector/InspectorFrontendRouter.h>206 #include <JavaScriptCore/InspectorFrontendRouter.h> 207 207 #include <wtf/JSONValues.h> 208 208 #include <wtf/NeverDestroyed.h> … … 351 351 #include "TestFrontendDispatchers.h" 352 352 353 #include < inspector/InspectorFrontendRouter.h>353 #include <JavaScriptCore/InspectorFrontendRouter.h> 354 354 #include <wtf/text/CString.h> 355 355 … … 401 401 #pragma once 402 402 403 #include < inspector/InspectorProtocolTypes.h>403 #include <JavaScriptCore/InspectorProtocolTypes.h> 404 404 #include <wtf/Assertions.h> 405 405 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result
r225425 r228196 76 76 77 77 #include "TestProtocolTypes.h" 78 #include <inspector/InspectorFrontendRouter.h>79 78 #include <JavaScriptCore/InspectorBackendDispatcher.h> 79 #include <JavaScriptCore/InspectorFrontendRouter.h> 80 80 81 81 namespace Inspector { … … 138 138 139 139 #include "TestProtocolObjects.h" 140 #include < inspector/InspectorBackendDispatcher.h>140 #include <JavaScriptCore/InspectorBackendDispatcher.h> 141 141 #include <wtf/text/WTFString.h> 142 142 … … 233 233 #include "TestBackendDispatchers.h" 234 234 235 #include < inspector/InspectorFrontendRouter.h>235 #include <JavaScriptCore/InspectorFrontendRouter.h> 236 236 #include <wtf/JSONValues.h> 237 237 #include <wtf/NeverDestroyed.h> … … 567 567 #include "TestFrontendDispatchers.h" 568 568 569 #include < inspector/InspectorFrontendRouter.h>569 #include <JavaScriptCore/InspectorFrontendRouter.h> 570 570 #include <wtf/text/CString.h> 571 571 … … 609 609 #pragma once 610 610 611 #include < inspector/InspectorProtocolTypes.h>611 #include <JavaScriptCore/InspectorProtocolTypes.h> 612 612 #include <wtf/Assertions.h> 613 613 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result
r225425 r228196 73 73 74 74 #include "TestProtocolTypes.h" 75 #include <inspector/InspectorFrontendRouter.h>76 75 #include <JavaScriptCore/InspectorBackendDispatcher.h> 76 #include <JavaScriptCore/InspectorFrontendRouter.h> 77 77 78 78 namespace Inspector { … … 133 133 134 134 #include "TestProtocolObjects.h" 135 #include < inspector/InspectorBackendDispatcher.h>135 #include <JavaScriptCore/InspectorBackendDispatcher.h> 136 136 #include <wtf/text/WTFString.h> 137 137 … … 214 214 #include "TestBackendDispatchers.h" 215 215 216 #include < inspector/InspectorFrontendRouter.h>216 #include <JavaScriptCore/InspectorFrontendRouter.h> 217 217 #include <wtf/JSONValues.h> 218 218 #include <wtf/NeverDestroyed.h> … … 468 468 #include "TestFrontendDispatchers.h" 469 469 470 #include < inspector/InspectorFrontendRouter.h>470 #include <JavaScriptCore/InspectorFrontendRouter.h> 471 471 #include <wtf/text/CString.h> 472 472 … … 510 510 #pragma once 511 511 512 #include < inspector/InspectorProtocolTypes.h>512 #include <JavaScriptCore/InspectorProtocolTypes.h> 513 513 #include <wtf/Assertions.h> 514 514 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result
r225231 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-availability.json-result
r225231 r228196 75 75 76 76 #include "TestProtocolTypes.h" 77 #include <inspector/InspectorFrontendRouter.h>78 77 #include <JavaScriptCore/InspectorBackendDispatcher.h> 78 #include <JavaScriptCore/InspectorFrontendRouter.h> 79 79 80 80 namespace Inspector { … … 139 139 140 140 #include "TestProtocolObjects.h" 141 #include < inspector/InspectorBackendDispatcher.h>141 #include <JavaScriptCore/InspectorBackendDispatcher.h> 142 142 #include <wtf/text/WTFString.h> 143 143 … … 236 236 #include "TestBackendDispatchers.h" 237 237 238 #include < inspector/InspectorFrontendRouter.h>238 #include <JavaScriptCore/InspectorFrontendRouter.h> 239 239 #include <wtf/JSONValues.h> 240 240 #include <wtf/NeverDestroyed.h> … … 420 420 #include "TestFrontendDispatchers.h" 421 421 422 #include < inspector/InspectorFrontendRouter.h>422 #include <JavaScriptCore/InspectorFrontendRouter.h> 423 423 #include <wtf/text/CString.h> 424 424 … … 462 462 #pragma once 463 463 464 #include < inspector/InspectorProtocolTypes.h>464 #include <JavaScriptCore/InspectorProtocolTypes.h> 465 465 #include <wtf/Assertions.h> 466 466 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result
r225231 r228196 81 81 82 82 #include "TestProtocolTypes.h" 83 #include <inspector/InspectorFrontendRouter.h>84 83 #include <JavaScriptCore/InspectorBackendDispatcher.h> 84 #include <JavaScriptCore/InspectorFrontendRouter.h> 85 85 86 86 namespace Inspector { … … 151 151 152 152 #include "TestProtocolObjects.h" 153 #include < inspector/InspectorBackendDispatcher.h>153 #include <JavaScriptCore/InspectorBackendDispatcher.h> 154 154 #include <wtf/text/WTFString.h> 155 155 … … 260 260 #include "TestBackendDispatchers.h" 261 261 262 #include < inspector/InspectorFrontendRouter.h>262 #include <JavaScriptCore/InspectorFrontendRouter.h> 263 263 #include <wtf/JSONValues.h> 264 264 #include <wtf/NeverDestroyed.h> … … 582 582 #include "TestFrontendDispatchers.h" 583 583 584 #include < inspector/InspectorFrontendRouter.h>584 #include <JavaScriptCore/InspectorFrontendRouter.h> 585 585 #include <wtf/text/CString.h> 586 586 … … 624 624 #pragma once 625 625 626 #include < inspector/InspectorProtocolTypes.h>626 #include <JavaScriptCore/InspectorProtocolTypes.h> 627 627 #include <wtf/Assertions.h> 628 628 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/enum-values.json-result
r225231 r228196 81 81 82 82 #include "TestProtocolTypes.h" 83 #include <inspector/InspectorFrontendRouter.h>84 83 #include <JavaScriptCore/InspectorBackendDispatcher.h> 84 #include <JavaScriptCore/InspectorFrontendRouter.h> 85 85 86 86 namespace Inspector { … … 140 140 141 141 #include "TestProtocolObjects.h" 142 #include < inspector/InspectorBackendDispatcher.h>142 #include <JavaScriptCore/InspectorBackendDispatcher.h> 143 143 #include <wtf/text/WTFString.h> 144 144 … … 219 219 #include "TestBackendDispatchers.h" 220 220 221 #include < inspector/InspectorFrontendRouter.h>221 #include <JavaScriptCore/InspectorFrontendRouter.h> 222 222 #include <wtf/JSONValues.h> 223 223 #include <wtf/NeverDestroyed.h> … … 376 376 #include "TestFrontendDispatchers.h" 377 377 378 #include < inspector/InspectorFrontendRouter.h>378 #include <JavaScriptCore/InspectorFrontendRouter.h> 379 379 #include <wtf/text/CString.h> 380 380 … … 429 429 #pragma once 430 430 431 #include < inspector/InspectorProtocolTypes.h>431 #include <JavaScriptCore/InspectorProtocolTypes.h> 432 432 #include <wtf/Assertions.h> 433 433 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result
r225425 r228196 73 73 74 74 #include "TestProtocolTypes.h" 75 #include <inspector/InspectorFrontendRouter.h>76 75 #include <JavaScriptCore/InspectorBackendDispatcher.h> 76 #include <JavaScriptCore/InspectorFrontendRouter.h> 77 77 78 78 namespace Inspector { … … 128 128 129 129 #include "TestProtocolObjects.h" 130 #include < inspector/InspectorBackendDispatcher.h>130 #include <JavaScriptCore/InspectorBackendDispatcher.h> 131 131 #include <wtf/text/WTFString.h> 132 132 … … 174 174 #include "TestBackendDispatchers.h" 175 175 176 #include < inspector/InspectorFrontendRouter.h>176 #include <JavaScriptCore/InspectorFrontendRouter.h> 177 177 #include <wtf/JSONValues.h> 178 178 #include <wtf/NeverDestroyed.h> … … 278 278 #include "TestFrontendDispatchers.h" 279 279 280 #include < inspector/InspectorFrontendRouter.h>280 #include <JavaScriptCore/InspectorFrontendRouter.h> 281 281 #include <wtf/text/CString.h> 282 282 … … 367 367 #pragma once 368 368 369 #include < inspector/InspectorProtocolTypes.h>369 #include <JavaScriptCore/InspectorProtocolTypes.h> 370 370 #include <wtf/Assertions.h> 371 371 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result
r225243 r228196 76 76 77 77 #include "TestProtocolTypes.h" 78 #include <inspector/InspectorFrontendRouter.h>79 78 #include <JavaScriptCore/InspectorBackendDispatcher.h> 79 #include <JavaScriptCore/InspectorFrontendRouter.h> 80 80 81 81 namespace Inspector { … … 137 137 138 138 #include "TestProtocolObjects.h" 139 #include < inspector/InspectorBackendDispatcher.h>139 #include <JavaScriptCore/InspectorBackendDispatcher.h> 140 140 #include <wtf/text/WTFString.h> 141 141 … … 215 215 #include "TestBackendDispatchers.h" 216 216 217 #include < inspector/InspectorFrontendRouter.h>217 #include <JavaScriptCore/InspectorFrontendRouter.h> 218 218 #include <wtf/JSONValues.h> 219 219 #include <wtf/NeverDestroyed.h> … … 368 368 #include "TestFrontendDispatchers.h" 369 369 370 #include < inspector/InspectorFrontendRouter.h>370 #include <JavaScriptCore/InspectorFrontendRouter.h> 371 371 #include <wtf/text/CString.h> 372 372 … … 420 420 #pragma once 421 421 422 #include < inspector/InspectorProtocolTypes.h>422 #include <JavaScriptCore/InspectorProtocolTypes.h> 423 423 #include <wtf/Assertions.h> 424 424 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result
r225231 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result
r225425 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result
r225231 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result
r225425 r228196 71 71 72 72 #include "TestProtocolTypes.h" 73 #include <inspector/InspectorFrontendRouter.h>74 73 #include <JavaScriptCore/InspectorBackendDispatcher.h> 74 #include <JavaScriptCore/InspectorFrontendRouter.h> 75 75 76 76 namespace Inspector { … … 126 126 127 127 #include "TestProtocolObjects.h" 128 #include < inspector/InspectorBackendDispatcher.h>128 #include <JavaScriptCore/InspectorBackendDispatcher.h> 129 129 #include <wtf/text/WTFString.h> 130 130 … … 172 172 #include "TestBackendDispatchers.h" 173 173 174 #include < inspector/InspectorFrontendRouter.h>174 #include <JavaScriptCore/InspectorFrontendRouter.h> 175 175 #include <wtf/JSONValues.h> 176 176 #include <wtf/NeverDestroyed.h> … … 267 267 #include "TestFrontendDispatchers.h" 268 268 269 #include < inspector/InspectorFrontendRouter.h>269 #include <JavaScriptCore/InspectorFrontendRouter.h> 270 270 #include <wtf/text/CString.h> 271 271 … … 309 309 #pragma once 310 310 311 #include < inspector/InspectorProtocolTypes.h>311 #include <JavaScriptCore/InspectorProtocolTypes.h> 312 312 #include <wtf/Assertions.h> 313 313 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result
r225231 r228196 72 72 73 73 #include "TestProtocolTypes.h" 74 #include <inspector/InspectorFrontendRouter.h>75 74 #include <JavaScriptCore/InspectorBackendDispatcher.h> 75 #include <JavaScriptCore/InspectorFrontendRouter.h> 76 76 77 77 namespace Inspector { … … 127 127 128 128 #include "TestProtocolObjects.h" 129 #include < inspector/InspectorBackendDispatcher.h>129 #include <JavaScriptCore/InspectorBackendDispatcher.h> 130 130 #include <wtf/text/WTFString.h> 131 131 … … 173 173 #include "TestBackendDispatchers.h" 174 174 175 #include < inspector/InspectorFrontendRouter.h>175 #include <JavaScriptCore/InspectorFrontendRouter.h> 176 176 #include <wtf/JSONValues.h> 177 177 #include <wtf/NeverDestroyed.h> … … 268 268 #include "TestFrontendDispatchers.h" 269 269 270 #include < inspector/InspectorFrontendRouter.h>270 #include <JavaScriptCore/InspectorFrontendRouter.h> 271 271 #include <wtf/text/CString.h> 272 272 … … 310 310 #pragma once 311 311 312 #include < inspector/InspectorProtocolTypes.h>312 #include <JavaScriptCore/InspectorProtocolTypes.h> 313 313 #include <wtf/Assertions.h> 314 314 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result
r225425 r228196 73 73 74 74 #include "TestProtocolTypes.h" 75 #include <inspector/InspectorFrontendRouter.h>76 75 #include <JavaScriptCore/InspectorBackendDispatcher.h> 76 #include <JavaScriptCore/InspectorFrontendRouter.h> 77 77 78 78 namespace Inspector { … … 128 128 129 129 #include "TestProtocolObjects.h" 130 #include < inspector/InspectorBackendDispatcher.h>130 #include <JavaScriptCore/InspectorBackendDispatcher.h> 131 131 #include <wtf/text/WTFString.h> 132 132 … … 174 174 #include "TestBackendDispatchers.h" 175 175 176 #include < inspector/InspectorFrontendRouter.h>176 #include <JavaScriptCore/InspectorFrontendRouter.h> 177 177 #include <wtf/JSONValues.h> 178 178 #include <wtf/NeverDestroyed.h> … … 269 269 #include "TestFrontendDispatchers.h" 270 270 271 #include < inspector/InspectorFrontendRouter.h>271 #include <JavaScriptCore/InspectorFrontendRouter.h> 272 272 #include <wtf/text/CString.h> 273 273 … … 311 311 #pragma once 312 312 313 #include < inspector/InspectorProtocolTypes.h>313 #include <JavaScriptCore/InspectorProtocolTypes.h> 314 314 #include <wtf/Assertions.h> 315 315 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result
r225243 r228196 72 72 73 73 #include "TestProtocolTypes.h" 74 #include <inspector/InspectorFrontendRouter.h>75 74 #include <JavaScriptCore/InspectorBackendDispatcher.h> 75 #include <JavaScriptCore/InspectorFrontendRouter.h> 76 76 77 77 namespace Inspector { … … 127 127 128 128 #include "TestProtocolObjects.h" 129 #include < inspector/InspectorBackendDispatcher.h>129 #include <JavaScriptCore/InspectorBackendDispatcher.h> 130 130 #include <wtf/text/WTFString.h> 131 131 … … 173 173 #include "TestBackendDispatchers.h" 174 174 175 #include < inspector/InspectorFrontendRouter.h>175 #include <JavaScriptCore/InspectorFrontendRouter.h> 176 176 #include <wtf/JSONValues.h> 177 177 #include <wtf/NeverDestroyed.h> … … 268 268 #include "TestFrontendDispatchers.h" 269 269 270 #include < inspector/InspectorFrontendRouter.h>270 #include <JavaScriptCore/InspectorFrontendRouter.h> 271 271 #include <wtf/text/CString.h> 272 272 … … 310 310 #pragma once 311 311 312 #include < inspector/InspectorProtocolTypes.h>312 #include <JavaScriptCore/InspectorProtocolTypes.h> 313 313 #include <wtf/Assertions.h> 314 314 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result
r225243 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result
r225231 r228196 76 76 77 77 #include "TestProtocolTypes.h" 78 #include <inspector/InspectorFrontendRouter.h>79 78 #include <JavaScriptCore/InspectorBackendDispatcher.h> 79 #include <JavaScriptCore/InspectorFrontendRouter.h> 80 80 81 81 namespace Inspector { … … 140 140 141 141 #include "TestProtocolObjects.h" 142 #include < inspector/InspectorBackendDispatcher.h>142 #include <JavaScriptCore/InspectorBackendDispatcher.h> 143 143 #include <wtf/text/WTFString.h> 144 144 … … 237 237 #include "TestBackendDispatchers.h" 238 238 239 #include < inspector/InspectorFrontendRouter.h>239 #include <JavaScriptCore/InspectorFrontendRouter.h> 240 240 #include <wtf/JSONValues.h> 241 241 #include <wtf/NeverDestroyed.h> … … 421 421 #include "TestFrontendDispatchers.h" 422 422 423 #include < inspector/InspectorFrontendRouter.h>423 #include <JavaScriptCore/InspectorFrontendRouter.h> 424 424 #include <wtf/text/CString.h> 425 425 … … 463 463 #pragma once 464 464 465 #include < inspector/InspectorProtocolTypes.h>465 #include <JavaScriptCore/InspectorProtocolTypes.h> 466 466 #include <wtf/Assertions.h> 467 467 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result
r225231 r228196 67 67 68 68 #include "TestProtocolTypes.h" 69 #include <inspector/InspectorFrontendRouter.h>70 69 #include <JavaScriptCore/InspectorBackendDispatcher.h> 70 #include <JavaScriptCore/InspectorFrontendRouter.h> 71 71 72 72 namespace Inspector { … … 122 122 123 123 #include "TestProtocolObjects.h" 124 #include < inspector/InspectorBackendDispatcher.h>124 #include <JavaScriptCore/InspectorBackendDispatcher.h> 125 125 #include <wtf/text/WTFString.h> 126 126 … … 168 168 #include "TestBackendDispatchers.h" 169 169 170 #include < inspector/InspectorFrontendRouter.h>170 #include <JavaScriptCore/InspectorFrontendRouter.h> 171 171 #include <wtf/JSONValues.h> 172 172 #include <wtf/NeverDestroyed.h> … … 263 263 #include "TestFrontendDispatchers.h" 264 264 265 #include < inspector/InspectorFrontendRouter.h>265 #include <JavaScriptCore/InspectorFrontendRouter.h> 266 266 #include <wtf/text/CString.h> 267 267 … … 305 305 #pragma once 306 306 307 #include < inspector/InspectorProtocolTypes.h>307 #include <JavaScriptCore/InspectorProtocolTypes.h> 308 308 #include <wtf/Assertions.h> 309 309 -
trunk/Source/JavaScriptCore/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result
r225243 r228196 73 73 74 74 #include "TestProtocolTypes.h" 75 #include <inspector/InspectorFrontendRouter.h>76 75 #include <JavaScriptCore/InspectorBackendDispatcher.h> 76 #include <JavaScriptCore/InspectorFrontendRouter.h> 77 77 78 78 namespace Inspector { … … 132 132 133 133 #include "TestProtocolObjects.h" 134 #include < inspector/InspectorBackendDispatcher.h>134 #include <JavaScriptCore/InspectorBackendDispatcher.h> 135 135 #include <wtf/text/WTFString.h> 136 136 … … 204 204 #include "TestBackendDispatchers.h" 205 205 206 #include < inspector/InspectorFrontendRouter.h>206 #include <JavaScriptCore/InspectorFrontendRouter.h> 207 207 #include <wtf/JSONValues.h> 208 208 #include <wtf/NeverDestroyed.h> … … 351 351 #include "TestFrontendDispatchers.h" 352 352 353 #include < inspector/InspectorFrontendRouter.h>353 #include <JavaScriptCore/InspectorFrontendRouter.h> 354 354 #include <wtf/text/CString.h> 355 355 … … 401 401 #pragma once 402 402 403 #include < inspector/InspectorProtocolTypes.h>403 #include <JavaScriptCore/InspectorProtocolTypes.h> 404 404 #include <wtf/Assertions.h> 405 405
Note: See TracChangeset
for help on using the changeset viewer.