Web Inspector: protocol generator should prefix C++ filenames with the protocol group
authorbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 18:18:50 +0000 (18:18 +0000)
committerbburg@apple.com <bburg@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Mar 2016 18:18:50 +0000 (18:18 +0000)
https://bugs.webkit.org/show_bug.cgi?id=155859
<rdar://problem/25349859>

Reviewed by Alex Christensen and Joseph Pecoraro.

Source/JavaScriptCore:

Like for generated Objective-C files, we should use the 'protocol group' name
as the prefix for generated C++ files so that headers from different protocol
groups have unambiguous names.

* inspector/scripts/codegen/cpp_generator.py:
(CppGenerator):
(CppGenerator.__init__):
(CppGenerator.protocol_name):
Make all C++ code generators extend the CppGenerator python class and use the
protocol_name() instance method. This matches a recent change to the ObjC generator.

* inspector/scripts/codegen/cpp_generator_templates.py:
(CppGeneratorTemplates):
Drive-by cleanup to use #pragma once instead of header guards.

* inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py:
(CppAlternateBackendDispatcherHeaderGenerator):
(CppAlternateBackendDispatcherHeaderGenerator.__init__):
(CppAlternateBackendDispatcherHeaderGenerator.output_filename):
(CppAlternateBackendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
(CppBackendDispatcherHeaderGenerator):
(CppBackendDispatcherHeaderGenerator.__init__):
(CppBackendDispatcherHeaderGenerator.output_filename):
(CppBackendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
(CppBackendDispatcherImplementationGenerator):
(CppBackendDispatcherImplementationGenerator.__init__):
(CppBackendDispatcherImplementationGenerator.output_filename):
(CppBackendDispatcherImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
(CppFrontendDispatcherHeaderGenerator):
(CppFrontendDispatcherHeaderGenerator.__init__):
(CppFrontendDispatcherHeaderGenerator.output_filename):
(CppFrontendDispatcherHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
(CppFrontendDispatcherImplementationGenerator):
(CppFrontendDispatcherImplementationGenerator.__init__):
(CppFrontendDispatcherImplementationGenerator.output_filename):
(CppFrontendDispatcherImplementationGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
(CppProtocolTypesHeaderGenerator):
(CppProtocolTypesHeaderGenerator.__init__):
(CppProtocolTypesHeaderGenerator.output_filename):
(CppProtocolTypesHeaderGenerator.generate_output):
* inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
(CppProtocolTypesImplementationGenerator):
(CppProtocolTypesImplementationGenerator.__init__):
(CppProtocolTypesImplementationGenerator.output_filename):
(CppProtocolTypesImplementationGenerator.generate_output):
Use the protocol_name() instance method to compute generated protocol file names.

* inspector/scripts/codegen/models.py:
Explicitly set the 'protocol_group' for the Inspector protocol.

Rebaseline generator test results.

* inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
* inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
* inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
* inspector/scripts/tests/expected/enum-values.json-result:
* inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
* inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
* inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
* inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
* inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
* inspector/scripts/tests/expected/type-declaration-array-type.json-result:
* inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
* inspector/scripts/tests/expected/type-declaration-object-type.json-result:
* inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:

Source/WebKit2:

Adjust header include and build system paths.

* CMakeLists.txt:
Revert the workaround introduced in r198659 since this change fixes the
underlying issue.

* DerivedSources.make:
* UIProcess/Automation/WebAutomationSession.cpp:
* UIProcess/Automation/WebAutomationSession.h:
* WebKit2.xcodeproj/project.pbxproj:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@198678 268f45cc-cd09-0410-ab3c-d52691b4dbfc

30 files changed:
Source/JavaScriptCore/ChangeLog
Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator.py
Source/JavaScriptCore/inspector/scripts/codegen/cpp_generator_templates.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_header.py
Source/JavaScriptCore/inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py
Source/JavaScriptCore/inspector/scripts/codegen/models.py
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/enum-values.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result
Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result
Source/WebKit2/CMakeLists.txt
Source/WebKit2/ChangeLog
Source/WebKit2/DerivedSources.make
Source/WebKit2/UIProcess/Automation/WebAutomationSession.cpp
Source/WebKit2/UIProcess/Automation/WebAutomationSession.h
Source/WebKit2/WebKit2.xcodeproj/project.pbxproj

index 2f79a51..90a0c2e 100644 (file)
@@ -1,3 +1,82 @@
+2016-03-25  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: protocol generator should prefix C++ filenames with the protocol group
+        https://bugs.webkit.org/show_bug.cgi?id=155859
+        <rdar://problem/25349859>
+
+        Reviewed by Alex Christensen and Joseph Pecoraro.
+
+        Like for generated Objective-C files, we should use the 'protocol group' name
+        as the prefix for generated C++ files so that headers from different protocol
+        groups have unambiguous names.
+
+        * inspector/scripts/codegen/cpp_generator.py:
+        (CppGenerator):
+        (CppGenerator.__init__):
+        (CppGenerator.protocol_name):
+        Make all C++ code generators extend the CppGenerator python class and use the
+        protocol_name() instance method. This matches a recent change to the ObjC generator.
+
+        * inspector/scripts/codegen/cpp_generator_templates.py:
+        (CppGeneratorTemplates):
+        Drive-by cleanup to use #pragma once instead of header guards.
+
+        * inspector/scripts/codegen/generate_cpp_alternate_backend_dispatcher_header.py:
+        (CppAlternateBackendDispatcherHeaderGenerator):
+        (CppAlternateBackendDispatcherHeaderGenerator.__init__):
+        (CppAlternateBackendDispatcherHeaderGenerator.output_filename):
+        (CppAlternateBackendDispatcherHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_backend_dispatcher_header.py:
+        (CppBackendDispatcherHeaderGenerator):
+        (CppBackendDispatcherHeaderGenerator.__init__):
+        (CppBackendDispatcherHeaderGenerator.output_filename):
+        (CppBackendDispatcherHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_backend_dispatcher_implementation.py:
+        (CppBackendDispatcherImplementationGenerator):
+        (CppBackendDispatcherImplementationGenerator.__init__):
+        (CppBackendDispatcherImplementationGenerator.output_filename):
+        (CppBackendDispatcherImplementationGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_header.py:
+        (CppFrontendDispatcherHeaderGenerator):
+        (CppFrontendDispatcherHeaderGenerator.__init__):
+        (CppFrontendDispatcherHeaderGenerator.output_filename):
+        (CppFrontendDispatcherHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_frontend_dispatcher_implementation.py:
+        (CppFrontendDispatcherImplementationGenerator):
+        (CppFrontendDispatcherImplementationGenerator.__init__):
+        (CppFrontendDispatcherImplementationGenerator.output_filename):
+        (CppFrontendDispatcherImplementationGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_protocol_types_header.py:
+        (CppProtocolTypesHeaderGenerator):
+        (CppProtocolTypesHeaderGenerator.__init__):
+        (CppProtocolTypesHeaderGenerator.output_filename):
+        (CppProtocolTypesHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_cpp_protocol_types_implementation.py:
+        (CppProtocolTypesImplementationGenerator):
+        (CppProtocolTypesImplementationGenerator.__init__):
+        (CppProtocolTypesImplementationGenerator.output_filename):
+        (CppProtocolTypesImplementationGenerator.generate_output):
+        Use the protocol_name() instance method to compute generated protocol file names.
+
+        * inspector/scripts/codegen/models.py:
+        Explicitly set the 'protocol_group' for the Inspector protocol.
+
+        Rebaseline generator test results.
+
+        * inspector/scripts/tests/expected/commands-with-async-attribute.json-result:
+        * inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result:
+        * inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result:
+        * inspector/scripts/tests/expected/enum-values.json-result:
+        * inspector/scripts/tests/expected/events-with-optional-parameters.json-result:
+        * inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result:
+        * inspector/scripts/tests/expected/same-type-id-different-domain.json-result:
+        * inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result:
+        * inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-array-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-enum-type.json-result:
+        * inspector/scripts/tests/expected/type-declaration-object-type.json-result:
+        * inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result:
+
 2016-03-25  Keith Miller  <keith_miller@apple.com>
 
         putByIndexBeyondVectorLengthWithoutAttributes should not crash if it can't ensureLength
index edd330d..d8d6335 100644 (file)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@ import logging
 import os.path
 import re
 
-from generator import ucfirst
+from generator import ucfirst, Generator
 from models import PrimitiveType, ObjectType, ArrayType, EnumType, AliasedType, Frameworks
 
 log = logging.getLogger('global')
@@ -43,10 +43,12 @@ _PRIMITIVE_TO_CPP_NAME_MAP = {
     'any': 'Inspector::InspectorValue'
 }
 
-# This class contains extra static methods used for generation, but does
-# not participate in any inheritance hierarchy. File generators should
-# extend the generic "Generator" class instead.
-class CppGenerator:
+class CppGenerator(Generator):
+    def __init__(self, model, input_filepath):
+        Generator.__init__(self, model, input_filepath)
+
+    def protocol_name(self):
+        return self.model().framework.setting('protocol_group', '')
 
     # Miscellaneous text manipulation routines.
     @staticmethod
index be2e979..b2523ff 100755 (executable)
@@ -30,8 +30,7 @@
 class CppGeneratorTemplates:
 
     HeaderPrelude = (
-    """#ifndef ${headerGuardString}
-#define ${headerGuardString}
+    """#pragma once
 
 ${includes}
 
@@ -40,9 +39,7 @@ namespace Inspector {
 ${typedefs}""")
 
     HeaderPostlude = (
-    """} // namespace Inspector
-
-#endif // !defined(${headerGuardString})""")
+    """} // namespace Inspector""")
 
     ImplementationPrelude = (
     """#include "config.h"
@@ -57,8 +54,7 @@ namespace Inspector {""")
 """)
 
     AlternateDispatchersHeaderPrelude = (
-    """#ifndef ${headerGuardString}
-#define ${headerGuardString}
+    """#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
@@ -78,9 +74,7 @@ private:
     AlternateDispatchersHeaderPostlude = (
     """} // namespace Inspector
 
-#endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-
-#endif // !defined(${headerGuardString})""")
+#endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)""")
 
     AlternateBackendDispatcherHeaderDomainHandlerInterfaceDeclaration = (
     """class Alternate${domainName}BackendDispatcher : public AlternateBackendDispatcher {
index 375ce05..2975615 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -32,27 +32,25 @@ from string import Template
 
 from cpp_generator import CppGenerator
 from cpp_generator_templates import CppGeneratorTemplates as CppTemplates
-from generator import Generator
 
 log = logging.getLogger('global')
 
 
-class CppAlternateBackendDispatcherHeaderGenerator(Generator):
+class CppAlternateBackendDispatcherHeaderGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return 'InspectorAlternateBackendDispatchers.h'
+        return '%sAlternateBackendDispatchers.h' % self.protocol_name()
 
     def generate_output(self):
         headers = [
-            '"InspectorProtocolTypes.h"',
+            '"%sProtocolTypes.h"' % self.protocol_name(),
             '<inspector/InspectorFrontendRouter.h>',
             '<JavaScriptCore/InspectorBackendDispatcher.h>',
         ]
 
         header_args = {
-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),
             'includes': '\n'.join(['#include ' + header for header in headers]),
         }
 
index 5ebd82f..8503f6b 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,26 +38,25 @@ from models import EnumType
 log = logging.getLogger('global')
 
 
-class CppBackendDispatcherHeaderGenerator(Generator):
+class CppBackendDispatcherHeaderGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorBackendDispatchers.h"
+        return "%sBackendDispatchers.h" % self.protocol_name()
 
     def domains_to_generate(self):
         return filter(lambda domain: len(domain.commands) > 0, Generator.domains_to_generate(self))
 
     def generate_output(self):
         headers = [
-            '"InspectorProtocolObjects.h"',
+            '"%sProtocolObjects.h"' % self.protocol_name(),
             '<inspector/InspectorBackendDispatcher.h>',
             '<wtf/text/WTFString.h>']
 
         typedefs = [('String', 'ErrorString')]
 
         header_args = {
-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),
             'includes': '\n'.join(['#include ' + header for header in headers]),
             'typedefs': '\n'.join(['typedef %s %s;' % typedef for typedef in typedefs]),
         }
index 0a46183..38d8aa7 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,12 @@ from models import ObjectType, ArrayType
 log = logging.getLogger('global')
 
 
-class CppBackendDispatcherImplementationGenerator(Generator):
+class CppBackendDispatcherImplementationGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorBackendDispatchers.cpp"
+        return "%sBackendDispatchers.cpp" % self.protocol_name()
 
     def domains_to_generate(self):
         return filter(lambda domain: len(domain.commands) > 0, Generator.domains_to_generate(self))
@@ -59,11 +59,11 @@ class CppBackendDispatcherImplementationGenerator(Generator):
         if self.model().framework.setting('alternate_dispatchers', False):
             secondary_includes.append('')
             secondary_includes.append('#if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)')
-            secondary_includes.append('#include "InspectorAlternateBackendDispatchers.h"')
+            secondary_includes.append('#include "%sAlternateBackendDispatchers.h"' % self.protocol_name())
             secondary_includes.append('#endif')
 
         header_args = {
-            'primaryInclude': '"InspectorBackendDispatchers.h"',
+            'primaryInclude': '"%sBackendDispatchers.h"' % self.protocol_name(),
             'secondaryIncludes': '\n'.join(secondary_includes),
         }
 
index 58a3cb9..f59b984 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,24 +38,23 @@ from models import EnumType
 log = logging.getLogger('global')
 
 
-class CppFrontendDispatcherHeaderGenerator(Generator):
+class CppFrontendDispatcherHeaderGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorFrontendDispatchers.h"
+        return "%sFrontendDispatchers.h" % self.protocol_name()
 
     def domains_to_generate(self):
         return filter(lambda domain: len(domain.events) > 0, Generator.domains_to_generate(self))
 
     def generate_output(self):
         headers = [
-            '"InspectorProtocolObjects.h"',
+            '"%sProtocolObjects.h"' % self.protocol_name(),
             '<inspector/InspectorValues.h>',
             '<wtf/text/WTFString.h>']
 
         header_args = {
-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),
             'includes': '\n'.join(['#include ' + header for header in headers]),
             'typedefs': 'class FrontendRouter;',
         }
index ea46aaf..1a82f28 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014, 2015 Apple Inc. All rights reserved.
+# Copyright (c) 2014-2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,12 @@ from models import ObjectType, ArrayType
 log = logging.getLogger('global')
 
 
-class CppFrontendDispatcherImplementationGenerator(Generator):
+class CppFrontendDispatcherImplementationGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorFrontendDispatchers.cpp"
+        return "%sFrontendDispatchers.cpp" % self.protocol_name()
 
     def domains_to_generate(self):
         return filter(lambda domain: len(domain.events) > 0, Generator.domains_to_generate(self))
@@ -54,7 +54,7 @@ class CppFrontendDispatcherImplementationGenerator(Generator):
         ]
 
         header_args = {
-            'primaryInclude': '"InspectorFrontendDispatchers.h"',
+            'primaryInclude': '"%sFrontendDispatchers.h"' % self.protocol_name(),
             'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
         }
 
index 6753e2d..b5b3948 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -38,12 +38,12 @@ from models import EnumType, ObjectType, PrimitiveType, AliasedType, ArrayType,
 log = logging.getLogger('global')
 
 
-class CppProtocolTypesHeaderGenerator(Generator):
+class CppProtocolTypesHeaderGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorProtocolObjects.h"
+        return "%sProtocolObjects.h" % self.protocol_name()
 
     def generate_output(self):
         domains = self.domains_to_generate()
@@ -57,7 +57,6 @@ class CppProtocolTypesHeaderGenerator(Generator):
         export_macro = self.model().framework.setting('export_macro', None)
 
         header_args = {
-            'headerGuardString': re.sub('\W+', '_', self.output_filename()),
             'includes': '\n'.join(['#include ' + header for header in sorted(headers)]),
             'typedefs': '',
         }
index 2c263b5..4aa78c1 100755 (executable)
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 #
-# Copyright (c) 2014 Apple Inc. All rights reserved.
+# Copyright (c) 2014, 2016 Apple Inc. All rights reserved.
 # Copyright (c) 2014 University of Washington. All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -37,12 +37,12 @@ from models import AliasedType, ArrayType, EnumType, ObjectType
 log = logging.getLogger('global')
 
 
-class CppProtocolTypesImplementationGenerator(Generator):
+class CppProtocolTypesImplementationGenerator(CppGenerator):
     def __init__(self, model, input_filepath):
-        Generator.__init__(self, model, input_filepath)
+        CppGenerator.__init__(self, model, input_filepath)
 
     def output_filename(self):
-        return "InspectorProtocolObjects.cpp"
+        return "%sProtocolObjects.cpp" % self.protocol_name()
 
     def generate_output(self):
         domains = self.domains_to_generate()
@@ -51,7 +51,7 @@ class CppProtocolTypesImplementationGenerator(Generator):
         secondary_headers = ['<wtf/text/CString.h>']
 
         header_args = {
-            'primaryInclude': '"InspectorProtocolObjects.h"',
+            'primaryInclude': '"%sProtocolObjects.h"' % self.protocol_name(),
             'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
         }
 
index 3f40be8..ccb8886 100755 (executable)
@@ -42,6 +42,7 @@ _FRAMEWORK_CONFIG_MAP = {
     "Global": {
     },
     "JavaScriptCore": {
+        "protocol_group": "Inspector",
         "export_macro": "JS_EXPORT_PRIVATE",
         "alternate_dispatchers": True,
     },
index 5b3be04..93442f2 100644 (file)
@@ -39,7 +39,7 @@ InspectorBackend.registerCommand("Database.executeSQLAsync", [{"name": "database
 InspectorBackend.activateDomain("Database");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -70,12 +70,11 @@ InspectorBackend.activateDomain("Database");
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -102,11 +101,9 @@ public:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -137,10 +134,9 @@ public:
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -200,11 +196,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -236,7 +230,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -244,7 +238,7 @@ private:
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -492,9 +486,9 @@ void DatabaseBackendDispatcher::executeSQLAsync(long requestId, RefPtr<Inspector
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -525,10 +519,9 @@ void DatabaseBackendDispatcher::executeSQLAsync(long requestId, RefPtr<Inspector
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -537,11 +530,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -573,7 +564,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -582,9 +573,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -615,8 +606,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-async-attribute.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -729,11 +719,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -765,7 +753,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -793,7 +781,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 968cced..f974f77 100644 (file)
@@ -36,7 +36,7 @@ InspectorBackend.registerCommand("Database.executeNoOptionalParameters", [{"name
 InspectorBackend.activateDomain("Database");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -67,12 +67,11 @@ InspectorBackend.activateDomain("Database");
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -97,11 +96,9 @@ public:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -132,10 +129,9 @@ public:
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -181,11 +177,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -217,7 +211,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -225,7 +219,7 @@ private:
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -393,9 +387,9 @@ void DatabaseBackendDispatcher::executeNoOptionalParameters(long requestId, RefP
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -426,10 +420,9 @@ void DatabaseBackendDispatcher::executeNoOptionalParameters(long requestId, RefP
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -438,11 +431,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -474,7 +465,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -483,9 +474,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -516,8 +507,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from commands-with-optional-call-return-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -630,11 +620,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -666,7 +654,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -694,7 +682,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 2434bda..e52aa36 100644 (file)
@@ -44,7 +44,7 @@ InspectorBackend.registerCommand("Network3.loadResource7", [], []);
 InspectorBackend.activateDomain("Network3");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -75,12 +75,11 @@ InspectorBackend.activateDomain("Network3");
 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -115,11 +114,9 @@ public:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -150,10 +147,9 @@ public:
 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -227,11 +223,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -263,7 +257,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -271,7 +265,7 @@ private:
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -507,9 +501,9 @@ void Network3BackendDispatcher::loadResource7(long requestId, RefPtr<InspectorOb
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -540,10 +534,9 @@ void Network3BackendDispatcher::loadResource7(long requestId, RefPtr<InspectorOb
 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -552,11 +545,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -588,7 +579,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -597,9 +588,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -630,8 +621,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from domains-with-varying-command-sizes.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -663,11 +653,9 @@ template<typename T> String getEnumConstantValue(T enumValue)
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -699,7 +687,7 @@ template<typename T> String getEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -720,7 +708,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 12cd783..4c1d4a7 100644 (file)
@@ -43,7 +43,7 @@ InspectorBackend.registerEvent("EventDomain.eventWithEnumParameter", ["parameter
 InspectorBackend.activateDomain("EventDomain");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -74,12 +74,11 @@ InspectorBackend.activateDomain("EventDomain");
 // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -103,11 +102,9 @@ public:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -138,10 +135,9 @@ public:
 // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -185,11 +181,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,7 +215,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -229,7 +223,7 @@ private:
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -286,9 +280,9 @@ void CommandDomainBackendDispatcher::commandWithEnumReturnValue(long requestId,
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -319,10 +313,9 @@ void CommandDomainBackendDispatcher::commandWithEnumReturnValue(long requestId,
 // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -345,11 +338,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -381,7 +372,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -401,9 +392,9 @@ void EventDomainFrontendDispatcher::eventWithEnumParameter(Parameter parameter)
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -434,8 +425,7 @@ void EventDomainFrontendDispatcher::eventWithEnumParameter(Parameter parameter)
 // DO NOT EDIT THIS FILE. It is automatically generated from enum-values.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -477,11 +467,9 @@ enum class TypeDomainEnum {
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -513,7 +501,7 @@ enum class TypeDomainEnum {
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -543,7 +531,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 0996ce0..7b64fc6 100644 (file)
@@ -36,7 +36,7 @@ InspectorBackend.registerEvent("Database.didExecuteNoOptionalParameters", ["colu
 InspectorBackend.activateDomain("Database");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -67,12 +67,11 @@ InspectorBackend.activateDomain("Database");
 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -92,11 +91,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -127,10 +124,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -141,11 +137,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -177,7 +171,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -185,7 +179,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -194,9 +188,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -227,10 +221,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -248,11 +241,9 @@ private:
 };
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -284,7 +275,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -340,9 +331,9 @@ void DatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -373,8 +364,7 @@ void DatabaseFrontendDispatcher::didExecuteNoOptionalParameters(RefPtr<Inspector
 // DO NOT EDIT THIS FILE. It is automatically generated from events-with-optional-parameters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -481,11 +471,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -517,7 +505,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -538,7 +526,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index e1aa6e7..368ce70 100644 (file)
@@ -39,7 +39,7 @@ InspectorBackend.registerEvent("Network3.resourceLoaded", []);
 InspectorBackend.activateDomain("Network3");
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -70,12 +70,11 @@ InspectorBackend.activateDomain("Network3");
 // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -101,11 +100,9 @@ public:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -136,10 +133,9 @@ public:
 // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -182,11 +178,9 @@ private:
 #endif // PLATFORM(WEB_COMMANDS)
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -218,7 +212,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -226,7 +220,7 @@ private:
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -283,9 +277,9 @@ void Network1BackendDispatcher::loadResource(long requestId, RefPtr<InspectorObj
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -316,10 +310,9 @@ void Network1BackendDispatcher::loadResource(long requestId, RefPtr<InspectorObj
 // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -338,11 +331,9 @@ private:
 #endif // PLATFORM(WEB_EVENTS)
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -374,7 +365,7 @@ private:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -393,9 +384,9 @@ void Network3FrontendDispatcher::resourceLoaded()
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -426,8 +417,7 @@ void Network3FrontendDispatcher::resourceLoaded()
 // DO NOT EDIT THIS FILE. It is automatically generated from generate-domains-with-feature-guards.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -530,11 +520,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -566,7 +554,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -587,7 +575,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 1609bac..953c1aa 100644 (file)
@@ -30,7 +30,7 @@
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -86,11 +85,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -121,10 +118,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -135,11 +131,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -171,7 +165,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -179,7 +173,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -188,9 +182,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,10 +215,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -233,11 +226,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -269,7 +260,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -278,9 +269,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -311,8 +302,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from same-type-id-different-domain.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -349,11 +339,9 @@ template<typename T> String getEnumConstantValue(T enumValue)
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -385,7 +373,7 @@ template<typename T> String getEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -406,7 +394,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index d739cc3..86b3d7d 100644 (file)
@@ -30,7 +30,7 @@
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -86,11 +85,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -121,10 +118,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -135,11 +131,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -171,7 +165,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -179,7 +173,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -188,9 +182,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,10 +215,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -233,11 +226,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -269,7 +260,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -278,9 +269,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -311,8 +302,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from shadowed-optional-type-setters.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -419,11 +409,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -455,7 +443,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -479,7 +467,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 5a2667c..0b96c96 100644 (file)
@@ -30,7 +30,7 @@
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -86,11 +85,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -121,10 +118,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -135,11 +131,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -171,7 +165,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -179,7 +173,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -188,9 +182,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,10 +215,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -233,11 +226,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -269,7 +260,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -278,9 +269,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -311,8 +302,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-aliased-primitive-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -344,11 +334,9 @@ template<typename T> String getEnumConstantValue(T enumValue)
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -380,7 +368,7 @@ template<typename T> String getEnumConstantValue(T enumValue)
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -401,7 +389,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index df2bb06..850d398 100644 (file)
@@ -33,7 +33,7 @@
 InspectorBackend.registerEnum("Debugger.Reason", {Died: "Died", Fainted: "Fainted", Hungry: "Hungry"});
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -64,12 +64,11 @@ InspectorBackend.registerEnum("Debugger.Reason", {Died: "Died", Fainted: "Fainte
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -89,11 +88,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -124,10 +121,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -138,11 +134,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -174,7 +168,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -182,7 +176,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -191,9 +185,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -224,10 +218,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -236,11 +229,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -272,7 +263,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -281,9 +272,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -314,8 +305,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-array-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -369,11 +359,9 @@ enum class Reason {
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -405,7 +393,7 @@ enum class Reason {
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -429,7 +417,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 717b4d0..7671d31 100644 (file)
@@ -34,7 +34,7 @@ InspectorBackend.registerEnum("Runtime.FarmAnimals", {Pigs: "Pigs", Cows: "Cows"
 InspectorBackend.registerEnum("Runtime.TwoLeggedAnimals", {Ducks: "Ducks", Hens: "Hens", Crows: "Crows", Flamingos: "Flamingos"});
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -65,12 +65,11 @@ InspectorBackend.registerEnum("Runtime.TwoLeggedAnimals", {Ducks: "Ducks", Hens:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -90,11 +89,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -125,10 +122,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -139,11 +135,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -175,7 +169,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -183,7 +177,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -192,9 +186,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -225,10 +219,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -237,11 +230,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -273,7 +264,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -282,9 +273,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -315,8 +306,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-enum-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -366,11 +356,9 @@ enum class TwoLeggedAnimals {
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -402,7 +390,7 @@ enum class TwoLeggedAnimals {
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -430,7 +418,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index cfcc3d1..ccaa89d 100644 (file)
@@ -30,7 +30,7 @@
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -86,11 +85,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -121,10 +118,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -135,11 +131,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -171,7 +165,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -179,7 +173,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -188,9 +182,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,10 +215,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -233,11 +226,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -269,7 +260,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -278,9 +269,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -311,8 +302,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-declaration-object-type.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -809,11 +799,9 @@ public:
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -845,7 +833,7 @@ public:
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -866,7 +854,7 @@ String getEnumConstantValue(int code) {
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index 48a2071..93257ca 100644 (file)
@@ -34,7 +34,7 @@ InspectorBackend.registerEnum("Test.UncastedAnimals", {Pigs: "Pigs", Cows: "Cows
 InspectorBackend.registerEnum("Test.CastedAnimals", {Ducks: "Ducks", Hens: "Hens", Crows: "Crows", Flamingos: "Flamingos"});
 ### End File: InspectorBackendCommands.js
 
-### Begin File: InspectorAlternateBackendDispatchers.h
+### Begin File: TestAlternateBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -65,12 +65,11 @@ InspectorBackend.registerEnum("Test.CastedAnimals", {Ducks: "Ducks", Hens: "Hens
 // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorAlternateBackendDispatchers_h
-#define InspectorAlternateBackendDispatchers_h
+#pragma once
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
 
-#include "InspectorProtocolTypes.h"
+#include "TestProtocolTypes.h"
 #include <inspector/InspectorFrontendRouter.h>
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 
@@ -90,11 +89,9 @@ private:
 } // namespace Inspector
 
 #endif // ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
+### End File: TestAlternateBackendDispatchers.h
 
-#endif // !defined(InspectorAlternateBackendDispatchers_h)
-### End File: InspectorAlternateBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.h
+### Begin File: TestBackendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -125,10 +122,9 @@ private:
 // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorBackendDispatcher.h>
 #include <wtf/text/WTFString.h>
 
@@ -139,11 +135,9 @@ typedef String ErrorString;
 
 
 } // namespace Inspector
+### End File: TestBackendDispatchers.h
 
-#endif // !defined(InspectorBackendDispatchers_h)
-### End File: InspectorBackendDispatchers.h
-
-### Begin File: InspectorBackendDispatchers.cpp
+### Begin File: TestBackendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -175,7 +169,7 @@ typedef String ErrorString;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorBackendDispatchers.h"
+#include "TestBackendDispatchers.h"
 
 #include <inspector/InspectorFrontendRouter.h>
 #include <inspector/InspectorValues.h>
@@ -183,7 +177,7 @@ typedef String ErrorString;
 #include <wtf/text/CString.h>
 
 #if ENABLE(INSPECTOR_ALTERNATE_DISPATCHERS)
-#include "InspectorAlternateBackendDispatchers.h"
+#include "TestAlternateBackendDispatchers.h"
 #endif
 
 namespace Inspector {
@@ -192,9 +186,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorBackendDispatchers.cpp
+### End File: TestBackendDispatchers.cpp
 
-### Begin File: InspectorFrontendDispatchers.h
+### Begin File: TestFrontendDispatchers.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -225,10 +219,9 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorFrontendDispatchers_h
-#define InspectorFrontendDispatchers_h
+#pragma once
 
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 #include <inspector/InspectorValues.h>
 #include <wtf/text/WTFString.h>
 
@@ -237,11 +230,9 @@ namespace Inspector {
 class FrontendRouter;
 
 } // namespace Inspector
+### End File: TestFrontendDispatchers.h
 
-#endif // !defined(InspectorFrontendDispatchers_h)
-### End File: InspectorFrontendDispatchers.h
-
-### Begin File: InspectorFrontendDispatchers.cpp
+### Begin File: TestFrontendDispatchers.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -273,7 +264,7 @@ class FrontendRouter;
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorFrontendDispatchers.h"
+#include "TestFrontendDispatchers.h"
 
 #include "InspectorFrontendRouter.h"
 #include <wtf/text/CString.h>
@@ -282,9 +273,9 @@ namespace Inspector {
 
 } // namespace Inspector
 
-### End File: InspectorFrontendDispatchers.cpp
+### End File: TestFrontendDispatchers.cpp
 
-### Begin File: InspectorProtocolObjects.h
+### Begin File: TestProtocolObjects.h
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -315,8 +306,7 @@ namespace Inspector {
 // DO NOT EDIT THIS FILE. It is automatically generated from type-requiring-runtime-casts.json
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
-#ifndef InspectorProtocolObjects_h
-#define InspectorProtocolObjects_h
+#pragma once
 
 #include <inspector/InspectorProtocolTypes.h>
 #include <wtf/Assertions.h>
@@ -588,11 +578,9 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
 } // namespace Protocol
 
 } // namespace Inspector
+### End File: TestProtocolObjects.h
 
-#endif // !defined(InspectorProtocolObjects_h)
-### End File: InspectorProtocolObjects.h
-
-### Begin File: InspectorProtocolObjects.cpp
+### Begin File: TestProtocolObjects.cpp
 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -624,7 +612,7 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
 // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
 
 #include "config.h"
-#include "InspectorProtocolObjects.h"
+#include "TestProtocolObjects.h"
 
 #include <wtf/text/CString.h>
 
@@ -757,7 +745,7 @@ void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasE
 
 } // namespace Inspector
 
-### End File: InspectorProtocolObjects.cpp
+### End File: TestProtocolObjects.cpp
 
 ### Begin File: TestProtocolBackendDispatchers.h
 /*
index dc8be5b..c8f66e7 100644 (file)
@@ -145,6 +145,7 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${JAVASCRIPTCORE_DIR}/runtime"
     "${WTF_DIR}"
     "${DERIVED_SOURCES_DIR}"
+    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
     "${DERIVED_SOURCES_WEBCORE_DIR}"
     "${DERIVED_SOURCES_WEBKIT2_DIR}"
     "${DERIVED_SOURCES_WEBKIT2_DIR}/include"
@@ -153,11 +154,6 @@ set(WebKit2_INCLUDE_DIRECTORIES
     "${CMAKE_SOURCE_DIR}/WebKitLibraries"
 )
 
-# FIXME: We shouldn't need to have this after DERIVED_SOURCES_WEBCORE_DIR, but there are too many files named InspectorBackendDispatchers.h on Mac.
-list(APPEND WebKit2_INCLUDE_DIRECTORIES
-    "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
-)
-
 set(PROTOCOL_GENERATOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
 
 set(WebKit2_SYSTEM_INCLUDE_DIRECTORIES
@@ -786,20 +782,20 @@ set(WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS
 )
 
 add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorProtocolObjects.h ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorProtocolObjects.cpp
+    OUTPUT ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp
     MAIN_DEPENDENCY ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
     DEPENDS ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_SCRIPTS}
     COMMAND ${PYTHON_EXECUTABLE} ${PROTOCOL_GENERATOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBKIT2_DIR}" --framework WebKit --backend ${WebKit2_AUTOMATION_PROTOCOL_GENERATOR_INPUTS}
     VERBATIM)
 
 list(APPEND WebKit2_HEADERS
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorBackendDispatchers.h
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorProtocolObjects.h
+    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.h
+    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.h
 )
 
 list(APPEND WebKit2_SOURCES
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorBackendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBKIT2_DIR}/InspectorProtocolObjects.cpp
+    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationBackendDispatchers.cpp
+    ${DERIVED_SOURCES_WEBKIT2_DIR}/AutomationProtocolObjects.cpp
 )
 
 WEBKIT_FRAMEWORK(WebKit2)
index 1490532..b990a82 100644 (file)
@@ -1,3 +1,22 @@
+2016-03-25  Brian Burg  <bburg@apple.com>
+
+        Web Inspector: protocol generator should prefix C++ filenames with the protocol group
+        https://bugs.webkit.org/show_bug.cgi?id=155859
+        <rdar://problem/25349859>
+
+        Reviewed by Alex Christensen and Joseph Pecoraro.
+
+        Adjust header include and build system paths.
+
+        * CMakeLists.txt:
+        Revert the workaround introduced in r198659 since this change fixes the
+        underlying issue.
+
+        * DerivedSources.make:
+        * UIProcess/Automation/WebAutomationSession.cpp:
+        * UIProcess/Automation/WebAutomationSession.h:
+        * WebKit2.xcodeproj/project.pbxproj:
+
 2016-03-25  Alex Christensen  <achristensen@webkit.org>
 
         Remove unused lambda capture after r196984.
index 0d57204..e78c19a 100644 (file)
@@ -210,8 +210,8 @@ AUTOMATION_PROTOCOL_INPUT_FILES = \
 #
 
 AUTOMATION_PROTOCOL_OUTPUT_FILES = \
-    InspectorBackendDispatchers.h \
-    InspectorBackendDispatchers.cpp \
+    AutomationBackendDispatchers.h \
+    AutomationBackendDispatchers.cpp \
 #
 
 # JSON-RPC Backend Dispatchers, Type Builders
index 946d401..e0447d7 100644 (file)
@@ -27,7 +27,7 @@
 #include "WebAutomationSession.h"
 
 #include "APIAutomationSessionClient.h"
-#include "InspectorProtocolObjects.h"
+#include "AutomationProtocolObjects.h"
 #include "WebProcessPool.h"
 #include <JavaScriptCore/InspectorBackendDispatcher.h>
 #include <JavaScriptCore/InspectorFrontendRouter.h>
index 2fd8aa5..5f525fe 100644 (file)
@@ -27,7 +27,7 @@
 #define WebAutomationSession_h
 
 #include "APIObject.h"
-#include "InspectorBackendDispatchers.h"
+#include "AutomationBackendDispatchers.h"
 #include <wtf/Forward.h>
 
 #if ENABLE(REMOTE_INSPECTOR)
index 4e91d70..99bf610 100644 (file)
                9955A6EC1C7980C200EB6A93 /* WebAutomationSession.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6EB1C7980BB00EB6A93 /* WebAutomationSession.h */; };
                9955A6ED1C7980CA00EB6A93 /* WebAutomationSession.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6EA1C7980BB00EB6A93 /* WebAutomationSession.cpp */; };
                9955A6EF1C79810800EB6A93 /* Automation.json in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6E91C7980BB00EB6A93 /* Automation.json */; settings = {ATTRIBUTES = (Private, ); }; };
-               9955A6F41C7986DC00EB6A93 /* InspectorBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F01C79866400EB6A93 /* InspectorBackendDispatchers.cpp */; };
-               9955A6F51C7986E000EB6A93 /* InspectorBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F11C79866400EB6A93 /* InspectorBackendDispatchers.h */; };
-               9955A6F61C7986E300EB6A93 /* InspectorProtocolObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F21C79866400EB6A93 /* InspectorProtocolObjects.cpp */; };
-               9955A6F71C7986E500EB6A93 /* InspectorProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F31C79866400EB6A93 /* InspectorProtocolObjects.h */; };
+               9955A6F41C7986DC00EB6A93 /* AutomationBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F01C79866400EB6A93 /* AutomationBackendDispatchers.cpp */; };
+               9955A6F51C7986E000EB6A93 /* AutomationBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F11C79866400EB6A93 /* AutomationBackendDispatchers.h */; };
+               9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9955A6F21C79866400EB6A93 /* AutomationProtocolObjects.cpp */; };
+               9955A6F71C7986E500EB6A93 /* AutomationProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = 9955A6F31C79866400EB6A93 /* AutomationProtocolObjects.h */; };
                99C81D591C20E1E5005C4C82 /* AutomationClient.mm in Sources */ = {isa = PBXBuildFile; fileRef = 99C81D561C20DFBE005C4C82 /* AutomationClient.mm */; };
                99C81D5A1C20E7E2005C4C82 /* AutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D551C20DFBE005C4C82 /* AutomationClient.h */; };
                99C81D5D1C21F38B005C4C82 /* APIAutomationClient.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C81D5B1C20E817005C4C82 /* APIAutomationClient.h */; };
                9955A6E91C7980BB00EB6A93 /* Automation.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Automation.json; sourceTree = "<group>"; };
                9955A6EA1C7980BB00EB6A93 /* WebAutomationSession.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = WebAutomationSession.cpp; sourceTree = "<group>"; };
                9955A6EB1C7980BB00EB6A93 /* WebAutomationSession.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WebAutomationSession.h; sourceTree = "<group>"; };
-               9955A6F01C79866400EB6A93 /* InspectorBackendDispatchers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackendDispatchers.cpp; sourceTree = "<group>"; };
-               9955A6F11C79866400EB6A93 /* InspectorBackendDispatchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackendDispatchers.h; sourceTree = "<group>"; };
-               9955A6F21C79866400EB6A93 /* InspectorProtocolObjects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorProtocolObjects.cpp; sourceTree = "<group>"; };
-               9955A6F31C79866400EB6A93 /* InspectorProtocolObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolObjects.h; sourceTree = "<group>"; };
+               9955A6F01C79866400EB6A93 /* AutomationBackendDispatchers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AutomationBackendDispatchers.cpp; sourceTree = "<group>"; };
+               9955A6F11C79866400EB6A93 /* AutomationBackendDispatchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutomationBackendDispatchers.h; sourceTree = "<group>"; };
+               9955A6F21C79866400EB6A93 /* AutomationProtocolObjects.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = AutomationProtocolObjects.cpp; sourceTree = "<group>"; };
+               9955A6F31C79866400EB6A93 /* AutomationProtocolObjects.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutomationProtocolObjects.h; sourceTree = "<group>"; };
                99C81D551C20DFBE005C4C82 /* AutomationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AutomationClient.h; sourceTree = "<group>"; };
                99C81D561C20DFBE005C4C82 /* AutomationClient.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = AutomationClient.mm; sourceTree = "<group>"; };
                99C81D5B1C20E817005C4C82 /* APIAutomationClient.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = APIAutomationClient.h; sourceTree = "<group>"; };
                        children = (
                                512F58A012A883AD00629530 /* AuthenticationManagerMessageReceiver.cpp */,
                                512F58A112A883AD00629530 /* AuthenticationManagerMessages.h */,
+                               9955A6F01C79866400EB6A93 /* AutomationBackendDispatchers.cpp */,
+                               9955A6F11C79866400EB6A93 /* AutomationBackendDispatchers.h */,
+                               9955A6F21C79866400EB6A93 /* AutomationProtocolObjects.cpp */,
+                               9955A6F31C79866400EB6A93 /* AutomationProtocolObjects.h */,
                                51FAEC361B0657310009C4E7 /* ChildProcessMessageReceiver.cpp */,
                                51FAEC371B0657310009C4E7 /* ChildProcessMessages.h */,
                                E115C715190F8A2500ECC516 /* com.apple.WebKit.Databases.sb */,
                                1A64230712DD09EB00CAAE2C /* DrawingAreaProxyMessages.h */,
                                1AA575FF1496B7C000A4EE06 /* EventDispatcherMessageReceiver.cpp */,
                                1AA576001496B7C000A4EE06 /* EventDispatcherMessages.h */,
-                               9955A6F01C79866400EB6A93 /* InspectorBackendDispatchers.cpp */,
-                               9955A6F11C79866400EB6A93 /* InspectorBackendDispatchers.h */,
-                               9955A6F21C79866400EB6A93 /* InspectorProtocolObjects.cpp */,
-                               9955A6F31C79866400EB6A93 /* InspectorProtocolObjects.h */,
                                51DD9F2616367DA2001578E9 /* NetworkConnectionToWebProcessMessageReceiver.cpp */,
                                51DD9F2716367DA2001578E9 /* NetworkConnectionToWebProcessMessages.h */,
                                517CF0E1163A486C00C2950E /* NetworkProcessConnectionMessageReceiver.cpp */,
                                BCA8C6A911E3BA5F00812FB7 /* InjectedBundlePageLoaderClient.h in Headers */,
                                BC8147A912F64CDA007B2C32 /* InjectedBundlePagePolicyClient.h in Headers */,
                                BCA8C6B011E3C08700812FB7 /* InjectedBundlePageUIClient.h in Headers */,
-                               9955A6F71C7986E500EB6A93 /* InspectorProtocolObjects.h in Headers */,
+                               9955A6F71C7986E500EB6A93 /* AutomationProtocolObjects.h in Headers */,
                                BC33E0D112408E8600360F3F /* InjectedBundleRangeHandle.h in Headers */,
                                BC14DF77120B5B7900826C0C /* InjectedBundleScriptWorld.h in Headers */,
                                C58CDF2A1887548B00871536 /* InteractionInformationAtPosition.h in Headers */,
                                5179556E162877B300FA43B6 /* NetworkProcessProxy.h in Headers */,
                                93A253ED1C922E1E00F9F68D /* WKPreviewActionItem.h in Headers */,
                                513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */,
-                               9955A6F51C7986E000EB6A93 /* InspectorBackendDispatchers.h in Headers */,
+                               9955A6F51C7986E000EB6A93 /* AutomationBackendDispatchers.h in Headers */,
                                51FD18B61651FBAD00DBE1CE /* NetworkResourceLoader.h in Headers */,
                                E152551B17011819003D7ADB /* NetworkResourceLoaderMessages.h in Headers */,
                                5C20CBA01BB1ECD800895BB1 /* NetworkSession.h in Headers */,
                        files = (
                                37A5E01318BBF937000A081E /* _WKActivatedElementInfo.mm in Sources */,
                                1A5704F71BE01FF400874AF1 /* _WKContextMenuElementInfo.mm in Sources */,
-                               9955A6F41C7986DC00EB6A93 /* InspectorBackendDispatchers.cpp in Sources */,
+                               9955A6F41C7986DC00EB6A93 /* AutomationBackendDispatchers.cpp in Sources */,
                                A1A4FE5B18DCE9FA00B5EA8A /* _WKDownload.mm in Sources */,
                                379A873918BBFE0F00588AF2 /* _WKElementAction.mm in Sources */,
                                1A5704F11BE0173F00874AF1 /* WKElementInfo.mm in Sources */,
                                BC857FB612B830E600EDEB2E /* WebOpenPanelParameters.cpp in Sources */,
                                BC857F8612B82D0B00EDEB2E /* WebOpenPanelResultListener.cpp in Sources */,
                                BC857F7E12B82CEE00EDEB2E /* WebOpenPanelResultListenerProxy.cpp in Sources */,
-                               9955A6F61C7986E300EB6A93 /* InspectorProtocolObjects.cpp in Sources */,
+                               9955A6F61C7986E300EB6A93 /* AutomationProtocolObjects.cpp in Sources */,
                                BC963D6B113DD19200574BE2 /* WebPage.cpp in Sources */,
                                C06C6095124C144B0001682F /* WebPageCreationParameters.cpp in Sources */,
                                8372DB281A67562800C697C5 /* WebPageDiagnosticLoggingClient.cpp in Sources */,