Changeset 228196 in webkit


Ignore:
Timestamp:
Feb 6, 2018 3:10:52 PM (6 years ago)
Author:
BJ Burg
Message:

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 JavaScriptCore 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.

Location:
trunk/Source/JavaScriptCore
Files:
30 edited

Legend:

Unmodified
Added
Removed
  • trunk/Source/JavaScriptCore/ChangeLog

    r228193 r228196  
     12018-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
    1662018-02-06  Keith Miller  <keith_miller@apple.com>
    267
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py

    r210309 r228196  
    4545
    4646    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()
    5549        }
    5650
     
    5852        sections = []
    5953        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))
    6155        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))
    6357        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))
    6470
    6571    def _generate_handler_declarations_for_domain(self, domain):
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py

    r225231 r228196  
    5050
    5151    def generate_output(self):
    52         headers = [
    53             '"%sProtocolObjects.h"' % self.protocol_name(),
    54             '<inspector/InspectorBackendDispatcher.h>',
    55             '<wtf/text/WTFString.h>']
    56 
    5752        typedefs = [('String', 'ErrorString')]
    58 
    5953        header_args = {
    60             'includes': '\n'.join(['#include ' + header for header in headers]),
     54            'includes': self._generate_secondary_header_includes(),
    6155            'typedefs': '\n'.join(['typedef %s %s;' % typedef for typedef in typedefs]),
    6256        }
     
    7670    # Private methods.
    7771
     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
    7881    def _generate_alternate_handler_forward_declarations_for_domains(self, domains):
    7982        if not domains:
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py

    r225231 r228196  
    4949
    5050    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()
    5852
    5953        if self.model().framework.setting('alternate_dispatchers', False):
     
    7771
    7872    # 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
    7984
    8085    def _generate_handler_class_destructor_for_domain(self, domain):
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py

    r225231 r228196  
    5050
    5151    def generate_output(self):
    52         headers = [
    53             '"%sProtocolObjects.h"' % self.protocol_name(),
    54             '<wtf/JSONValues.h>',
    55             '<wtf/text/WTFString.h>']
    56 
    5752        header_args = {
    58             'includes': '\n'.join(['#include ' + header for header in headers]),
     53            'includes': self._generate_secondary_header_includes(),
    5954            'typedefs': 'class FrontendRouter;',
    6055        }
     
    6863
    6964    # 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))
    7074
    7175    def _generate_anonymous_enum_for_parameter(self, parameter, event):
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py

    r225231 r228196  
    4949
    5050    def generate_output(self):
    51         secondary_headers = [
    52             '<inspector/InspectorFrontendRouter.h>',
    53             '<wtf/text/CString.h>',
    54         ]
    55 
    5651        header_args = {
    5752            '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(),
    5954        }
    6055
     
    6762
    6863    # 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))
    6972
    7073    def _generate_dispatcher_implementations_for_domain(self, domain):
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py

    r225425 r228196  
    5151        self.calculate_types_requiring_shape_assertions(domains)
    5252
    53         headers = set([
    54             '<inspector/InspectorProtocolTypes.h>',
    55             '<wtf/Assertions.h>',
    56         ])
    57 
    5853        header_args = {
    59             'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),
     54            'includes': self._generate_secondary_header_includes(),
    6055            'typedefs': '',
    6156        }
     
    8075    # FIXME: move builders out of classes, uncomment forward declaration
    8176
     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
    8285    def _generate_forward_declarations(self, domains):
    8386        sections = []
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py

    r225231 r228196  
    5757        header_args = {
    5858            '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(),
    6060        }
    6161
     
    7474
    7575    # 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))
    7684
    7785    def _generate_enum_mapping(self):
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generate_objc_backend_dispatcher_header.py

    r210309 r228196  
    6969        return '\n\n'.join(sections)
    7070
     71    # Private methods.
     72
    7173    def _generate_objc_forward_declarations(self):
    7274        lines = []
  • trunk/Source/JavaScriptCore/inspector/scripts/codegen/generator.py

    r225884 r228196  
    120120        return Template(Templates.CopyrightBlock).substitute(None, inputFilename=os.path.basename(self._input_filepath))
    121121
     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
    122141    # These methods are overridden by subclasses.
    123142    def non_supplemental_domains(self):
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/all/expected/definitions-with-mac-platform.json-result

    r225243 r228196  
    7373
    7474#include "TestProtocolTypes.h"
    75 #include <inspector/InspectorFrontendRouter.h>
    7675#include <JavaScriptCore/InspectorBackendDispatcher.h>
     76#include <JavaScriptCore/InspectorFrontendRouter.h>
    7777
    7878namespace Inspector {
     
    132132
    133133#include "TestProtocolObjects.h"
    134 #include <inspector/InspectorBackendDispatcher.h>
     134#include <JavaScriptCore/InspectorBackendDispatcher.h>
    135135#include <wtf/text/WTFString.h>
    136136
     
    204204#include "TestBackendDispatchers.h"
    205205
    206 #include <inspector/InspectorFrontendRouter.h>
     206#include <JavaScriptCore/InspectorFrontendRouter.h>
    207207#include <wtf/JSONValues.h>
    208208#include <wtf/NeverDestroyed.h>
     
    351351#include "TestFrontendDispatchers.h"
    352352
    353 #include <inspector/InspectorFrontendRouter.h>
     353#include <JavaScriptCore/InspectorFrontendRouter.h>
    354354#include <wtf/text/CString.h>
    355355
     
    401401#pragma once
    402402
    403 #include <inspector/InspectorProtocolTypes.h>
     403#include <JavaScriptCore/InspectorProtocolTypes.h>
    404404#include <wtf/Assertions.h>
    405405
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-async-attribute.json-result

    r225425 r228196  
    7676
    7777#include "TestProtocolTypes.h"
    78 #include <inspector/InspectorFrontendRouter.h>
    7978#include <JavaScriptCore/InspectorBackendDispatcher.h>
     79#include <JavaScriptCore/InspectorFrontendRouter.h>
    8080
    8181namespace Inspector {
     
    138138
    139139#include "TestProtocolObjects.h"
    140 #include <inspector/InspectorBackendDispatcher.h>
     140#include <JavaScriptCore/InspectorBackendDispatcher.h>
    141141#include <wtf/text/WTFString.h>
    142142
     
    233233#include "TestBackendDispatchers.h"
    234234
    235 #include <inspector/InspectorFrontendRouter.h>
     235#include <JavaScriptCore/InspectorFrontendRouter.h>
    236236#include <wtf/JSONValues.h>
    237237#include <wtf/NeverDestroyed.h>
     
    567567#include "TestFrontendDispatchers.h"
    568568
    569 #include <inspector/InspectorFrontendRouter.h>
     569#include <JavaScriptCore/InspectorFrontendRouter.h>
    570570#include <wtf/text/CString.h>
    571571
     
    609609#pragma once
    610610
    611 #include <inspector/InspectorProtocolTypes.h>
     611#include <JavaScriptCore/InspectorProtocolTypes.h>
    612612#include <wtf/Assertions.h>
    613613
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/commands-with-optional-call-return-parameters.json-result

    r225425 r228196  
    7373
    7474#include "TestProtocolTypes.h"
    75 #include <inspector/InspectorFrontendRouter.h>
    7675#include <JavaScriptCore/InspectorBackendDispatcher.h>
     76#include <JavaScriptCore/InspectorFrontendRouter.h>
    7777
    7878namespace Inspector {
     
    133133
    134134#include "TestProtocolObjects.h"
    135 #include <inspector/InspectorBackendDispatcher.h>
     135#include <JavaScriptCore/InspectorBackendDispatcher.h>
    136136#include <wtf/text/WTFString.h>
    137137
     
    214214#include "TestBackendDispatchers.h"
    215215
    216 #include <inspector/InspectorFrontendRouter.h>
     216#include <JavaScriptCore/InspectorFrontendRouter.h>
    217217#include <wtf/JSONValues.h>
    218218#include <wtf/NeverDestroyed.h>
     
    468468#include "TestFrontendDispatchers.h"
    469469
    470 #include <inspector/InspectorFrontendRouter.h>
     470#include <JavaScriptCore/InspectorFrontendRouter.h>
    471471#include <wtf/text/CString.h>
    472472
     
    510510#pragma once
    511511
    512 #include <inspector/InspectorProtocolTypes.h>
     512#include <JavaScriptCore/InspectorProtocolTypes.h>
    513513#include <wtf/Assertions.h>
    514514
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/definitions-with-mac-platform.json-result

    r225231 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domain-availability.json-result

    r225231 r228196  
    7575
    7676#include "TestProtocolTypes.h"
    77 #include <inspector/InspectorFrontendRouter.h>
    7877#include <JavaScriptCore/InspectorBackendDispatcher.h>
     78#include <JavaScriptCore/InspectorFrontendRouter.h>
    7979
    8080namespace Inspector {
     
    139139
    140140#include "TestProtocolObjects.h"
    141 #include <inspector/InspectorBackendDispatcher.h>
     141#include <JavaScriptCore/InspectorBackendDispatcher.h>
    142142#include <wtf/text/WTFString.h>
    143143
     
    236236#include "TestBackendDispatchers.h"
    237237
    238 #include <inspector/InspectorFrontendRouter.h>
     238#include <JavaScriptCore/InspectorFrontendRouter.h>
    239239#include <wtf/JSONValues.h>
    240240#include <wtf/NeverDestroyed.h>
     
    420420#include "TestFrontendDispatchers.h"
    421421
    422 #include <inspector/InspectorFrontendRouter.h>
     422#include <JavaScriptCore/InspectorFrontendRouter.h>
    423423#include <wtf/text/CString.h>
    424424
     
    462462#pragma once
    463463
    464 #include <inspector/InspectorProtocolTypes.h>
     464#include <JavaScriptCore/InspectorProtocolTypes.h>
    465465#include <wtf/Assertions.h>
    466466
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/domains-with-varying-command-sizes.json-result

    r225231 r228196  
    8181
    8282#include "TestProtocolTypes.h"
    83 #include <inspector/InspectorFrontendRouter.h>
    8483#include <JavaScriptCore/InspectorBackendDispatcher.h>
     84#include <JavaScriptCore/InspectorFrontendRouter.h>
    8585
    8686namespace Inspector {
     
    151151
    152152#include "TestProtocolObjects.h"
    153 #include <inspector/InspectorBackendDispatcher.h>
     153#include <JavaScriptCore/InspectorBackendDispatcher.h>
    154154#include <wtf/text/WTFString.h>
    155155
     
    260260#include "TestBackendDispatchers.h"
    261261
    262 #include <inspector/InspectorFrontendRouter.h>
     262#include <JavaScriptCore/InspectorFrontendRouter.h>
    263263#include <wtf/JSONValues.h>
    264264#include <wtf/NeverDestroyed.h>
     
    582582#include "TestFrontendDispatchers.h"
    583583
    584 #include <inspector/InspectorFrontendRouter.h>
     584#include <JavaScriptCore/InspectorFrontendRouter.h>
    585585#include <wtf/text/CString.h>
    586586
     
    624624#pragma once
    625625
    626 #include <inspector/InspectorProtocolTypes.h>
     626#include <JavaScriptCore/InspectorProtocolTypes.h>
    627627#include <wtf/Assertions.h>
    628628
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/enum-values.json-result

    r225231 r228196  
    8181
    8282#include "TestProtocolTypes.h"
    83 #include <inspector/InspectorFrontendRouter.h>
    8483#include <JavaScriptCore/InspectorBackendDispatcher.h>
     84#include <JavaScriptCore/InspectorFrontendRouter.h>
    8585
    8686namespace Inspector {
     
    140140
    141141#include "TestProtocolObjects.h"
    142 #include <inspector/InspectorBackendDispatcher.h>
     142#include <JavaScriptCore/InspectorBackendDispatcher.h>
    143143#include <wtf/text/WTFString.h>
    144144
     
    219219#include "TestBackendDispatchers.h"
    220220
    221 #include <inspector/InspectorFrontendRouter.h>
     221#include <JavaScriptCore/InspectorFrontendRouter.h>
    222222#include <wtf/JSONValues.h>
    223223#include <wtf/NeverDestroyed.h>
     
    376376#include "TestFrontendDispatchers.h"
    377377
    378 #include <inspector/InspectorFrontendRouter.h>
     378#include <JavaScriptCore/InspectorFrontendRouter.h>
    379379#include <wtf/text/CString.h>
    380380
     
    429429#pragma once
    430430
    431 #include <inspector/InspectorProtocolTypes.h>
     431#include <JavaScriptCore/InspectorProtocolTypes.h>
    432432#include <wtf/Assertions.h>
    433433
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/events-with-optional-parameters.json-result

    r225425 r228196  
    7373
    7474#include "TestProtocolTypes.h"
    75 #include <inspector/InspectorFrontendRouter.h>
    7675#include <JavaScriptCore/InspectorBackendDispatcher.h>
     76#include <JavaScriptCore/InspectorFrontendRouter.h>
    7777
    7878namespace Inspector {
     
    128128
    129129#include "TestProtocolObjects.h"
    130 #include <inspector/InspectorBackendDispatcher.h>
     130#include <JavaScriptCore/InspectorBackendDispatcher.h>
    131131#include <wtf/text/WTFString.h>
    132132
     
    174174#include "TestBackendDispatchers.h"
    175175
    176 #include <inspector/InspectorFrontendRouter.h>
     176#include <JavaScriptCore/InspectorFrontendRouter.h>
    177177#include <wtf/JSONValues.h>
    178178#include <wtf/NeverDestroyed.h>
     
    278278#include "TestFrontendDispatchers.h"
    279279
    280 #include <inspector/InspectorFrontendRouter.h>
     280#include <JavaScriptCore/InspectorFrontendRouter.h>
    281281#include <wtf/text/CString.h>
    282282
     
    367367#pragma once
    368368
    369 #include <inspector/InspectorProtocolTypes.h>
     369#include <JavaScriptCore/InspectorProtocolTypes.h>
    370370#include <wtf/Assertions.h>
    371371
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/generate-domains-with-feature-guards.json-result

    r225243 r228196  
    7676
    7777#include "TestProtocolTypes.h"
    78 #include <inspector/InspectorFrontendRouter.h>
    7978#include <JavaScriptCore/InspectorBackendDispatcher.h>
     79#include <JavaScriptCore/InspectorFrontendRouter.h>
    8080
    8181namespace Inspector {
     
    137137
    138138#include "TestProtocolObjects.h"
    139 #include <inspector/InspectorBackendDispatcher.h>
     139#include <JavaScriptCore/InspectorBackendDispatcher.h>
    140140#include <wtf/text/WTFString.h>
    141141
     
    215215#include "TestBackendDispatchers.h"
    216216
    217 #include <inspector/InspectorFrontendRouter.h>
     217#include <JavaScriptCore/InspectorFrontendRouter.h>
    218218#include <wtf/JSONValues.h>
    219219#include <wtf/NeverDestroyed.h>
     
    368368#include "TestFrontendDispatchers.h"
    369369
    370 #include <inspector/InspectorFrontendRouter.h>
     370#include <JavaScriptCore/InspectorFrontendRouter.h>
    371371#include <wtf/text/CString.h>
    372372
     
    420420#pragma once
    421421
    422 #include <inspector/InspectorProtocolTypes.h>
     422#include <JavaScriptCore/InspectorProtocolTypes.h>
    423423#include <wtf/Assertions.h>
    424424
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/same-type-id-different-domain.json-result

    r225231 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/shadowed-optional-type-setters.json-result

    r225425 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-aliased-primitive-type.json-result

    r225231 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-array-type.json-result

    r225425 r228196  
    7171
    7272#include "TestProtocolTypes.h"
    73 #include <inspector/InspectorFrontendRouter.h>
    7473#include <JavaScriptCore/InspectorBackendDispatcher.h>
     74#include <JavaScriptCore/InspectorFrontendRouter.h>
    7575
    7676namespace Inspector {
     
    126126
    127127#include "TestProtocolObjects.h"
    128 #include <inspector/InspectorBackendDispatcher.h>
     128#include <JavaScriptCore/InspectorBackendDispatcher.h>
    129129#include <wtf/text/WTFString.h>
    130130
     
    172172#include "TestBackendDispatchers.h"
    173173
    174 #include <inspector/InspectorFrontendRouter.h>
     174#include <JavaScriptCore/InspectorFrontendRouter.h>
    175175#include <wtf/JSONValues.h>
    176176#include <wtf/NeverDestroyed.h>
     
    267267#include "TestFrontendDispatchers.h"
    268268
    269 #include <inspector/InspectorFrontendRouter.h>
     269#include <JavaScriptCore/InspectorFrontendRouter.h>
    270270#include <wtf/text/CString.h>
    271271
     
    309309#pragma once
    310310
    311 #include <inspector/InspectorProtocolTypes.h>
     311#include <JavaScriptCore/InspectorProtocolTypes.h>
    312312#include <wtf/Assertions.h>
    313313
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-enum-type.json-result

    r225231 r228196  
    7272
    7373#include "TestProtocolTypes.h"
    74 #include <inspector/InspectorFrontendRouter.h>
    7574#include <JavaScriptCore/InspectorBackendDispatcher.h>
     75#include <JavaScriptCore/InspectorFrontendRouter.h>
    7676
    7777namespace Inspector {
     
    127127
    128128#include "TestProtocolObjects.h"
    129 #include <inspector/InspectorBackendDispatcher.h>
     129#include <JavaScriptCore/InspectorBackendDispatcher.h>
    130130#include <wtf/text/WTFString.h>
    131131
     
    173173#include "TestBackendDispatchers.h"
    174174
    175 #include <inspector/InspectorFrontendRouter.h>
     175#include <JavaScriptCore/InspectorFrontendRouter.h>
    176176#include <wtf/JSONValues.h>
    177177#include <wtf/NeverDestroyed.h>
     
    268268#include "TestFrontendDispatchers.h"
    269269
    270 #include <inspector/InspectorFrontendRouter.h>
     270#include <JavaScriptCore/InspectorFrontendRouter.h>
    271271#include <wtf/text/CString.h>
    272272
     
    310310#pragma once
    311311
    312 #include <inspector/InspectorProtocolTypes.h>
     312#include <JavaScriptCore/InspectorProtocolTypes.h>
    313313#include <wtf/Assertions.h>
    314314
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-declaration-object-type.json-result

    r225425 r228196  
    7373
    7474#include "TestProtocolTypes.h"
    75 #include <inspector/InspectorFrontendRouter.h>
    7675#include <JavaScriptCore/InspectorBackendDispatcher.h>
     76#include <JavaScriptCore/InspectorFrontendRouter.h>
    7777
    7878namespace Inspector {
     
    128128
    129129#include "TestProtocolObjects.h"
    130 #include <inspector/InspectorBackendDispatcher.h>
     130#include <JavaScriptCore/InspectorBackendDispatcher.h>
    131131#include <wtf/text/WTFString.h>
    132132
     
    174174#include "TestBackendDispatchers.h"
    175175
    176 #include <inspector/InspectorFrontendRouter.h>
     176#include <JavaScriptCore/InspectorFrontendRouter.h>
    177177#include <wtf/JSONValues.h>
    178178#include <wtf/NeverDestroyed.h>
     
    269269#include "TestFrontendDispatchers.h"
    270270
    271 #include <inspector/InspectorFrontendRouter.h>
     271#include <JavaScriptCore/InspectorFrontendRouter.h>
    272272#include <wtf/text/CString.h>
    273273
     
    311311#pragma once
    312312
    313 #include <inspector/InspectorProtocolTypes.h>
     313#include <JavaScriptCore/InspectorProtocolTypes.h>
    314314#include <wtf/Assertions.h>
    315315
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-requiring-runtime-casts.json-result

    r225243 r228196  
    7272
    7373#include "TestProtocolTypes.h"
    74 #include <inspector/InspectorFrontendRouter.h>
    7574#include <JavaScriptCore/InspectorBackendDispatcher.h>
     75#include <JavaScriptCore/InspectorFrontendRouter.h>
    7676
    7777namespace Inspector {
     
    127127
    128128#include "TestProtocolObjects.h"
    129 #include <inspector/InspectorBackendDispatcher.h>
     129#include <JavaScriptCore/InspectorBackendDispatcher.h>
    130130#include <wtf/text/WTFString.h>
    131131
     
    173173#include "TestBackendDispatchers.h"
    174174
    175 #include <inspector/InspectorFrontendRouter.h>
     175#include <JavaScriptCore/InspectorFrontendRouter.h>
    176176#include <wtf/JSONValues.h>
    177177#include <wtf/NeverDestroyed.h>
     
    268268#include "TestFrontendDispatchers.h"
    269269
    270 #include <inspector/InspectorFrontendRouter.h>
     270#include <JavaScriptCore/InspectorFrontendRouter.h>
    271271#include <wtf/text/CString.h>
    272272
     
    310310#pragma once
    311311
    312 #include <inspector/InspectorProtocolTypes.h>
     312#include <JavaScriptCore/InspectorProtocolTypes.h>
    313313#include <wtf/Assertions.h>
    314314
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/type-with-open-parameters.json-result

    r225243 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/generic/expected/worker-supported-domains.json-result

    r225231 r228196  
    7676
    7777#include "TestProtocolTypes.h"
    78 #include <inspector/InspectorFrontendRouter.h>
    7978#include <JavaScriptCore/InspectorBackendDispatcher.h>
     79#include <JavaScriptCore/InspectorFrontendRouter.h>
    8080
    8181namespace Inspector {
     
    140140
    141141#include "TestProtocolObjects.h"
    142 #include <inspector/InspectorBackendDispatcher.h>
     142#include <JavaScriptCore/InspectorBackendDispatcher.h>
    143143#include <wtf/text/WTFString.h>
    144144
     
    237237#include "TestBackendDispatchers.h"
    238238
    239 #include <inspector/InspectorFrontendRouter.h>
     239#include <JavaScriptCore/InspectorFrontendRouter.h>
    240240#include <wtf/JSONValues.h>
    241241#include <wtf/NeverDestroyed.h>
     
    421421#include "TestFrontendDispatchers.h"
    422422
    423 #include <inspector/InspectorFrontendRouter.h>
     423#include <JavaScriptCore/InspectorFrontendRouter.h>
    424424#include <wtf/text/CString.h>
    425425
     
    463463#pragma once
    464464
    465 #include <inspector/InspectorProtocolTypes.h>
     465#include <JavaScriptCore/InspectorProtocolTypes.h>
    466466#include <wtf/Assertions.h>
    467467
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/ios/expected/definitions-with-mac-platform.json-result

    r225231 r228196  
    6767
    6868#include "TestProtocolTypes.h"
    69 #include <inspector/InspectorFrontendRouter.h>
    7069#include <JavaScriptCore/InspectorBackendDispatcher.h>
     70#include <JavaScriptCore/InspectorFrontendRouter.h>
    7171
    7272namespace Inspector {
     
    122122
    123123#include "TestProtocolObjects.h"
    124 #include <inspector/InspectorBackendDispatcher.h>
     124#include <JavaScriptCore/InspectorBackendDispatcher.h>
    125125#include <wtf/text/WTFString.h>
    126126
     
    168168#include "TestBackendDispatchers.h"
    169169
    170 #include <inspector/InspectorFrontendRouter.h>
     170#include <JavaScriptCore/InspectorFrontendRouter.h>
    171171#include <wtf/JSONValues.h>
    172172#include <wtf/NeverDestroyed.h>
     
    263263#include "TestFrontendDispatchers.h"
    264264
    265 #include <inspector/InspectorFrontendRouter.h>
     265#include <JavaScriptCore/InspectorFrontendRouter.h>
    266266#include <wtf/text/CString.h>
    267267
     
    305305#pragma once
    306306
    307 #include <inspector/InspectorProtocolTypes.h>
     307#include <JavaScriptCore/InspectorProtocolTypes.h>
    308308#include <wtf/Assertions.h>
    309309
  • trunk/Source/JavaScriptCore/inspector/scripts/tests/mac/expected/definitions-with-mac-platform.json-result

    r225243 r228196  
    7373
    7474#include "TestProtocolTypes.h"
    75 #include <inspector/InspectorFrontendRouter.h>
    7675#include <JavaScriptCore/InspectorBackendDispatcher.h>
     76#include <JavaScriptCore/InspectorFrontendRouter.h>
    7777
    7878namespace Inspector {
     
    132132
    133133#include "TestProtocolObjects.h"
    134 #include <inspector/InspectorBackendDispatcher.h>
     134#include <JavaScriptCore/InspectorBackendDispatcher.h>
    135135#include <wtf/text/WTFString.h>
    136136
     
    204204#include "TestBackendDispatchers.h"
    205205
    206 #include <inspector/InspectorFrontendRouter.h>
     206#include <JavaScriptCore/InspectorFrontendRouter.h>
    207207#include <wtf/JSONValues.h>
    208208#include <wtf/NeverDestroyed.h>
     
    351351#include "TestFrontendDispatchers.h"
    352352
    353 #include <inspector/InspectorFrontendRouter.h>
     353#include <JavaScriptCore/InspectorFrontendRouter.h>
    354354#include <wtf/text/CString.h>
    355355
     
    401401#pragma once
    402402
    403 #include <inspector/InspectorProtocolTypes.h>
     403#include <JavaScriptCore/InspectorProtocolTypes.h>
    404404#include <wtf/Assertions.h>
    405405
Note: See TracChangeset for help on using the changeset viewer.