Web Inspector: Generate all Inspector domains together in JavaScriptCore

author joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)

committer joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>

Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)
author joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)
committer joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)
diff --git a/ChangeLog b/ChangeLog

index c415320..bc9091d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2014-10-20  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Generate all Inspector domains together in JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=137748
+
+        Reviewed by Brian Burg.
+
+        * Source/PlatformEfl.cmake:
+
  2014-10-20  Carlos Garcia Campos  <cgarcia@igalia.com>
  
          [GTK] Add initial gestures support
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt

index 55945fa..d1ac92b 100644 (file)
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -963,32 +963,60 @@ set(JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS
  )
  
  set(JavaScriptCore_INSPECTOR_DOMAINS
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/ApplicationCache.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/CSS.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Console.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOM.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMDebugger.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/DOMStorage.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Debugger.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/GenericTypes.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/InspectorDomain.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/LayerTree.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Network.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Page.json
      ${JAVASCRIPTCORE_DIR}/inspector/protocol/Runtime.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Timeline.json
+    ${JAVASCRIPTCORE_DIR}/inspector/protocol/Worker.json
  )
  
+if (ENABLE_SQL_DATABASE)
+    list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
+        ${JAVASCRIPTCORE_DIR}/inspector/protocol/Database.json
+    )
+endif ()
+
+if (ENABLE_INDEXED_DATABASE)
+    list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
+        ${JAVASCRIPTCORE_DIR}/inspector/protocol/IndexedDB.json
+    )
+endif ()
+
+if (ENABLE_WEB_REPLAY)
+    list(APPEND JavaScriptCore_INSPECTOR_DOMAINS
+        ${JAVASCRIPTCORE_DIR}/inspector/protocol/Replay.json
+    )
+endif ()
+
  add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
      MAIN_DEPENDENCY ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py
      DEPENDS ${JavaScriptCore_INSPECTOR_DOMAINS}
-    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${JavaScriptCore_INSPECTOR_DOMAINS} > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
      VERBATIM)
  
  # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
  add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
-           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
-           ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js
-    MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+    OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.cpp
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
+           ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
+           ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js
+    MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json
      DEPENDS ${JavaScriptCore_INSPECTOR_PROTOCOL_SCRIPTS}
-    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSProtocolTypes.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSProtocolTypes.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
+    COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --framework JavaScriptCore ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/Inspector.json && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorProtocolObjects.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && mkdir -p ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
      VERBATIM)
  file(MAKE_DIRECTORY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector)
  
@@ -1002,16 +1030,16 @@ add_custom_command(
     VERBATIM)
  
  list(APPEND JavaScriptCore_SOURCES
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.cpp
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.cpp
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.cpp
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.cpp
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.cpp
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.cpp
      ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.cpp
  )
  
  list(APPEND JavaScriptCore_HEADERS
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSBackendDispatchers.h
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSFrontendDispatchers.h
-    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorJSProtocolTypes.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorBackendDispatchers.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorFrontendDispatchers.h
+    ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector/InspectorProtocolObjects.h
      ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/JSCBuiltins.h
  )
  
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog

index 6143d02..013a58a 100644 (file)
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,103 @@
+2014-10-20  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Generate all Inspector domains together in JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=137748
+
+        Reviewed by Brian Burg.
+
+        * inspector/protocol/ApplicationCache.json: Renamed from Source/WebCore/inspector/protocol/ApplicationCache.json.
+        * inspector/protocol/CSS.json: Renamed from Source/WebCore/inspector/protocol/CSS.json.
+        * inspector/protocol/DOM.json: Renamed from Source/WebCore/inspector/protocol/DOM.json.
+        * inspector/protocol/DOMDebugger.json: Renamed from Source/WebCore/inspector/protocol/DOMDebugger.json.
+        * inspector/protocol/DOMStorage.json: Renamed from Source/WebCore/inspector/protocol/DOMStorage.json.
+        * inspector/protocol/Database.json: Renamed from Source/WebCore/inspector/protocol/Database.json.
+        * inspector/protocol/IndexedDB.json: Renamed from Source/WebCore/inspector/protocol/IndexedDB.json.
+        * inspector/protocol/LayerTree.json: Renamed from Source/WebCore/inspector/protocol/LayerTree.json.
+        * inspector/protocol/Network.json: Renamed from Source/WebCore/inspector/protocol/Network.json.
+        * inspector/protocol/Page.json: Renamed from Source/WebCore/inspector/protocol/Page.json.
+        * inspector/protocol/Replay.json: Renamed from Source/WebCore/inspector/protocol/Replay.json.
+        * inspector/protocol/Timeline.json: Renamed from Source/WebCore/inspector/protocol/Timeline.json.
+        * inspector/protocol/Worker.json: Renamed from Source/WebCore/inspector/protocol/Worker.json.
+        Move all protocol files into this directory.
+
+        * inspector/InspectorProtocolTypesBase.h: Renamed from Source/JavaScriptCore/inspector/InspectorProtocolTypes.h.
+        Renamed the base types file to not clash with the generated types file.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+        * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+        * JavaScriptCore.vcxproj/copy-files.cmd:
+        * JavaScriptCore.xcodeproj/project.pbxproj:
+        Update build phases for new JSON files and new filenames.
+
+        * 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/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:
+        Updated names of things now that prefixes are no longer needed.
+
+        * inspector/ConsoleMessage.h:
+        * inspector/ContentSearchUtilities.cpp:
+        * inspector/ContentSearchUtilities.h:
+        * inspector/InjectedScript.h:
+        * inspector/InjectedScriptBase.h:
+        * inspector/ScriptCallFrame.h:
+        * inspector/ScriptCallStack.h:
+        * inspector/agents/InspectorAgent.h:
+        * inspector/agents/InspectorConsoleAgent.h:
+        * inspector/agents/InspectorDebuggerAgent.cpp:
+        (Inspector::breakpointActionTypeForString):
+        * inspector/agents/InspectorDebuggerAgent.h:
+        * inspector/agents/InspectorRuntimeAgent.h:
+        * runtime/TypeProfiler.cpp:
+        * runtime/TypeSet.cpp:
+        Update includes and update a few function names that are generated.
+
+        * inspector/scripts/codegen/generate_protocol_types_header.py:
+        (ProtocolTypesHeaderGenerator.output_filename):
+        (ProtocolTypesHeaderGenerator.generate_output):
+        Include an export macro for type string constants defined in the implementation file.
+
+        * inspector/scripts/codegen/generate_backend_commands.py:
+        (BackendCommandsGenerator.output_filename):
+        * inspector/scripts/codegen/generate_backend_dispatcher_header.py:
+        (BackendDispatcherHeaderGenerator.output_filename):
+        (BackendDispatcherHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_backend_dispatcher_implementation.py:
+        (BackendDispatcherImplementationGenerator.output_filename):
+        (BackendDispatcherImplementationGenerator.generate_output):
+        (BackendDispatcherImplementationGenerator._generate_async_dispatcher_class_for_domain):
+        (BackendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_command):
+        * inspector/scripts/codegen/generate_frontend_dispatcher_header.py:
+        (FrontendDispatcherHeaderGenerator.output_filename):
+        (FrontendDispatcherHeaderGenerator.generate_output):
+        * inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py:
+        (FrontendDispatcherImplementationGenerator.output_filename):
+        (FrontendDispatcherImplementationGenerator.generate_output):
+        (FrontendDispatcherImplementationGenerator._generate_dispatcher_implementation_for_event):
+        (_generate_class_for_object_declaration):
+        (_generate_builder_setter_for_member):
+        (_generate_unchecked_setter_for_member):
+        * inspector/scripts/codegen/generate_protocol_types_implementation.py:
+        (ProtocolTypesImplementationGenerator.output_filename):
+        (ProtocolTypesImplementationGenerator.generate_output):
+        (ProtocolTypesImplementationGenerator._generate_enum_mapping):
+        * inspector/scripts/codegen/models.py:
+        (Framework.fromString):
+        (Frameworks):
+        * inspector/scripts/generate-inspector-protocol-bindings.py:
+        Simplify generator now that prefixes are no longer needed. This updates
+        filenames, includes, and the list of supported directories.
+
  2014-10-20  Csaba Osztrogonác  <ossy@webkit.org>
  
          Remove obsolete comments after r99798
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make

index a8d7df7..f9fd74b 100644 (file)
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -113,13 +113,35 @@ InitBytecodes.asm: $(JavaScriptCore)/generate-bytecode-files $(JavaScriptCore)/b
  # Inspector interfaces
  
  INSPECTOR_DOMAINS = \
+    $(JavaScriptCore)/inspector/protocol/ApplicationCache.json \
+    $(JavaScriptCore)/inspector/protocol/CSS.json \
      $(JavaScriptCore)/inspector/protocol/Console.json \
+    $(JavaScriptCore)/inspector/protocol/DOM.json \
+    $(JavaScriptCore)/inspector/protocol/DOMDebugger.json \
+    $(JavaScriptCore)/inspector/protocol/DOMStorage.json \
      $(JavaScriptCore)/inspector/protocol/Debugger.json \
      $(JavaScriptCore)/inspector/protocol/GenericTypes.json \
      $(JavaScriptCore)/inspector/protocol/InspectorDomain.json \
+    $(JavaScriptCore)/inspector/protocol/LayerTree.json \
+    $(JavaScriptCore)/inspector/protocol/Network.json \
+    $(JavaScriptCore)/inspector/protocol/Page.json \
      $(JavaScriptCore)/inspector/protocol/Runtime.json \
+    $(JavaScriptCore)/inspector/protocol/Timeline.json \
+    $(JavaScriptCore)/inspector/protocol/Worker.json \
  #
  
+ifeq ($(findstring ENABLE_SQL_DATABASE,$(FEATURE_DEFINES)), ENABLE_SQL_DATABASE)
+    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/Database.json
+endif
+
+ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
+    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/IndexedDB.json
+endif
+
+ifeq ($(findstring ENABLE_WEB_REPLAY,$(FEATURE_DEFINES)), ENABLE_WEB_REPLAY)
+    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(JavaScriptCore)/inspector/protocol/Replay.json
+endif
+
  INSPECTOR_GENERATOR_SCRIPTS = \
         $(JavaScriptCore)/inspector/scripts/codegen/__init__.py \
         $(JavaScriptCore)/inspector/scripts/codegen/generate_backend_commands.py \
@@ -137,8 +159,8 @@ INSPECTOR_GENERATOR_SCRIPTS = \
  #
  
  all : \
-    InspectorJS.json \
-    InspectorJSFrontendDispatchers.h \
+    Inspector.json \
+    InspectorFrontendDispatchers.h \
      InjectedScriptSource.h \
  #
  
@@ -149,12 +171,12 @@ all : \
  EnabledInspectorDomains : force
         echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' > $@
  
-InspectorJS.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
-       $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorJS.json
+Inspector.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
+       $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./Inspector.json
  
  # Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
-InspectorJSFrontendDispatchers.h : InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
-       $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir . ./InspectorJS.json
+InspectorFrontendDispatchers.h : Inspector.json $(INSPECTOR_GENERATOR_SCRIPTS)
+       $(PYTHON) $(JavaScriptCore)/inspector/scripts/generate-inspector-protocol-bindings.py --framework JavaScriptCore --outputDir . ./Inspector.json
  
  InjectedScriptSource.h : inspector/InjectedScriptSource.js $(JavaScriptCore)/inspector/scripts/jsmin.py $(JavaScriptCore)/inspector/scripts/xxd.pl
         echo "//# sourceURL=__WebInspectorInjectedScript__" > ./InjectedScriptSource.min.js
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj

index 71f3008..e07c109 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
@@ -833,9 +833,9 @@
      <ClCompile Include="..\yarr\YarrJIT.cpp" />
      <ClCompile Include="..\yarr\YarrPattern.cpp" />
      <ClCompile Include="..\yarr\YarrSyntaxChecker.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp" />
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.cpp" />
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontendDispatchers.cpp" />
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolTypes.cpp" />
      <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSCBuiltins.cpp" />
    </ItemGroup>
    <ItemGroup>
@@ -847,9 +847,9 @@
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ErrorPrototype.lut.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HeaderDetection.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptSource.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontendDispatchers.h" />
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolObjects.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSDataViewPrototype.lut.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSONObject.lut.h" />
@@ -1290,7 +1290,7 @@
      <ClInclude Include="..\inspector\InspectorBackendDispatcher.h" />
      <ClInclude Include="..\inspector\InspectorEnvironment.h" />
      <ClInclude Include="..\inspector\InspectorFrontendChannel.h" />
-    <ClInclude Include="..\inspector\InspectorProtocolTypes.h" />
+    <ClInclude Include="..\inspector\InspectorProtocolObjects.h" />
      <ClInclude Include="..\inspector\InspectorValues.h" />
      <ClInclude Include="..\inspector\JSInjectedScriptHost.h" />
      <ClInclude Include="..\inspector\JSInjectedScriptHostPrototype.h" />
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters

index 0b49184..4fd7713 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
@@ -1383,13 +1383,13 @@
      <ClCompile Include="..\runtime\ArrayBufferNeuteringWatchpoint.cpp">
        <Filter>runtime</Filter>
      </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.cpp">
        <Filter>Derived Sources</Filter>
      </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontendDispatchers.cpp">
        <Filter>Derived Sources</Filter>
      </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.cpp">
+    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolObjects.cpp">
        <Filter>Derived Sources</Filter>
      </ClCompile>
      <ClCompile Include="..\jit\ArityCheckFailReturnThunks.cpp">
@@ -2982,13 +2982,13 @@
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HeaderDetection.h">
        <Filter>Derived Sources</Filter>
      </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.h">
        <Filter>Derived Sources</Filter>
      </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontendDispatchers.h">
        <Filter>Derived Sources</Filter>
      </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSProtocolTypes.h">
+    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorProtocolObjects.h">
        <Filter>Derived Sources</Filter>
      </ClInclude>
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd

index 9a4daf2..aec9b16 100755 (executable)
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
@@ -70,11 +70,11 @@ for %%d in (
  )\r
  \r
  echo Copying Inspector generated files as if they were private headers...\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJS.json" "%PrivateHeadersDirectory%" >NUL\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJSProtocolTypes.h" "%PrivateHeadersDirectory%" >NUL\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendCommands.js" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\Inspector.json" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\InspectorProtocolObjects.h" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\InspectorBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\InspectorFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL\r
+xcopy /y "%DerivedSourcesDirectory%\InspectorBackendCommands.js" "%PrivateHeadersDirectory%" >NUL\r
  \r
  echo Copying Web Replay scripts as if they were private headers...\r
  for %%d in (\r
diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj

index d1c0777..18b6d17 100644 (file)
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -1071,7 +1071,7 @@
                 978801411471AD920041B016 /* JSDateMath.h in Headers */ = {isa = PBXBuildFile; fileRef = 9788FC231471AD0C0068CE2D /* JSDateMath.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9928FF3B18AC4AEC00B8CF12 /* JSReplayInputs.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9928FF3918AC4AEC00B8CF12 /* JSReplayInputs.cpp */; };
                 9928FF3C18AC4AEC00B8CF12 /* JSReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 9928FF3A18AC4AEC00B8CF12 /* JSReplayInputs.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               996231E918D1804200C03FDA /* InspectorJSBackendCommands.js in Headers */ = {isa = PBXBuildFile; fileRef = A53243961856A475002ED692 /* InspectorJSBackendCommands.js */; settings = {ATTRIBUTES = (Private, ); }; };
+               996231E918D1804200C03FDA /* InspectorBackendCommands.js in Headers */ = {isa = PBXBuildFile; fileRef = A53243961856A475002ED692 /* InspectorBackendCommands.js */; settings = {ATTRIBUTES = (Private, ); }; };
                 99CC0B6218BE9946006CEBCC /* CodeGeneratorReplayInputsTemplates.py in Headers */ = {isa = PBXBuildFile; fileRef = 99E45A1E18A1B1E70026D88F /* CodeGeneratorReplayInputsTemplates.py */; settings = {ATTRIBUTES = (Private, ); }; };
                 99CC0B6318BE9950006CEBCC /* CodeGeneratorReplayInputs.py in Headers */ = {isa = PBXBuildFile; fileRef = 99E45A1D18A1B1E70026D88F /* CodeGeneratorReplayInputs.py */; settings = {ATTRIBUTES = (Private, ); }; };
                 99E45A2418A1B2590026D88F /* EmptyInputCursor.h in Headers */ = {isa = PBXBuildFile; fileRef = 99E45A1F18A1B2590026D88F /* EmptyInputCursor.h */; settings = {ATTRIBUTES = (Private, ); }; };
@@ -1118,14 +1118,14 @@
                 A513E5CB185F9624007E95AD /* InjectedScriptManager.h in Headers */ = {isa = PBXBuildFile; fileRef = A513E5C9185F9624007E95AD /* InjectedScriptManager.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A514B2C2185A684400F3C7CB /* InjectedScriptBase.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A514B2C0185A684400F3C7CB /* InjectedScriptBase.cpp */; };
                 A514B2C3185A684400F3C7CB /* InjectedScriptBase.h in Headers */ = {isa = PBXBuildFile; fileRef = A514B2C1185A684400F3C7CB /* InjectedScriptBase.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438118568317002ED692 /* InspectorJSBackendDispatchers.cpp */; };
-               A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */; };
-               A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */; };
-               A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A532438718568335002ED692 /* InspectorBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438118568317002ED692 /* InspectorBackendDispatchers.cpp */; };
+               A532438818568335002ED692 /* InspectorBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438218568317002ED692 /* InspectorBackendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A532438918568335002ED692 /* InspectorFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438318568317002ED692 /* InspectorFrontendDispatchers.cpp */; };
+               A532438A18568335002ED692 /* InspectorFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438418568317002ED692 /* InspectorFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
+               A532438B18568335002ED692 /* InspectorProtocolObjects.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorProtocolObjects.cpp */; };
+               A532438C18568335002ED692 /* InspectorProtocolObjects.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorProtocolObjects.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324391185696E6002ED692 /* generate-combined-inspector-json.py */; settings = {ATTRIBUTES = (Private, ); }; };
-               A53243981856A489002ED692 /* InspectorJS.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* InspectorJS.json */; settings = {ATTRIBUTES = (Private, ); }; };
+               A53243981856A489002ED692 /* Inspector.json in Headers */ = {isa = PBXBuildFile; fileRef = A53243951856A475002ED692 /* Inspector.json */; settings = {ATTRIBUTES = (Private, ); }; };
                 A53CE08518BC1A5600BEDF76 /* ConsolePrototype.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */; };
                 A53CE08618BC1A5600BEDF76 /* ConsolePrototype.h in Headers */ = {isa = PBXBuildFile; fileRef = A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */; };
                 A53CE08718BC1A5600BEDF76 /* JSConsole.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A53CE08318BC1A5600BEDF76 /* JSConsole.cpp */; };
@@ -2789,16 +2789,16 @@
                 A513E5C9185F9624007E95AD /* InjectedScriptManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptManager.h; sourceTree = "<group>"; };
                 A514B2C0185A684400F3C7CB /* InjectedScriptBase.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InjectedScriptBase.cpp; sourceTree = "<group>"; };
                 A514B2C1185A684400F3C7CB /* InjectedScriptBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InjectedScriptBase.h; sourceTree = "<group>"; };
-               A532438118568317002ED692 /* InspectorJSBackendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSBackendDispatchers.cpp; sourceTree = "<group>"; };
-               A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSBackendDispatchers.h; sourceTree = "<group>"; };
-               A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSFrontendDispatchers.cpp; sourceTree = "<group>"; };
-               A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSFrontendDispatchers.h; sourceTree = "<group>"; };
-               A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSProtocolTypes.cpp; sourceTree = "<group>"; };
-               A532438618568317002ED692 /* InspectorJSProtocolTypes.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSProtocolTypes.h; sourceTree = "<group>"; };
+               A532438118568317002ED692 /* InspectorBackendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackendDispatchers.cpp; sourceTree = "<group>"; };
+               A532438218568317002ED692 /* InspectorBackendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorBackendDispatchers.h; sourceTree = "<group>"; };
+               A532438318568317002ED692 /* InspectorFrontendDispatchers.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontendDispatchers.cpp; sourceTree = "<group>"; };
+               A532438418568317002ED692 /* InspectorFrontendDispatchers.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorFrontendDispatchers.h; sourceTree = "<group>"; };
+               A532438518568317002ED692 /* InspectorProtocolObjects.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorProtocolObjects.cpp; sourceTree = "<group>"; };
+               A532438618568317002ED692 /* InspectorProtocolObjects.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorProtocolObjects.h; sourceTree = "<group>"; };
                 A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
                 A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = "generate-combined-inspector-json.py"; sourceTree = "<group>"; };
-               A53243951856A475002ED692 /* InspectorJS.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = InspectorJS.json; sourceTree = "<group>"; };
-               A53243961856A475002ED692 /* InspectorJSBackendCommands.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InspectorJSBackendCommands.js; sourceTree = "<group>"; };
+               A53243951856A475002ED692 /* Inspector.json */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.json; path = Inspector.json; sourceTree = "<group>"; };
+               A53243961856A475002ED692 /* InspectorBackendCommands.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InspectorBackendCommands.js; sourceTree = "<group>"; };
                 A53CE08118BC1A5600BEDF76 /* ConsolePrototype.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ConsolePrototype.cpp; sourceTree = "<group>"; };
                 A53CE08218BC1A5600BEDF76 /* ConsolePrototype.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ConsolePrototype.h; sourceTree = "<group>"; };
                 A53CE08318BC1A5600BEDF76 /* JSConsole.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSConsole.cpp; sourceTree = "<group>"; };
@@ -4010,14 +4010,14 @@
                                 BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
                                 6514F21818B3E1670098FF8B /* InitBytecodes.asm */,
                                 A513E5C6185F9436007E95AD /* InjectedScriptSource.h */,
-                               A53243951856A475002ED692 /* InspectorJS.json */,
-                               A53243961856A475002ED692 /* InspectorJSBackendCommands.js */,
-                               A532438118568317002ED692 /* InspectorJSBackendDispatchers.cpp */,
-                               A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */,
-                               A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */,
-                               A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */,
-                               A532438518568317002ED692 /* InspectorJSProtocolTypes.cpp */,
-                               A532438618568317002ED692 /* InspectorJSProtocolTypes.h */,
+                               A53243951856A475002ED692 /* Inspector.json */,
+                               A53243961856A475002ED692 /* InspectorBackendCommands.js */,
+                               A532438118568317002ED692 /* InspectorBackendDispatchers.cpp */,
+                               A532438218568317002ED692 /* InspectorBackendDispatchers.h */,
+                               A532438318568317002ED692 /* InspectorFrontendDispatchers.cpp */,
+                               A532438418568317002ED692 /* InspectorFrontendDispatchers.h */,
+                               A532438518568317002ED692 /* InspectorProtocolObjects.cpp */,
+                               A532438618568317002ED692 /* InspectorProtocolObjects.h */,
                                 A7D801A61880D6A80026C39B /* JSCBuiltins.cpp */,
                                 A7D801A71880D6A80026C39B /* JSCBuiltins.h */,
                                 BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
@@ -5683,7 +5683,7 @@
                                 0F4680D514BBD24B00BFE272 /* HostCallReturnValue.h in Headers */,
                                 BC18C40F0E16F5CD00B34460 /* Identifier.h in Headers */,
                                 A5FD0076189B038C00633231 /* IdentifiersFactory.h in Headers */,
-                               996231E918D1804200C03FDA /* InspectorJSBackendCommands.js in Headers */,
+                               996231E918D1804200C03FDA /* InspectorBackendCommands.js in Headers */,
                                 C25F8BCE157544A900245B71 /* IncrementalSweeper.h in Headers */,
                                 0FB7F39915ED8E4600F167B2 /* IndexingHeader.h in Headers */,
                                 0FB7F39A15ED8E4600F167B2 /* IndexingHeaderInlines.h in Headers */,
@@ -5708,11 +5708,11 @@
                                 A57D23E61890CEBF0031C7FA /* InspectorDebuggerAgent.h in Headers */,
                                 A5D0A1BB1862301B00C7B496 /* InspectorEnvironment.h in Headers */,
                                 A5945595182479EB00CC3843 /* InspectorFrontendChannel.h in Headers */,
-                               A53243981856A489002ED692 /* InspectorJS.json in Headers */,
-                               A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */,
-                               A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */,
+                               A53243981856A489002ED692 /* Inspector.json in Headers */,
+                               A532438818568335002ED692 /* InspectorBackendDispatchers.h in Headers */,
+                               A532438A18568335002ED692 /* InspectorFrontendDispatchers.h in Headers */,
                                 8606DDEA18DA44AB00A383D0 /* IdentifierInlines.h in Headers */,
-                               A532438C18568335002ED692 /* InspectorJSProtocolTypes.h in Headers */,
+                               A532438C18568335002ED692 /* InspectorProtocolObjects.h in Headers */,
                                 A50E4B6218809DD50068A46D /* InspectorRuntimeAgent.h in Headers */,
                                 0FBFDD05196C92BF007A5BFA /* DFGPhantomRemovalPhase.h in Headers */,
                                 A55D93AC18514F7900400DED /* InspectorProtocolTypes.h in Headers */,
@@ -6915,9 +6915,9 @@
                                 2AF7382C18BBBF92008A5A37 /* StructureIDTable.cpp in Sources */,
                                 A5FD0081189B191A00633231 /* InspectorConsoleAgent.cpp in Sources */,
                                 A57D23E51890CEBF0031C7FA /* InspectorDebuggerAgent.cpp in Sources */,
-                               A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */,
-                               A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */,
-                               A532438B18568335002ED692 /* InspectorJSProtocolTypes.cpp in Sources */,
+                               A532438718568335002ED692 /* InspectorBackendDispatchers.cpp in Sources */,
+                               A532438918568335002ED692 /* InspectorFrontendDispatchers.cpp in Sources */,
+                               A532438B18568335002ED692 /* InspectorProtocolObjects.cpp in Sources */,
                                 A50E4B6118809DD50068A46D /* InspectorRuntimeAgent.cpp in Sources */,
                                 A593CF821840377100BFCE27 /* InspectorValues.cpp in Sources */,
                                 A78853F917972629001440E4 /* IntendedStructureChain.cpp in Sources */,
diff --git a/Source/JavaScriptCore/inspector/ConsoleMessage.h b/Source/JavaScriptCore/inspector/ConsoleMessage.h

index 2e6c44c..cd61c5e 100644 (file)
--- a/Source/JavaScriptCore/inspector/ConsoleMessage.h
+++ b/Source/JavaScriptCore/inspector/ConsoleMessage.h
@@ -34,7 +34,7 @@
  #if ENABLE(INSPECTOR)
  
  #include "ConsoleTypes.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  #include <wtf/Forward.h>
  
  namespace JSC {
diff --git a/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp b/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp

index ef54f06..d1185fc 100644 (file)
--- a/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp
+++ b/Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp
@@ -31,7 +31,6 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSProtocolTypes.h"
  #include "InspectorValues.h"
  #include "RegularExpression.h"
  #include "Yarr.h"
diff --git a/Source/JavaScriptCore/inspector/ContentSearchUtilities.h b/Source/JavaScriptCore/inspector/ContentSearchUtilities.h

index d612dab..988a0f2 100644 (file)
--- a/Source/JavaScriptCore/inspector/ContentSearchUtilities.h
+++ b/Source/JavaScriptCore/inspector/ContentSearchUtilities.h
@@ -31,7 +31,7 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <wtf/Vector.h>
  #include <wtf/text/TextPosition.h>
  #include <wtf/text/WTFString.h>
diff --git a/Source/JavaScriptCore/inspector/InjectedScript.h b/Source/JavaScriptCore/inspector/InjectedScript.h

index 6a383db..71bd68b 100644 (file)
--- a/Source/JavaScriptCore/inspector/InjectedScript.h
+++ b/Source/JavaScriptCore/inspector/InjectedScript.h
@@ -35,7 +35,6 @@
  #if ENABLE(INSPECTOR)
  
  #include "InjectedScriptBase.h"
-#include "InspectorJSProtocolTypes.h"
  #include <wtf/Forward.h>
  #include <wtf/Noncopyable.h>
  #include <wtf/PassRefPtr.h>
diff --git a/Source/JavaScriptCore/inspector/InjectedScriptBase.h b/Source/JavaScriptCore/inspector/InjectedScriptBase.h

index 194f744..3112034 100644 (file)
--- a/Source/JavaScriptCore/inspector/InjectedScriptBase.h
+++ b/Source/JavaScriptCore/inspector/InjectedScriptBase.h
@@ -35,7 +35,7 @@
  #if ENABLE(INSPECTOR)
  
  #include "InspectorEnvironment.h"
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include "bindings/ScriptObject.h"
  #include <wtf/Forward.h>
  #include <wtf/RefPtr.h>
diff --git a/Source/JavaScriptCore/inspector/ScriptCallFrame.h b/Source/JavaScriptCore/inspector/ScriptCallFrame.h

index e9c10ff..6a9cd77 100644 (file)
--- a/Source/JavaScriptCore/inspector/ScriptCallFrame.h
+++ b/Source/JavaScriptCore/inspector/ScriptCallFrame.h
@@ -36,7 +36,7 @@
  #include <wtf/text/WTFString.h>
  
  #if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #endif
  
  namespace Inspector {
diff --git a/Source/JavaScriptCore/inspector/ScriptCallStack.h b/Source/JavaScriptCore/inspector/ScriptCallStack.h

index 61da9e4..63e3ce1 100644 (file)
--- a/Source/JavaScriptCore/inspector/ScriptCallStack.h
+++ b/Source/JavaScriptCore/inspector/ScriptCallStack.h
@@ -38,7 +38,7 @@
  #include <wtf/Vector.h>
  
  #if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #endif
  
  namespace Inspector {
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h

index 2fb8f25..1c13609 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorAgent.h
@@ -32,8 +32,8 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSBackendDispatchers.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  #include "inspector/InspectorAgentBase.h"
  #include <wtf/Forward.h>
  #include <wtf/Vector.h>
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h

index 1d63eec..1db21b3 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h
@@ -28,8 +28,8 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSBackendDispatchers.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  #include "inspector/InspectorAgentBase.h"
  #include "runtime/ConsoleTypes.h"
  #include <wtf/Forward.h>
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp

index 1690a37..02da154 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp
+++ b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp
@@ -175,19 +175,19 @@ static bool matches(const String& url, const String& pattern, bool isRegex)
  
  static bool breakpointActionTypeForString(const String& typeString, ScriptBreakpointActionType* output)
  {
-    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Log)) {
+    if (typeString == Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Log)) {
          *output = ScriptBreakpointActionTypeLog;
          return true;
      }
-    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Evaluate)) {
+    if (typeString == Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Evaluate)) {
          *output = ScriptBreakpointActionTypeEvaluate;
          return true;
      }
-    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Sound)) {
+    if (typeString == Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Sound)) {
          *output = ScriptBreakpointActionTypeSound;
          return true;
      }
-    if (typeString == Inspector::Protocol::getJSEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Probe)) {
+    if (typeString == Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::Debugger::BreakpointAction::Type::Probe)) {
          *output = ScriptBreakpointActionTypeProbe;
          return true;
      }
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h

index 8b3fb66..a5d7e04 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h
@@ -32,8 +32,8 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSBackendDispatchers.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  #include "bindings/ScriptValue.h"
  #include "debugger/Debugger.h"
  #include "inspector/InspectorAgentBase.h"
diff --git a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h

index c2bfc55..6ad25ba 100644 (file)
--- a/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
+++ b/Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h
@@ -34,8 +34,8 @@
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorJSBackendDispatchers.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  #include "inspector/InspectorAgentBase.h"
  #include <wtf/Forward.h>
  #include <wtf/Noncopyable.h>
diff --git a/Source/WebCore/inspector/protocol/ApplicationCache.json b/Source/JavaScriptCore/inspector/protocol/ApplicationCache.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/ApplicationCache.json

rename to Source/JavaScriptCore/inspector/protocol/ApplicationCache.json
diff --git a/Source/WebCore/inspector/protocol/CSS.json b/Source/JavaScriptCore/inspector/protocol/CSS.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/CSS.json

rename to Source/JavaScriptCore/inspector/protocol/CSS.json
diff --git a/Source/WebCore/inspector/protocol/DOM.json b/Source/JavaScriptCore/inspector/protocol/DOM.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/DOM.json

rename to Source/JavaScriptCore/inspector/protocol/DOM.json
diff --git a/Source/WebCore/inspector/protocol/DOMDebugger.json b/Source/JavaScriptCore/inspector/protocol/DOMDebugger.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/DOMDebugger.json

rename to Source/JavaScriptCore/inspector/protocol/DOMDebugger.json
diff --git a/Source/WebCore/inspector/protocol/DOMStorage.json b/Source/JavaScriptCore/inspector/protocol/DOMStorage.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/DOMStorage.json

rename to Source/JavaScriptCore/inspector/protocol/DOMStorage.json
diff --git a/Source/WebCore/inspector/protocol/Database.json b/Source/JavaScriptCore/inspector/protocol/Database.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Database.json

rename to Source/JavaScriptCore/inspector/protocol/Database.json
diff --git a/Source/WebCore/inspector/protocol/IndexedDB.json b/Source/JavaScriptCore/inspector/protocol/IndexedDB.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/IndexedDB.json

rename to Source/JavaScriptCore/inspector/protocol/IndexedDB.json
diff --git a/Source/WebCore/inspector/protocol/LayerTree.json b/Source/JavaScriptCore/inspector/protocol/LayerTree.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/LayerTree.json

rename to Source/JavaScriptCore/inspector/protocol/LayerTree.json
diff --git a/Source/WebCore/inspector/protocol/Network.json b/Source/JavaScriptCore/inspector/protocol/Network.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Network.json

rename to Source/JavaScriptCore/inspector/protocol/Network.json
diff --git a/Source/WebCore/inspector/protocol/Page.json b/Source/JavaScriptCore/inspector/protocol/Page.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Page.json

rename to Source/JavaScriptCore/inspector/protocol/Page.json
diff --git a/Source/WebCore/inspector/protocol/Replay.json b/Source/JavaScriptCore/inspector/protocol/Replay.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Replay.json

rename to Source/JavaScriptCore/inspector/protocol/Replay.json
diff --git a/Source/WebCore/inspector/protocol/Timeline.json b/Source/JavaScriptCore/inspector/protocol/Timeline.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Timeline.json

rename to Source/JavaScriptCore/inspector/protocol/Timeline.json
diff --git a/Source/WebCore/inspector/protocol/Worker.json b/Source/JavaScriptCore/inspector/protocol/Worker.json

similarity index 100%

rename from Source/WebCore/inspector/protocol/Worker.json

rename to Source/JavaScriptCore/inspector/protocol/Worker.json
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_commands.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_commands.py

old mode 100644 (file)

new mode 100755 (executable)

index 8a805f3..90beb43
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_commands.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_commands.py
@@ -41,7 +41,7 @@ class BackendCommandsGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sBackendCommands.js" % self.model().framework.setting('prefix')
+        return "InspectorBackendCommands.js"
  
      def domains_to_generate(self):
          def should_generate_domain(domain):
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py

index 0714c3d..d8de14a 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py
@@ -42,14 +42,14 @@ class BackendDispatcherHeaderGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sBackendDispatchers.h" % self.model().framework.setting('prefix')
+        return "InspectorBackendDispatchers.h"
  
      def domains_to_generate(self):
          return filter(lambda domain: len(domain.commands) > 0, Generator.domains_to_generate(self))
  
      def generate_output(self):
          headers = [
-            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
+            '"InspectorProtocolObjects.h"',
              '<inspector/InspectorBackendDispatcher.h>',
              '<wtf/PassRefPtr.h>',
              '<wtf/text/WTFString.h>']
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py

index 1a52e26..be49a82 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py
@@ -41,7 +41,7 @@ class BackendDispatcherImplementationGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sBackendDispatchers.cpp" % self.model().framework.setting('prefix')
+        return "InspectorBackendDispatchers.cpp"
  
      def domains_to_generate(self):
          return filter(lambda domain: len(domain.commands) > 0, Generator.domains_to_generate(self))
@@ -53,7 +53,7 @@ class BackendDispatcherImplementationGenerator(Generator):
              '<wtf/text/CString.h>']
  
          header_args = {
-            'primaryInclude': '"Inspector%sBackendDispatchers.h"' % self.model().framework.setting('prefix'),
+            'primaryInclude': '"InspectorBackendDispatchers.h"',
              'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
          }
  
@@ -131,7 +131,6 @@ class BackendDispatcherImplementationGenerator(Generator):
  
          for parameter in command.return_parameters:
              param_args = {
-                'frameworkPrefix': self.model().framework.setting('prefix'),
                  'keyedSetMethod': Generator.keyed_set_method_for_type(parameter.type),
                  'parameterName': parameter.parameter_name,
                  'parameterType': Generator.type_string_for_stack_in_parameter(parameter),
@@ -147,7 +146,7 @@ class BackendDispatcherImplementationGenerator(Generator):
                      out_parameter_assignments.append('    if (%(parameterName)s)' % param_args)
                      out_parameter_assignments.append('        jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
              elif parameter.type.is_enum():
-                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(%(parameterName)s));' % param_args)
+                out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::getEnumConstantValue(%(parameterName)s));' % param_args)
              else:
                  out_parameter_assignments.append('    jsonMessage->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), %(parameterName)s);' % param_args)
  
@@ -202,7 +201,7 @@ class BackendDispatcherImplementationGenerator(Generator):
                      'parameterType': Generator.type_string_for_stack_out_parameter(parameter),
                      'parameterName': parameter.parameter_name,
                      'keyedSetMethod': Generator.keyed_set_method_for_type(parameter.type),
-                    'frameworkPrefix': self.model().framework.setting('prefix')
+
                  }
  
                  out_parameter_declarations.append('    %(parameterType)s out_%(parameterName)s;' % param_args)
@@ -214,7 +213,7 @@ class BackendDispatcherImplementationGenerator(Generator):
                          out_parameter_assignments.append('        if (out_%(parameterName)s)' % param_args)
                          out_parameter_assignments.append('            result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
                  elif parameter.type.is_enum():
-                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(out_%(parameterName)s));' % param_args)
+                    out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), Inspector::Protocol::getEnumConstantValue(out_%(parameterName)s));' % param_args)
                  else:
                      out_parameter_assignments.append('        result->%(keyedSetMethod)s(ASCIILiteral("%(parameterName)s"), out_%(parameterName)s);' % param_args)
  
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py

index 8554147..ab218db 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py
@@ -42,14 +42,14 @@ class FrontendDispatcherHeaderGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sFrontendDispatchers.h" % self.model().framework.setting('prefix')
+        return "InspectorFrontendDispatchers.h"
  
      def domains_to_generate(self):
          return filter(lambda domain: len(domain.events) > 0, Generator.domains_to_generate(self))
  
      def generate_output(self):
          headers = [
-            '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
+            '"InspectorProtocolObjects.h"',
              '<inspector/InspectorFrontendChannel.h>',
              '<inspector/InspectorValues.h>',
              '<wtf/PassRefPtr.h>',
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py

index 9577045..71d1c9d 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py
@@ -41,7 +41,7 @@ class FrontendDispatcherImplementationGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sFrontendDispatchers.cpp" % self.model().framework.setting('prefix')
+        return "InspectorFrontendDispatchers.cpp"
  
      def domains_to_generate(self):
          return filter(lambda domain: len(domain.events) > 0, Generator.domains_to_generate(self))
@@ -50,7 +50,7 @@ class FrontendDispatcherImplementationGenerator(Generator):
          secondary_headers = ['<wtf/text/CString.h>']
  
          header_args = {
-            'primaryInclude': '"Inspector%sFrontendDispatchers.h"' % self.model().framework.setting('prefix'),
+            'primaryInclude': '"InspectorFrontendDispatchers.h"',
              'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
          }
  
@@ -81,8 +81,7 @@ class FrontendDispatcherImplementationGenerator(Generator):
              if parameter.is_optional and not Generator.should_pass_by_copy_for_return_type(parameter.type):
                  parameter_value = '*' + parameter_value
              if parameter.type.is_enum():
-                framework_prefix = self.model().framework.setting('prefix')
-                parameter_value = 'Inspector::Protocol::get%sEnumConstantValue(%s)' % (framework_prefix, parameter_value)
+                parameter_value = 'Inspector::Protocol::getEnumConstantValue(%s)' % parameter_value
  
              parameter_args = {
                  'parameterType': Generator.type_string_for_stack_out_parameter(parameter),
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py

index b46d788..ecfe3ab 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py
@@ -42,7 +42,7 @@ class ProtocolTypesHeaderGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sProtocolTypes.h" % self.model().framework.setting('prefix')
+        return "InspectorProtocolObjects.h"
  
      def generate_output(self):
          domains = self.domains_to_generate()
@@ -54,11 +54,7 @@ class ProtocolTypesHeaderGenerator(Generator):
              '<wtf/PassRefPtr.h>'
          ])
  
-        if self.model().framework is not Frameworks.JavaScriptCore:
-            headers.add('<inspector/InspectorJSProtocolTypes.h>')
-
          export_macro = self.model().framework.setting('export_macro', None)
-        framework_prefix = self.model().framework.setting('prefix')
  
          header_args = {
              'headerGuardString': re.sub('\W+', '_', self.output_filename()),
@@ -77,11 +73,11 @@ class ProtocolTypesHeaderGenerator(Generator):
          sections.append('namespace Protocol {')
          sections.append(self._generate_forward_declarations(domains))
          sections.append(self._generate_typedefs(domains))
-        sections.append('%s get%sEnumConstantValue(int code);' % (' '.join(return_type_with_export_macro), framework_prefix))
+        sections.append('%s getEnumConstantValue(int code);' % ' '.join(return_type_with_export_macro))
          sections.append('\n'.join([
-            'template<typename T> %s get%sEnumConstantValue(T enumValue)' % (return_type, framework_prefix),
+            'template<typename T> %s getEnumConstantValue(T enumValue)' % return_type,
              '{',
-            '    return get%sEnumConstantValue(static_cast<int>(enumValue));' % framework_prefix,
+            '    return getEnumConstantValue(static_cast<int>(enumValue));',
              '}']))
  
          builder_sections = map(self._generate_builders_for_domain, domains)
@@ -218,7 +214,8 @@ class ProtocolTypesHeaderGenerator(Generator):
              lines.append('')
              lines.append('    // Property names for type generated as open.')
              for type_member in type_declaration.type_members:
-                lines.append('    static const char* %s;' % ucfirst(type_member.member_name))
+                export_macro = self.model().framework.setting('export_macro', None)
+                lines.append('    %s static const char* %s;' % (export_macro, ucfirst(type_member.member_name)))
  
          lines.append('};')
          lines.append('')
@@ -271,7 +268,6 @@ class ProtocolTypesHeaderGenerator(Generator):
      def _generate_builder_setter_for_member(self, type_member, domain):
          setter_args = {
              'camelName': ucfirst(type_member.member_name),
-            'frameworkPrefix': self.model().framework.setting('prefix'),
              'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
              'name': type_member.member_name,
              'parameterType': Generator.type_string_for_type_member(type_member)
@@ -284,7 +280,7 @@ class ProtocolTypesHeaderGenerator(Generator):
          lines.append('            COMPILE_ASSERT(!(STATE & %(camelName)sSet), property_%(name)s_already_set);' % setter_args)
  
          if isinstance(type_member.type, EnumType):
-            lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
+            lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::getEnumConstantValue(static_cast<int>(value)));' % setter_args)
          else:
              lines.append('            m_result->%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
          lines.append('            return castState<%(camelName)sSet>();' % setter_args)
@@ -294,7 +290,6 @@ class ProtocolTypesHeaderGenerator(Generator):
      def _generate_unchecked_setter_for_member(self, type_member, domain):
          setter_args = {
              'camelName': ucfirst(type_member.member_name),
-            'frameworkPrefix': self.model().framework.setting('prefix'),
              'keyedSet': Generator.keyed_set_method_for_type(type_member.type),
              'name': type_member.member_name,
              'parameterType': Generator.type_string_for_type_member(type_member)
@@ -305,7 +300,7 @@ class ProtocolTypesHeaderGenerator(Generator):
          lines.append('    void set%(camelName)s(%(parameterType)s value)' % setter_args)
          lines.append('    {')
          if isinstance(type_member.type, EnumType):
-            lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::get%(frameworkPrefix)sEnumConstantValue(static_cast<int>(value)));' % setter_args)
+            lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), Inspector::Protocol::getEnumConstantValue(static_cast<int>(value)));' % setter_args)
          else:
              lines.append('        InspectorObjectBase::%(keyedSet)s(ASCIILiteral("%(name)s"), value);' % setter_args)
          lines.append('    }')
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py b/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py

index 76e12ff..d83ba12 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py
@@ -41,7 +41,7 @@ class ProtocolTypesImplementationGenerator(Generator):
          Generator.__init__(self, model, input_filepath)
  
      def output_filename(self):
-        return "Inspector%sProtocolTypes.cpp" % self.model().framework.setting('prefix')
+        return "InspectorProtocolObjects.cpp"
  
      def generate_output(self):
          domains = self.domains_to_generate()
@@ -50,7 +50,7 @@ class ProtocolTypesImplementationGenerator(Generator):
          secondary_headers = ['<wtf/text/CString.h>']
  
          header_args = {
-            'primaryInclude': '"Inspector%sProtocolTypes.h"' % self.model().framework.setting('prefix'),
+            'primaryInclude': '"InspectorProtocolObjects.h"',
              'secondaryIncludes': "\n".join(['#include %s' % header for header in secondary_headers]),
          }
  
@@ -70,17 +70,14 @@ class ProtocolTypesImplementationGenerator(Generator):
      # Private methods.
  
      def _generate_enum_mapping(self):
-        framework_prefix = self.model().framework.setting('prefix')
          lines = []
-
          lines.append('static const char* const enum_constant_values[] = {')
          lines.extend(['    "%s",' % enum_value for enum_value in self.assigned_enum_values()])
          lines.append('};')
          lines.append('')
-        lines.append('String get%sEnumConstantValue(int code) {' % framework_prefix)
+        lines.append('String getEnumConstantValue(int code) {')
          lines.append('    return enum_constant_values[code];')
          lines.append('}')
-
          return '\n'.join(lines)
  
      def _generate_open_field_names(self):
diff --git a/Source/JavaScriptCore/inspector/scripts/codegen/models.py b/Source/JavaScriptCore/inspector/scripts/codegen/models.py

index 69af34a..fdfeeeb 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/codegen/models.py
+++ b/Source/JavaScriptCore/inspector/scripts/codegen/models.py
@@ -35,18 +35,12 @@ def ucfirst(str):
  
  _FRAMEWORK_CONFIG_MAP = {
      "Global": {
-        "prefix": "",
      },
      "JavaScriptCore": {
-        "prefix": "JS",
          "export_macro": "JS_EXPORT_PRIVATE"
      },
-    "WebCore": {
-        "prefix": "Web",
-    },
      # Used for code generator tests.
      "Test": {
-        "prefix": "Test",
      }
  }
  
@@ -75,9 +69,6 @@ class Framework:
          if frameworkString == "JavaScriptCore":
              return Frameworks.JavaScriptCore
  
-        if frameworkString == "WebCore":
-            return Frameworks.WebCore
-
          if frameworkString == "Test":
              return Frameworks.Test
  
@@ -87,7 +78,6 @@ class Framework:
  class Frameworks:
      Global = Framework("Global")
      JavaScriptCore = Framework("JavaScriptCore")
-    WebCore = Framework("WebCore")
      Test = Framework("Test")
  
  
diff --git a/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py b/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py

index 9ba1b32..17cdfa1 100755 (executable)
--- a/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
+++ b/Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
@@ -148,7 +148,7 @@ def generate_from_specification(primary_specification_filepath=None,
  
  
  if __name__ == '__main__':
-    allowed_framework_names = ['JavaScriptCore', 'WebCore', 'Test']
+    allowed_framework_names = ['JavaScriptCore', 'Test']
      cli_parser = optparse.OptionParser(usage="usage: %prog [options] PrimaryProtocol.json [SupplementalProtocol.json ...]")
      cli_parser.add_option("-o", "--outputDir", help="Directory where generated files should be written.")
      cli_parser.add_option("--framework", type="choice", choices=allowed_framework_names, help="The framework that the primary specification belongs to.")
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result

index 4117989..073249a 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -36,9 +36,9 @@ InspectorBackend.registerCommand("Database.executeSQLSyncOptionalReturnValues",
  InspectorBackend.registerCommand("Database.executeSQLAsyncOptionalReturnValues", [{"name": "databaseId", "type": "number", "optional": false}, {"name": "query", "type": "string", "optional": false}], ["columnNames", "notes", "timestamp", "values", "payload", "databaseId", "sqlError", "screenColor", "printColor"]);
  InspectorBackend.registerCommand("Database.executeSQLSync", [{"name": "databaseId", "type": "number", "optional": false}, {"name": "query", "type": "string", "optional": false}], ["columnNames", "notes", "timestamp", "values", "payload", "databaseId", "sqlError", "screenColor", "printColor"]);
  InspectorBackend.registerCommand("Database.executeSQLAsync", [{"name": "databaseId", "type": "number", "optional": false}, {"name": "query", "type": "string", "optional": false}], ["columnNames", "notes", "timestamp", "values", "payload", "databaseId", "sqlError", "screenColor", "printColor"]);
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -69,12 +69,12 @@ InspectorBackend.registerCommand("Database.executeSQLAsync", [{"name": "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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -134,10 +134,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -169,7 +169,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -346,8 +346,8 @@ void InspectorDatabaseBackendDispatcher::executeSQLSync(long callId, const Inspe
          result->setValue(ASCIILiteral("payload"), out_payload);
          result->setInteger(ASCIILiteral("databaseId"), out_databaseId);
          result->setObject(ASCIILiteral("sqlError"), out_sqlError);
-        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
-        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
+        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(out_screenColor));
+        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(out_printColor));
      }
      m_backendDispatcher->sendResponse(callId, result.release(), error);
  }
@@ -364,8 +364,8 @@ void InspectorDatabaseBackendDispatcherHandler::ExecuteSQLAsyncCallback::sendSuc
      jsonMessage->setValue(ASCIILiteral("payload"), payload);
      jsonMessage->setInteger(ASCIILiteral("databaseId"), databaseId);
      jsonMessage->setObject(ASCIILiteral("sqlError"), sqlError);
-    jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(screenColor));
-    jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(printColor));
+    jsonMessage->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(screenColor));
+    jsonMessage->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(printColor));
      sendIfActive(jsonMessage, ErrorString());
  }
  
@@ -399,9 +399,9 @@ void InspectorDatabaseBackendDispatcher::executeSQLAsync(long callId, const Insp
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -432,12 +432,12 @@ void InspectorDatabaseBackendDispatcher::executeSQLAsync(long callId, const Insp
  // 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -451,10 +451,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -486,7 +486,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -498,9 +498,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -531,12 +531,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -562,11 +561,11 @@ typedef int DatabaseId;
  } // Database
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Database {
@@ -654,10 +653,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -689,7 +688,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -709,7 +708,7 @@ static const char* const enum_constant_values[] = {
      "black",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -721,4 +720,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result

index 707b548..2f834bf 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -33,9 +33,9 @@
  InspectorBackend.registerEnum("Database.PrimaryColors", {Red: "red", Green: "green", Blue: "blue"});
  InspectorBackend.registerCommand("Database.executeAllOptionalParameters", [{"name": "columnNames", "type": "object", "optional": true}, {"name": "notes", "type": "string", "optional": true}, {"name": "timestamp", "type": "number", "optional": true}, {"name": "values", "type": "object", "optional": true}, {"name": "payload", "type": "object", "optional": true}, {"name": "databaseId", "type": "number", "optional": true}, {"name": "sqlError", "type": "object", "optional": true}, {"name": "screenColor", "type": "string", "optional": true}, {"name": "printColor", "type": "string", "optional": true}], ["columnNames", "notes", "timestamp", "values", "payload", "databaseId", "sqlError", "screenColor", "printColor"]);
  InspectorBackend.registerCommand("Database.executeNoOptionalParameters", [{"name": "columnNames", "type": "object", "optional": false}, {"name": "notes", "type": "string", "optional": false}, {"name": "timestamp", "type": "number", "optional": false}, {"name": "values", "type": "object", "optional": false}, {"name": "payload", "type": "object", "optional": false}, {"name": "databaseId", "type": "number", "optional": false}, {"name": "sqlError", "type": "object", "optional": false}, {"name": "screenColor", "type": "string", "optional": false}, {"name": "printColor", "type": "string", "optional": false}], ["columnNames", "notes", "timestamp", "values", "payload", "databaseId", "sqlError", "screenColor", "printColor"]);
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -66,12 +66,12 @@ InspectorBackend.registerCommand("Database.executeNoOptionalParameters", [{"name
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -117,10 +117,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -152,7 +152,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -296,8 +296,8 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
          result->setValue(ASCIILiteral("payload"), out_payload);
          result->setInteger(ASCIILiteral("databaseId"), out_databaseId);
          result->setObject(ASCIILiteral("sqlError"), out_sqlError);
-        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getTestEnumConstantValue(out_screenColor));
-        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getTestEnumConstantValue(out_printColor));
+        result->setString(ASCIILiteral("screenColor"), Inspector::Protocol::getEnumConstantValue(out_screenColor));
+        result->setString(ASCIILiteral("printColor"), Inspector::Protocol::getEnumConstantValue(out_printColor));
      }
      m_backendDispatcher->sendResponse(callId, result.release(), error);
  }
@@ -306,9 +306,9 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -339,12 +339,12 @@ void InspectorDatabaseBackendDispatcher::executeNoOptionalParameters(long callId
  // 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -358,10 +358,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -393,7 +393,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -405,9 +405,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -438,12 +438,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -469,11 +468,11 @@ typedef int DatabaseId;
  } // Database
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Database {
@@ -561,10 +560,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -596,7 +595,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -616,7 +615,7 @@ static const char* const enum_constant_values[] = {
      "black",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -628,4 +627,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result

index 55dbd52..ff8076a 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -40,9 +40,9 @@ InspectorBackend.registerCommand("Network3.loadResource4", [], []);
  InspectorBackend.registerCommand("Network3.loadResource5", [], []);
  InspectorBackend.registerCommand("Network3.loadResource6", [], []);
  InspectorBackend.registerCommand("Network3.loadResource7", [], []);
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -73,12 +73,12 @@ InspectorBackend.registerCommand("Network3.loadResource7", [], []);
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -139,10 +139,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -174,7 +174,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -331,9 +331,9 @@ void InspectorNetwork3BackendDispatcher::loadResource7(long callId, const Inspec
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -364,12 +364,12 @@ void InspectorNetwork3BackendDispatcher::loadResource7(long callId, const Inspec
  // 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -383,10 +383,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -418,7 +418,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -430,9 +430,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -463,12 +463,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -488,11 +487,11 @@ typedef String LoaderId;
  } // Network2
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  
@@ -503,10 +502,10 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -538,7 +537,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -551,7 +550,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -563,4 +562,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result

index c988761..84951bb 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -33,9 +33,9 @@
  InspectorBackend.registerDatabaseDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Database");
  InspectorBackend.registerEvent("Database.didExecuteOptionalParameters", ["columnNames", "notes", "timestamp", "values", "payload", "sqlError", "screenColor", "printColor"]);
  InspectorBackend.registerEvent("Database.didExecuteNoOptionalParameters", ["columnNames", "notes", "timestamp", "values", "payload", "sqlError", "screenColor", "printColor"]);
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -66,12 +66,12 @@ InspectorBackend.registerEvent("Database.didExecuteNoOptionalParameters", ["colu
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -84,10 +84,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -119,7 +119,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -135,9 +135,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -168,12 +168,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -196,10 +196,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -231,7 +231,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -287,9 +287,9 @@ void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRef
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -320,12 +320,11 @@ void InspectorDatabaseFrontendDispatcher::didExecuteNoOptionalParameters(PassRef
  // 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -352,11 +351,11 @@ typedef String PrimaryColors;
  } // Database
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Database {
@@ -438,10 +437,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -473,7 +472,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -486,7 +485,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -498,4 +497,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result

index a22caba..9f1c2cb 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -35,9 +35,9 @@ InspectorBackend.registerCommand("Network1.loadResource", [], []);
  // Network3.
  InspectorBackend.registerNetwork3Dispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Network3");
  InspectorBackend.registerEvent("Network3.resourceLoaded", []);
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -68,12 +68,12 @@ InspectorBackend.registerEvent("Network3.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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -108,10 +108,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -143,7 +143,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -194,9 +194,9 @@ void InspectorNetwork1BackendDispatcher::loadResource(long callId, const Inspect
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -227,12 +227,12 @@ void InspectorNetwork1BackendDispatcher::loadResource(long callId, const Inspect
  // 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -256,10 +256,10 @@ private:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -291,7 +291,7 @@ private:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -313,9 +313,9 @@ void InspectorNetwork3FrontendDispatcher::resourceLoaded()
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -346,12 +346,11 @@ void InspectorNetwork3FrontendDispatcher::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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -373,11 +372,11 @@ class NetworkError;
  
  
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  #if PLATFORM(WEB_TYPES)
@@ -460,10 +459,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -495,7 +494,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -508,7 +507,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -520,4 +519,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result

index 5421554..5d90f5b 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -28,9 +28,9 @@
  
  // 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
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -61,12 +61,12 @@
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -79,10 +79,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -114,7 +114,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -130,9 +130,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -163,12 +163,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -182,10 +182,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -217,7 +217,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -229,9 +229,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,12 +262,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -292,11 +291,11 @@ typedef String RemoteObjectId;
  } // Runtime2
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  
@@ -307,10 +306,10 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -342,7 +341,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -355,7 +354,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -367,4 +366,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result

index d9db13f..8cef6a9 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -28,9 +28,9 @@
  
  // 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
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -61,12 +61,12 @@
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -79,10 +79,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -114,7 +114,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -130,9 +130,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -163,12 +163,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -182,10 +182,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -217,7 +217,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -229,9 +229,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,12 +262,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -287,11 +286,11 @@ class KeyPath;
  
  
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Runtime {
@@ -331,7 +330,7 @@ public:
          Builder<STATE | TypeSet>& setType(Type value)
          {
              COMPILE_ASSERT(!(STATE & TypeSet), property_type_already_set);
-            m_result->setString(ASCIILiteral("type"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
+            m_result->setString(ASCIILiteral("type"), Inspector::Protocol::getEnumConstantValue(static_cast<int>(value)));
              return castState<TypeSet>();
          }
  
@@ -380,10 +379,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -415,7 +414,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -431,7 +430,7 @@ static const char* const enum_constant_values[] = {
      "array",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -443,4 +442,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result

index 5f156dc..460aedf 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -28,9 +28,9 @@
  
  // 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
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -61,12 +61,12 @@
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -79,10 +79,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -114,7 +114,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -130,9 +130,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -163,12 +163,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -182,10 +182,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -217,7 +217,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -229,9 +229,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,12 +262,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -287,11 +286,11 @@ typedef int RemoteObjectId;
  } // Runtime
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  
@@ -302,10 +301,10 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -337,7 +336,7 @@ template<typename T> String getTestEnumConstantValue(T enumValue)
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -350,7 +349,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -362,4 +361,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result

index 288c8d9..11379fe 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -31,9 +31,9 @@
  
  // Debugger.
  InspectorBackend.registerEnum("Debugger.Reason", {Died: "Died", Fainted: "Fainted", Hungry: "Hungry"});
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -64,12 +64,12 @@ 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -82,10 +82,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -117,7 +117,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -133,9 +133,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -166,12 +166,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -185,10 +185,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -220,7 +220,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -232,9 +232,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -265,12 +265,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -298,11 +297,11 @@ typedef int ObjectId;
  } // Runtime
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Debugger {
@@ -322,10 +321,10 @@ enum class Reason {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -357,7 +356,7 @@ enum class Reason {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -373,7 +372,7 @@ static const char* const enum_constant_values[] = {
      "Hungry",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -385,4 +384,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result

index 6a82bde..8271886 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -32,9 +32,9 @@
  // Runtime.
  InspectorBackend.registerEnum("Runtime.FarmAnimals", {Pigs: "Pigs", Cows: "Cows", Cats: "Cats", Hens: "Hens"});
  InspectorBackend.registerEnum("Runtime.TwoLeggedAnimals", {Ducks: "Ducks", Hens: "Hens", Crows: "Crows", Flamingos: "Flamingos"});
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -65,12 +65,12 @@ 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -83,10 +83,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -118,7 +118,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -134,9 +134,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -167,12 +167,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -186,10 +186,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,7 +221,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -233,9 +233,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -266,12 +266,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -292,11 +291,11 @@ enum class TwoLeggedAnimals;
  
  
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Runtime {
@@ -324,10 +323,10 @@ enum class TwoLeggedAnimals {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -359,7 +358,7 @@ enum class TwoLeggedAnimals {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -379,7 +378,7 @@ static const char* const enum_constant_values[] = {
      "Flamingos",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -391,4 +390,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result

index ca8fd2a..6ee3335 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -28,9 +28,9 @@
  
  // 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
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -61,12 +61,12 @@
  // 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -79,10 +79,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -114,7 +114,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -130,9 +130,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -163,12 +163,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -182,10 +182,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -217,7 +217,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -229,9 +229,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -262,12 +262,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -295,11 +294,11 @@ class ParameterBundle;
  
  
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Database {
@@ -764,10 +763,10 @@ public:
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -799,7 +798,7 @@ public:
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -812,7 +811,7 @@ namespace Protocol {
  static const char* const enum_constant_values[] = {
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -824,4 +823,4 @@ String getTestEnumConstantValue(int code) {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result

index a189bb9..780a6ae 100644 (file)
--- a/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result
+++ b/Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result
@@ -1,4 +1,4 @@
-### Begin File: InspectorTestBackendCommands.js
+### Begin File: InspectorBackendCommands.js
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -32,9 +32,9 @@
  // Test.
  InspectorBackend.registerEnum("Test.UncastedAnimals", {Pigs: "Pigs", Cows: "Cows", Cats: "Cats", Hens: "Hens"});
  InspectorBackend.registerEnum("Test.CastedAnimals", {Ducks: "Ducks", Hens: "Hens", Crows: "Crows", Flamingos: "Flamingos"});
-### End File: InspectorTestBackendCommands.js
+### End File: InspectorBackendCommands.js
  
-### Begin File: InspectorTestBackendDispatchers.h
+### Begin File: InspectorBackendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -65,12 +65,12 @@ 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 InspectorTestBackendDispatchers_h
-#define InspectorTestBackendDispatchers_h
+#ifndef InspectorBackendDispatchers_h
+#define InspectorBackendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorBackendDispatcher.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/text/WTFString.h>
@@ -83,10 +83,10 @@ typedef String ErrorString;
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestBackendDispatchers_h)
-### End File: InspectorTestBackendDispatchers.h
+#endif // !defined(InspectorBackendDispatchers_h)
+### End File: InspectorBackendDispatchers.h
  
-### Begin File: InspectorTestBackendDispatchers.cpp
+### Begin File: InspectorBackendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -118,7 +118,7 @@ typedef String ErrorString;
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -134,9 +134,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestBackendDispatchers.cpp
+### End File: InspectorBackendDispatchers.cpp
  
-### Begin File: InspectorTestFrontendDispatchers.h
+### Begin File: InspectorFrontendDispatchers.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -167,12 +167,12 @@ 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 InspectorTestFrontendDispatchers_h
-#define InspectorTestFrontendDispatchers_h
+#ifndef InspectorFrontendDispatchers_h
+#define InspectorFrontendDispatchers_h
  
  #if ENABLE(INSPECTOR)
  
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include <inspector/InspectorFrontendChannel.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/PassRefPtr.h>
@@ -186,10 +186,10 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestFrontendDispatchers_h)
-### End File: InspectorTestFrontendDispatchers.h
+#endif // !defined(InspectorFrontendDispatchers_h)
+### End File: InspectorFrontendDispatchers.h
  
-### Begin File: InspectorTestFrontendDispatchers.cpp
+### Begin File: InspectorFrontendDispatchers.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -221,7 +221,7 @@ namespace Inspector {
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -233,9 +233,9 @@ namespace Inspector {
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestFrontendDispatchers.cpp
+### End File: InspectorFrontendDispatchers.cpp
  
-### Begin File: InspectorTestProtocolTypes.h
+### Begin File: InspectorProtocolObjects.h
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -266,12 +266,11 @@ 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 InspectorTestProtocolTypes_h
-#define InspectorTestProtocolTypes_h
+#ifndef InspectorProtocolObjects_h
+#define InspectorProtocolObjects_h
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSProtocolTypes.h>
  #include <inspector/InspectorProtocolTypes.h>
  #include <wtf/Assertions.h>
  #include <wtf/PassRefPtr.h>
@@ -301,11 +300,11 @@ typedef int UncastedObjectId;
  } // Test
  // End of typedefs.
  
-String getTestEnumConstantValue(int code);
+String getEnumConstantValue(int code);
  
-template<typename T> String getTestEnumConstantValue(T enumValue)
+template<typename T> String getEnumConstantValue(T enumValue)
  {
-    return getTestEnumConstantValue(static_cast<int>(enumValue));
+    return getEnumConstantValue(static_cast<int>(enumValue));
  }
  
  namespace Test {
@@ -357,7 +356,7 @@ public:
          Builder<STATE | AnimalsSet>& setAnimals(Inspector::Protocol::Test::CastedAnimals value)
          {
              COMPILE_ASSERT(!(STATE & AnimalsSet), property_animals_already_set);
-            m_result->setString(ASCIILiteral("animals"), Inspector::Protocol::getTestEnumConstantValue(static_cast<int>(value)));
+            m_result->setString(ASCIILiteral("animals"), Inspector::Protocol::getEnumConstantValue(static_cast<int>(value)));
              return castState<AnimalsSet>();
          }
  
@@ -556,10 +555,10 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
  
  #endif // ENABLE(INSPECTOR)
  
-#endif // !defined(InspectorTestProtocolTypes_h)
-### End File: InspectorTestProtocolTypes.h
+#endif // !defined(InspectorProtocolObjects_h)
+### End File: InspectorProtocolObjects.h
  
-### Begin File: InspectorTestProtocolTypes.cpp
+### Begin File: InspectorProtocolObjects.cpp
  /*
   * Copyright (C) 2013 Google Inc. All rights reserved.
   * Copyright (C) 2013, 2014 Apple Inc. All rights reserved.
@@ -591,7 +590,7 @@ static void assertValueHasExpectedType(Inspector::InspectorValue*);
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
  #include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  
  #if ENABLE(INSPECTOR)
  
@@ -611,7 +610,7 @@ static const char* const enum_constant_values[] = {
      "Cats",
  };
  
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
      return enum_constant_values[code];
  }
  
@@ -724,4 +723,4 @@ void BindingTraits<Inspector::Protocol::Test::RecursiveObject2>::assertValueHasE
  
  #endif // ENABLE(INSPECTOR)
  
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
diff --git a/Source/JavaScriptCore/runtime/TypeProfiler.cpp b/Source/JavaScriptCore/runtime/TypeProfiler.cpp

index 8c7de79..4df8f73 100644 (file)
--- a/Source/JavaScriptCore/runtime/TypeProfiler.cpp
+++ b/Source/JavaScriptCore/runtime/TypeProfiler.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "TypeProfiler.h"
  
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include "TypeLocation.h"
  
  namespace JSC {
diff --git a/Source/JavaScriptCore/runtime/TypeSet.cpp b/Source/JavaScriptCore/runtime/TypeSet.cpp

index 7f3bdb6..310f64d 100644 (file)
--- a/Source/JavaScriptCore/runtime/TypeSet.cpp
+++ b/Source/JavaScriptCore/runtime/TypeSet.cpp
@@ -26,7 +26,7 @@
  #include "config.h"
  #include "TypeSet.h"
  
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
  #include "JSCJSValue.h"
  #include "JSCJSValueInlines.h"
  #include <wtf/text/CString.h>
diff --git a/Source/PlatformEfl.cmake b/Source/PlatformEfl.cmake

index e9b1793..1f05014 100644 (file)
--- a/Source/PlatformEfl.cmake
+++ b/Source/PlatformEfl.cmake
@@ -4,8 +4,7 @@ if (ENABLE_INSPECTOR)
      add_custom_target(
          web-inspector-resources ALL
          COMMAND ${CMAKE_COMMAND} -E copy_directory ${WEBINSPECTORUI_DIR}/UserInterface ${WEB_INSPECTOR_DIR}
-        COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorJSBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
-        COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
+        COMMAND ${CMAKE_COMMAND} -E copy ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorBackendCommands.js ${WEB_INSPECTOR_DIR}/Protocol
          COMMAND ${CMAKE_COMMAND} -E copy ${WEBINSPECTORUI_DIR}/Localizations/en.lproj/localizedStrings.js ${WEB_INSPECTOR_DIR}
          COMMAND ${CMAKE_COMMAND} -E copy ${WEBKIT2_DIR}/UIProcess/InspectorServer/front-end/inspectorPageIndex.html ${WEB_INSPECTOR_DIR}
          DEPENDS JavaScriptCore WebCore
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt

index 67d218b..822a604 100644 (file)
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -785,35 +785,6 @@ set(WebCore_IDL_FILES
  
  set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
  
-set(WebCore_INSPECTOR_PROTOCOL_SCRIPTS
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_commands.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_header.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_backend_dispatcher_implementation.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_header.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_frontend_dispatcher_implementation.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_header.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generate_protocol_types_implementation.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/generator_templates.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/__init__.py
-    ${WebCore_INSPECTOR_SCRIPTS_DIR}/codegen/models.py
-)
-
-set(WebCore_INSPECTOR_DOMAINS
-    ${WEBCORE_DIR}/inspector/protocol/ApplicationCache.json
-    ${WEBCORE_DIR}/inspector/protocol/CSS.json
-    ${WEBCORE_DIR}/inspector/protocol/DOM.json
-    ${WEBCORE_DIR}/inspector/protocol/DOMDebugger.json
-    ${WEBCORE_DIR}/inspector/protocol/DOMStorage.json
-    ${WEBCORE_DIR}/inspector/protocol/IndexedDB.json
-    ${WEBCORE_DIR}/inspector/protocol/LayerTree.json
-    ${WEBCORE_DIR}/inspector/protocol/Network.json
-    ${WEBCORE_DIR}/inspector/protocol/Page.json
-    ${WEBCORE_DIR}/inspector/protocol/Timeline.json
-    ${WEBCORE_DIR}/inspector/protocol/Worker.json
-)
-
  set(WebCore_SOURCES
      Modules/airplay/WebKitPlaybackTargetAvailabilityEvent.cpp
  
@@ -2797,10 +2768,6 @@ if (ENABLE_SQL_DATABASE)
      list(APPEND WebCore_IDL_FILES
          Modules/webdatabase/WorkerGlobalScopeWebDatabase.idl
      )
-
-    list(APPEND WebCore_INSPECTOR_DOMAINS
-        ${WEBCORE_DIR}/inspector/protocol/Database.json
-    )
  endif ()
  
  if (NOT ENABLE_NETSCAPE_PLUGIN_API)
@@ -3105,9 +3072,6 @@ if (WTF_USE_3D_GRAPHICS)
  endif ()
  
  if (ENABLE_WEB_REPLAY)
-    list(APPEND WebCore_INSPECTOR_DOMAINS
-        ${WEBCORE_DIR}/inspector/protocol/Replay.json
-    )
      list(APPEND WebCore_INCLUDE_DIRECTORIES
          "${JAVASCRIPTCORE_DIR}/inspector"
          "${JAVASCRIPTCORE_DIR}/replay"
@@ -3207,36 +3171,6 @@ set(IDL_ATTRIBUTES_FILE ${WEBCORE_DIR}/bindings/scripts/IDLAttributes.txt)
  
  WEBKIT_INCLUDE_CONFIG_FILES_IF_EXISTS()
  
-# Generate InspectorWeb.json
-add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
-    MAIN_DEPENDENCY ${WebCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py
-    DEPENDS ${WebCore_INSPECTOR_DOMAINS}
-    COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${WebCore_INSPECTOR_DOMAINS} > ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
-    VERBATIM)
-
-# All Web Inspector generated files are created with this one call to generate-inspector-protocol-bindings.py
-add_custom_command(
-    OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.h
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.h
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
-           ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.h
-           ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol/InspectorWebBackendCommands.js
-    MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
-    DEPENDS ${WebCore_INSPECTOR_PROTOCOL_SCRIPTS}
-            ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
-    COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/generate-inspector-protocol-bindings.py --outputDir "${DERIVED_SOURCES_WEBCORE_DIR}" --framework WebCore ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json && cp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendCommands.js ${DERIVED_SOURCES_WEBINSPECTORUI_DIR}/UserInterface/Protocol
-    VERBATIM)
-
-list(APPEND WebCore_SOURCES
-    ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
-    ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebProtocolTypes.cpp
-)
-
-
  # Generate InspectorOverlayPage.h
  add_custom_command(
      OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorOverlayPage.combined.html
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog

index b78d595..1fd96d7 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,64 @@
+2014-10-20  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Generate all Inspector domains together in JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=137748
+
+        Reviewed by Brian Burg.
+
+        After moving the json files into JavaScriptCore update the includes,
+        and names of functions that were previously prefixed.
+
+        * CMakeLists.txt:
+        * DerivedSources.make:
+        * ForwardingHeaders/inspector/InspectorBackendDispatchers.h: Added.
+        * ForwardingHeaders/inspector/InspectorFrontendDispatchers.h: Added.
+        * ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h: Removed.
+        * ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h: Removed.
+        * ForwardingHeaders/inspector/InspectorJSProtocolTypes.h: Removed.
+        * ForwardingHeaders/inspector/InspectorProtocolTypesBase.h: Added.
+        * WebCore.vcxproj/WebCore.vcxproj:
+        * WebCore.vcxproj/WebCore.vcxproj.filters:
+        * WebCore.vcxproj/copyForwardingHeaders.cmd:
+        * WebCore.xcodeproj/project.pbxproj:
+        * inspector/CommandLineAPIHost.cpp:
+        * inspector/InspectorApplicationCacheAgent.cpp:
+        * inspector/InspectorApplicationCacheAgent.h:
+        * inspector/InspectorCSSAgent.cpp:
+        * inspector/InspectorCSSAgent.h:
+        * inspector/InspectorController.cpp:
+        * inspector/InspectorDOMAgent.cpp:
+        (WebCore::InspectorDOMAgent::buildObjectForAccessibilityProperties):
+        * inspector/InspectorDOMAgent.h:
+        * inspector/InspectorDOMDebuggerAgent.cpp:
+        * inspector/InspectorDOMDebuggerAgent.h:
+        * inspector/InspectorDOMStorageAgent.cpp:
+        * inspector/InspectorDOMStorageAgent.h:
+        * inspector/InspectorDatabaseAgent.cpp:
+        * inspector/InspectorDatabaseAgent.h:
+        * inspector/InspectorDatabaseResource.cpp:
+        * inspector/InspectorDatabaseResource.h:
+        * inspector/InspectorFrontendClientLocal.cpp:
+        * inspector/InspectorIndexedDBAgent.cpp:
+        * inspector/InspectorIndexedDBAgent.h:
+        * inspector/InspectorLayerTreeAgent.cpp:
+        * inspector/InspectorLayerTreeAgent.h:
+        * inspector/InspectorPageAgent.cpp:
+        * inspector/InspectorPageAgent.h:
+        * inspector/InspectorReplayAgent.cpp:
+        * inspector/InspectorReplayAgent.h:
+        * inspector/InspectorResourceAgent.cpp:
+        * inspector/InspectorResourceAgent.h:
+        * inspector/InspectorStyleSheet.cpp:
+        * inspector/InspectorStyleSheet.h:
+        * inspector/InspectorTimelineAgent.cpp:
+        (WebCore::InspectorTimelineAgent::addRecordToTimeline):
+        * inspector/InspectorTimelineAgent.h:
+        * inspector/InspectorWorkerAgent.cpp:
+        * inspector/InspectorWorkerAgent.h:
+        * inspector/PageRuntimeAgent.h:
+        * inspector/TimelineRecordFactory.cpp:
+        * inspector/WorkerInspectorController.cpp:
+
  2014-10-20  Andy Estes  <aestes@apple.com>
  
          Fix the GTK build.
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make

index a10e110..8bb150d 100644 (file)
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -1136,64 +1136,7 @@ JS%.h : %.idl $(JS_BINDINGS_SCRIPTS) $(IDL_ATTRIBUTES_FILE) $(WINDOW_CONSTRUCTOR
  
  -include $(SUPPLEMENTAL_MAKEFILE_DEPS)
  
-# Inspector interfaces generator
-
-INSPECTOR_DOMAINS = \
-    $(WebCore)/inspector/protocol/ApplicationCache.json \
-    $(WebCore)/inspector/protocol/CSS.json \
-    $(WebCore)/inspector/protocol/DOM.json \
-    $(WebCore)/inspector/protocol/DOMDebugger.json \
-    $(WebCore)/inspector/protocol/DOMStorage.json \
-    $(WebCore)/inspector/protocol/LayerTree.json \
-    $(WebCore)/inspector/protocol/Network.json \
-    $(WebCore)/inspector/protocol/Page.json \
-    $(WebCore)/inspector/protocol/Timeline.json \
-    $(WebCore)/inspector/protocol/Worker.json \
-#
-
-ifeq ($(findstring ENABLE_SQL_DATABASE,$(FEATURE_DEFINES)), ENABLE_SQL_DATABASE)
-    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(WebCore)/inspector/protocol/Database.json
-endif
-
-ifeq ($(findstring ENABLE_INDEXED_DATABASE,$(FEATURE_DEFINES)), ENABLE_INDEXED_DATABASE)
-    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(WebCore)/inspector/protocol/IndexedDB.json
-endif
-
-ifeq ($(findstring ENABLE_WEB_REPLAY,$(FEATURE_DEFINES)), ENABLE_WEB_REPLAY)
-    INSPECTOR_DOMAINS := $(INSPECTOR_DOMAINS) $(WebCore)/inspector/protocol/Replay.json
-endif
-
-INSPECTOR_GENERATOR_SCRIPTS = \
-    $(InspectorScripts)/generate_backend_commands.py \
-    $(InspectorScripts)/generate_backend_dispatcher_header.py \
-    $(InspectorScripts)/generate_backend_dispatcher_implementation.py \
-    $(InspectorScripts)/generate_frontend_dispatcher_header.py \
-    $(InspectorScripts)/generate_frontend_dispatcher_implementation.py \
-    $(InspectorScripts)/generate_protocol_types_header.py \
-    $(InspectorScripts)/generate_protocol_types_implementation.py \
-    $(InspectorScripts)/generator_templates.py \
-    $(InspectorScripts)/generator.py \
-    $(InspectorScripts)/generate-combined-inspector-json.py \
-    $(InspectorScripts)/generate-inspector-protocol-bindings.py \
-    $(InspectorScripts)/models.py \
-#
-
-all : InspectorWeb.json
-
-# The combined JSON file depends on the actual set of domains and their file contents, so that
-# adding, modifying, or removing domains will trigger regeneration of inspector files.
-
-.PHONY: force
-EnabledInspectorDomains : force
-       echo '$(INSPECTOR_DOMAINS)' | cmp -s - $@ || echo '$(INSPECTOR_DOMAINS)' > $@
-
-InspectorWeb.json : $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) EnabledInspectorDomains
-       $(PYTHON) $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS) > ./InspectorWeb.json
-
-all : InspectorWebFrontendDispatchers.h
-
-InspectorWebFrontendDispatchers.h : InspectorWeb.json $(InspectorScripts)/InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
-       $(PYTHON) $(InspectorScripts)/generate-inspector-protocol-bindings.py --framework WebCore --outputDir . ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json
+# Inspector interfaces
  
  all : InspectorOverlayPage.h
  
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorBackendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorBackendDispatchers.h

new file mode 100644 (file)

index 0000000..5e3f8ea
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorBackendDispatchers.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorBackendDispatchers_h
+#define WebCore_FWD_InspectorBackendDispatchers_h
+#include <JavaScriptCore/InspectorBackendDispatchers.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorFrontendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorFrontendDispatchers.h

new file mode 100644 (file)

index 0000000..a294091
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorFrontendDispatchers.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorFrontendDispatchers_h
+#define WebCore_FWD_InspectorFrontendDispatchers_h
+#include <JavaScriptCore/InspectorFrontendDispatchers.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h

deleted file mode 100644 (file)

index d668187..0000000
--- a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorJSBackendDispatchers_h
-#define WebCore_FWD_InspectorJSBackendDispatchers_h
-#include <JavaScriptCore/InspectorJSBackendDispatchers.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h

deleted file mode 100644 (file)

index 69767b0..0000000
--- a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorJSFrontendDispatchers_h
-#define WebCore_FWD_InspectorJSFrontendDispatchers_h
-#include <JavaScriptCore/InspectorJSFrontendDispatchers.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h

deleted file mode 100644 (file)

index 8b88bb8..0000000
--- a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h
+++ /dev/null
@@ -1,4 +0,0 @@
-#ifndef WebCore_FWD_InspectorJSProtocolTypes_h
-#define WebCore_FWD_InspectorJSProtocolTypes_h
-#include <JavaScriptCore/InspectorJSProtocolTypes.h>
-#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolObjects.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolObjects.h

new file mode 100644 (file)

index 0000000..d2f0b42
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolObjects.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorProtocolObjects_h
+#define WebCore_FWD_InspectorProtocolObjects_h
+#include <JavaScriptCore/InspectorProtocolObjects.h>
+#endif
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj

index 2b87c82..0abcfa0 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
@@ -803,9 +803,6 @@
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Production|x64'">true</ExcludedFromBuild>
      </ClCompile>
      <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp" />
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp" />
      <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
        <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">true</ExcludedFromBuild>
@@ -18299,9 +18296,6 @@
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLElementTypeHelpers.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h" />
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSAttr.h" />
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSBarProp.h" />
@@ -18856,9 +18850,9 @@
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorBackendDispatcher.h" />
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorEnvironment.h" />
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h" />
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h" />
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h" />
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h" />
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorBackendDispatchers.h" />
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendDispatchers.h" />
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolObjects.h" />
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h" />
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h" />
      <ClInclude Include="..\ForwardingHeaders\inspector\ScriptArguments.h" />
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters

index 1e81946..17d115a 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
@@ -5200,15 +5200,6 @@
      <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.cpp">
        <Filter>DerivedSources</Filter>
      </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
-    <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.cpp">
-      <Filter>DerivedSources</Filter>
-    </ClCompile>
      <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
        <Filter>DerivedSources</Filter>
      </ClCompile>
@@ -12303,13 +12294,13 @@
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h">
        <Filter>ForwardingHeaders\inspector</Filter>
      </ClInclude>
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h">
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorBackendDispatchers.h">
        <Filter>ForwardingHeaders\inspector</Filter>
      </ClInclude>
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h">
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendDispatchers.h">
        <Filter>ForwardingHeaders\inspector</Filter>
      </ClInclude>
-    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSProtocolTypes.h">
+    <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolObjects.h">
        <Filter>ForwardingHeaders\inspector</Filter>
      </ClInclude>
      <ClInclude Include="..\ForwardingHeaders\inspector\InspectorProtocolTypes.h">
@@ -13121,15 +13112,6 @@
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorOverlayPage.h">
        <Filter>DerivedSources</Filter>
      </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
-    <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebProtocolTypes.h">
-      <Filter>DerivedSources</Filter>
-    </ClInclude>
      <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h">
        <Filter>DerivedSources</Filter>
      </ClInclude>
diff --git a/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd b/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd

index 6d7e9d0..dc0b59d 100644 (file)
--- a/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
+++ b/Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd
@@ -109,6 +109,5 @@ xcopy /y /d "%ProjectDir%..\testing\js\WebCoreTestSupport.h" "%CONFIGURATIONBUIL
  
  set DerivedSourcesDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\WebCore\DerivedSources
  set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\WebCore\r
-xcopy /y "%DerivedSourcesDirectory%\InspectorWebBackendCommands.js" "%PrivateHeadersDirectory%"
  
  if exist "%CONFIGURATIONBUILDDIR%\buildfailed" del "%CONFIGURATIONBUILDDIR%\buildfailed"
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj

index fe1d3be..84a028b 100644 (file)
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1767,11 +1767,8 @@
                 4E19592E0A39DACC00220FE5 /* MediaQueryExp.h in Headers */ = {isa = PBXBuildFile; fileRef = 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */; };
                 4F1534DE11B532EC0021FD86 /* EditingBehavior.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4F4F5FFB11CBD2E100A186BF /* InspectorWebFrontendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */; };
                 4F6FDD641341DEDD001F8EE3 /* InspectorPageAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */; };
                 4F6FDD651341DEDD001F8EE3 /* InspectorPageAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F6FDD631341DEDD001F8EE3 /* InspectorPageAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               4F707A9911EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F707A9711EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp */; };
-               4F707A9A11EF679400ACDA69 /* InspectorWebBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 4FB390AD15EF61F3007AD51F /* GeneratedImage.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */; };
                 4FFC022B1643B710004E1638 /* NodeRareData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FAB48661643A67E00F70C07 /* NodeRareData.cpp */; };
                 4FFC022D1643B726004E1638 /* ElementRareData.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4FAB48641643A66D00F70C07 /* ElementRareData.cpp */; };
@@ -2044,9 +2041,6 @@
                 53EF766C16531994004CBE49 /* SettingsMacros.h in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 53EF766A16530A61004CBE49 /* SettingsMacros.h */; };
                 550A0BC9085F6039007353D6 /* QualifiedName.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 550A0BC7085F6039007353D6 /* QualifiedName.cpp */; };
                 550A0BCA085F6039007353D6 /* QualifiedName.h in Headers */ = {isa = PBXBuildFile; fileRef = 550A0BC8085F6039007353D6 /* QualifiedName.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */; };
-               578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 57B791A314C6A62900F202D1 /* ContentDistributor.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */; };
                 57B791A414C6A62900F202D1 /* ContentDistributor.h in Headers */ = {isa = PBXBuildFile; fileRef = 57B791A014C6A62900F202D1 /* ContentDistributor.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 57CF497414EE36D700ECFF14 /* InsertionPoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */; };
@@ -3606,8 +3600,6 @@
                 98EB1F951313FE0500D0E1EA /* NotImplemented.h in Headers */ = {isa = PBXBuildFile; fileRef = 98EB1F941313FE0500D0E1EA /* NotImplemented.h */; settings = {ATTRIBUTES = (Private, ); }; };
                 9920398218B95BC600B39AF9 /* UserInputBridge.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9920398018B95BC600B39AF9 /* UserInputBridge.cpp */; };
                 9920398318B95BC600B39AF9 /* UserInputBridge.h in Headers */ = {isa = PBXBuildFile; fileRef = 9920398118B95BC600B39AF9 /* UserInputBridge.h */; settings = {ATTRIBUTES = (Private, ); }; };
-               996231F318D18AC300C03FDA /* InspectorWebBackendCommands.js in Headers */ = {isa = PBXBuildFile; fileRef = 996231F118D189BD00C03FDA /* InspectorWebBackendCommands.js */; };
-               996231F418D22FA200C03FDA /* InspectorWebBackendCommands.js in Copy Generated Headers */ = {isa = PBXBuildFile; fileRef = 996231F118D189BD00C03FDA /* InspectorWebBackendCommands.js */; };
                 99C7CCB318C663E40032E413 /* MemoizedDOMResult.h in Headers */ = {isa = PBXBuildFile; fileRef = 99C7CCB218C663E40032E413 /* MemoizedDOMResult.h */; };
                 99C7CCB518C6B8990032E413 /* MemoizedDOMResult.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 99C7CCB418C6B8990032E413 /* MemoizedDOMResult.cpp */; };
                 99CC0B4D18BE9849006CEBCC /* AllReplayInputs.h in Headers */ = {isa = PBXBuildFile; fileRef = 99CC0B3818BE9849006CEBCC /* AllReplayInputs.h */; };
@@ -6738,7 +6730,6 @@
                         dstPath = PrivateHeaders;
                         dstSubfolderSpec = 1;
                         files = (
-                               996231F418D22FA200C03FDA /* InspectorWebBackendCommands.js in Copy Generated Headers */,
                                 5DF7F5C20F01F92A00526B4B /* CSSPropertyNames.h in Copy Generated Headers */,
                                 7D741BDA177226AA00859170 /* CSSValueKeywords.h in Copy Generated Headers */,
                                 8538F0300AD71CDB006A81D1 /* DOMAbstractView.h in Copy Generated Headers */,
@@ -8847,12 +8838,8 @@
                 4E1959280A39DACC00220FE5 /* MediaQueryExp.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = MediaQueryExp.h; sourceTree = "<group>"; };
                 4F1534DD11B532EC0021FD86 /* EditingBehavior.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehavior.h; sourceTree = "<group>"; };
                 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; };
-               4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebFrontendDispatchers.cpp; sourceTree = "<group>"; };
-               4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebFrontendDispatchers.h; sourceTree = "<group>"; };
                 4F6FDD621341DEDD001F8EE3 /* InspectorPageAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorPageAgent.cpp; sourceTree = "<group>"; };
                 4F6FDD631341DEDD001F8EE3 /* InspectorPageAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorPageAgent.h; sourceTree = "<group>"; };
-               4F707A9711EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebBackendDispatchers.cpp; sourceTree = "<group>"; };
-               4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebBackendDispatchers.h; sourceTree = "<group>"; };
                 4FAB48641643A66D00F70C07 /* ElementRareData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ElementRareData.cpp; sourceTree = "<group>"; };
                 4FAB48661643A67E00F70C07 /* NodeRareData.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = NodeRareData.cpp; sourceTree = "<group>"; };
                 4FB390AC15EF61F3007AD51F /* GeneratedImage.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = GeneratedImage.cpp; sourceTree = "<group>"; };
@@ -9158,8 +9145,6 @@
                 53EF766A16530A61004CBE49 /* SettingsMacros.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsMacros.h; sourceTree = "<group>"; };
                 550A0BC7085F6039007353D6 /* QualifiedName.cpp */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.cpp.cpp; path = QualifiedName.cpp; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
                 550A0BC8085F6039007353D6 /* QualifiedName.h */ = {isa = PBXFileReference; fileEncoding = 30; indentWidth = 4; lastKnownFileType = sourcecode.c.h; path = QualifiedName.h; sourceTree = "<group>"; tabWidth = 8; usesTabs = 0; };
-               573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorWebProtocolTypes.cpp; sourceTree = "<group>"; };
-               573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebProtocolTypes.h; sourceTree = "<group>"; };
                 57B7919F14C6A62900F202D1 /* ContentDistributor.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ContentDistributor.cpp; sourceTree = "<group>"; };
                 57B791A014C6A62900F202D1 /* ContentDistributor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ContentDistributor.h; sourceTree = "<group>"; };
                 57CF497214EE36D700ECFF14 /* InsertionPoint.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InsertionPoint.cpp; sourceTree = "<group>"; };
@@ -10772,7 +10757,6 @@
                 98EB1F941313FE0500D0E1EA /* NotImplemented.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = NotImplemented.h; sourceTree = "<group>"; };
                 9920398018B95BC600B39AF9 /* UserInputBridge.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = UserInputBridge.cpp; sourceTree = "<group>"; };
                 9920398118B95BC600B39AF9 /* UserInputBridge.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UserInputBridge.h; sourceTree = "<group>"; };
-               996231F118D189BD00C03FDA /* InspectorWebBackendCommands.js */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.javascript; path = InspectorWebBackendCommands.js; sourceTree = "<group>"; };
                 99C7CCB218C663E40032E413 /* MemoizedDOMResult.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MemoizedDOMResult.h; sourceTree = "<group>"; };
                 99C7CCB418C6B8990032E413 /* MemoizedDOMResult.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MemoizedDOMResult.cpp; sourceTree = "<group>"; };
                 99CC0B3818BE9849006CEBCC /* AllReplayInputs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AllReplayInputs.h; sourceTree = "<group>"; };
@@ -10965,7 +10949,6 @@
                 A584FE371864DAC100843B10 /* JSCommandLineAPIHostCustom.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCommandLineAPIHostCustom.cpp; sourceTree = "<group>"; };
                 A584FE391864E2D800843B10 /* JSCommandLineAPIHost.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = JSCommandLineAPIHost.cpp; sourceTree = "<group>"; };
                 A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = JSCommandLineAPIHost.h; sourceTree = "<group>"; };
-               A593CF7218402CE900BFCE27 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
                 A593CF8A1840535200BFCE27 /* InspectorWebAgentBase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorWebAgentBase.h; sourceTree = "<group>"; };
                 A5A2AF091829734300DE1729 /* PageDebuggable.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = PageDebuggable.cpp; sourceTree = "<group>"; };
                 A5A2AF0A1829734300DE1729 /* PageDebuggable.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PageDebuggable.h; sourceTree = "<group>"; };
@@ -15173,13 +15156,6 @@
                         isa = PBXGroup;
                         children = (
                                 A584FE2518637DAB00843B10 /* CommandLineAPIModuleSource.h */,
-                               996231F118D189BD00C03FDA /* InspectorWebBackendCommands.js */,
-                               4F707A9711EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp */,
-                               4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */,
-                               4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */,
-                               4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */,
-                               573D134514CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp */,
-                               573D134614CE39FF0057ABCA /* InspectorWebProtocolTypes.h */,
                                 A584FE391864E2D800843B10 /* JSCommandLineAPIHost.cpp */,
                                 A584FE3A1864E2D800843B10 /* JSCommandLineAPIHost.h */,
                                 7A0E771C10C00DB100A0276E /* JSInspectorFrontendHost.cpp */,
@@ -15195,7 +15171,6 @@
                 1C81B94D0E9732D900266E07 /* inspector */ = {
                         isa = PBXGroup;
                         children = (
-                               A593CF7218402CE900BFCE27 /* protocol */,
                                 A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */,
                                 A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */,
                                 A584FE331864D5AF00843B10 /* CommandLineAPIHost.idl */,
@@ -24384,7 +24359,6 @@
                                 CD7DBB2918CA19C600C11066 /* CSSGridLineNamesValue.h in Headers */,
                                 A81369D2097374F600D74463 /* HTMLButtonElement.h in Headers */,
                                 93F199E508245E59001E9ABC /* HTMLCanvasElement.h in Headers */,
-                               996231F318D18AC300C03FDA /* InspectorWebBackendCommands.js in Headers */,
                                 A8DF3FD0097FA0FC0052981B /* HTMLCollection.h in Headers */,
                                 977B3865122883E900B81FF8 /* HTMLConstructionSite.h in Headers */,
                                 F5C041DB0FFCA7CE00839D4A /* HTMLDataListElement.h in Headers */,
@@ -24628,9 +24602,6 @@
                                 82889B4D13C62392009A6156 /* InspectorStyleTextEditor.h in Headers */,
                                 754133A8102E00E800075D00 /* InspectorTimelineAgent.h in Headers */,
                                 A593CF8B1840535200BFCE27 /* InspectorWebAgentBase.h in Headers */,
-                               4F707A9A11EF679400ACDA69 /* InspectorWebBackendDispatchers.h in Headers */,
-                               578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */,
-                               578DA20F1520EBA3006141C1 /* InspectorWebProtocolTypes.h in Headers */,
                                 F3810C1C1365A49600ED6E33 /* InspectorWorkerAgent.h in Headers */,
                                 F375CC071150D300008DDB81 /* InspectorWorkerResource.h in Headers */,
                                 F3ABFE0C130E9DA000E7F7D1 /* InstrumentingAgents.h in Headers */,
@@ -28058,9 +28029,6 @@
                                 82AB1773125C826700C5069D /* InspectorStyleSheet.cpp in Sources */,
                                 82889B4C13C62392009A6156 /* InspectorStyleTextEditor.cpp in Sources */,
                                 754133AA102E00F400075D00 /* InspectorTimelineAgent.cpp in Sources */,
-                               4F707A9911EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp in Sources */,
-                               4F4F5FFB11CBD2E100A186BF /* InspectorWebFrontendDispatchers.cpp in Sources */,
-                               573D134714CE39FF0057ABCA /* InspectorWebProtocolTypes.cpp in Sources */,
                                 F3810C1B1365A49600ED6E33 /* InspectorWorkerAgent.cpp in Sources */,
                                 F350B73513F1377D00880C43 /* InstrumentingAgents.cpp in Sources */,
                                 2D46F04E17B96FBD005647F0 /* IntPoint.cpp in Sources */,
diff --git a/Source/WebCore/inspector/CommandLineAPIHost.cpp b/Source/WebCore/inspector/CommandLineAPIHost.cpp

index 946a91f..254790c 100644 (file)
--- a/Source/WebCore/inspector/CommandLineAPIHost.cpp
+++ b/Source/WebCore/inspector/CommandLineAPIHost.cpp
@@ -41,7 +41,7 @@
  #include "InspectorDOMAgent.h"
  #include "InspectorDOMStorageAgent.h"
  #include "InspectorDatabaseAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include "Pasteboard.h"
  #include "Storage.h"
  #include "markup.h"
diff --git a/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp b/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp

index d755efc..94d4c78 100644 (file)
--- a/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
+++ b/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
@@ -34,11 +34,11 @@
  #include "Frame.h"
  #include "FrameLoader.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "NetworkStateNotifier.h"
  #include "Page.h"
  #include "ResourceResponse.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/text/StringBuilder.h>
  
diff --git a/Source/WebCore/inspector/InspectorApplicationCacheAgent.h b/Source/WebCore/inspector/InspectorApplicationCacheAgent.h

index 7ec772c..9eea621 100644 (file)
--- a/Source/WebCore/inspector/InspectorApplicationCacheAgent.h
+++ b/Source/WebCore/inspector/InspectorApplicationCacheAgent.h
@@ -29,8 +29,8 @@
  
  #include "ApplicationCacheHost.h"
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/Noncopyable.h>
  
  namespace Inspector {
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.cpp b/Source/WebCore/inspector/InspectorCSSAgent.cpp

index c53e7c5..36e1982 100644 (file)
--- a/Source/WebCore/inspector/InspectorCSSAgent.cpp
+++ b/Source/WebCore/inspector/InspectorCSSAgent.cpp
@@ -43,7 +43,6 @@
  #include "HTMLStyleElement.h"
  #include "InspectorDOMAgent.h"
  #include "InspectorHistory.h"
-#include "InspectorWebProtocolTypes.h"
  #include "InstrumentingAgents.h"
  #include "NamedFlowCollection.h"
  #include "Node.h"
@@ -56,7 +55,7 @@
  #include "StyleRule.h"
  #include "StyleSheetList.h"
  #include "WebKitNamedFlow.h"
-#include <inspector/InspectorValues.h>
+#include <inspector/InspectorProtocolObjects.h>
  #include <wtf/CurrentTime.h>
  #include <wtf/HashSet.h>
  #include <wtf/Ref.h>
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.h b/Source/WebCore/inspector/InspectorCSSAgent.h

index 82a38ed..f2986dc 100644 (file)
--- a/Source/WebCore/inspector/InspectorCSSAgent.h
+++ b/Source/WebCore/inspector/InspectorCSSAgent.h
@@ -30,8 +30,8 @@
  #include "InspectorDOMAgent.h"
  #include "InspectorStyleSheet.h"
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
  #include "SecurityContext.h"
+#include <inspector/InspectorBackendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/HashMap.h>
  #include <wtf/HashSet.h>
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp

index 8200481..7f5af07 100644 (file)
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -48,13 +48,10 @@
  #include "InspectorIndexedDBAgent.h"
  #include "InspectorInstrumentation.h"
  #include "InspectorLayerTreeAgent.h"
-#include "InspectorOverlay.h"
  #include "InspectorPageAgent.h"
  #include "InspectorReplayAgent.h"
  #include "InspectorResourceAgent.h"
  #include "InspectorTimelineAgent.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InspectorWorkerAgent.h"
  #include "InstrumentingAgents.h"
  #include "JSDOMWindow.h"
@@ -71,6 +68,8 @@
  #include "WebInjectedScriptManager.h"
  #include <inspector/IdentifiersFactory.h>
  #include <inspector/InspectorBackendDispatcher.h>
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/agents/InspectorAgent.h>
  #include <profiler/LegacyProfiler.h>
  #include <runtime/JSLock.h>
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.cpp b/Source/WebCore/inspector/InspectorDOMAgent.cpp

index 0a1397f..5c3e094 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMAgent.cpp
@@ -58,7 +58,6 @@
  #include "Event.h"
  #include "EventListener.h"
  #include "EventNames.h"
-#include "EventTarget.h"
  #include "ExceptionCodeDescription.h"
  #include "FrameTree.h"
  #include "HTMLElement.h"
@@ -68,9 +67,7 @@
  #include "HitTestResult.h"
  #include "InspectorHistory.h"
  #include "InspectorNodeFinder.h"
-#include "InspectorOverlay.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "IntRect.h"
  #include "JSEventListener.h"
@@ -97,8 +94,6 @@
  #include <inspector/InjectedScript.h>
  #include <inspector/InjectedScriptManager.h>
  #include <runtime/JSCInlines.h>
-#include <wtf/HashSet.h>
-#include <wtf/Vector.h>
  #include <wtf/text/CString.h>
  #include <wtf/text/WTFString.h>
  
@@ -1557,9 +1552,9 @@ PassRefPtr<Inspector::Protocol::DOM::AccessibilityProperties> InspectorDOMAgent:
                  String ariaRelevantAttrValue = axObject->ariaLiveRegionRelevant();
                  if (!ariaRelevantAttrValue.isEmpty()) {
                      // FIXME: Pass enum values rather than strings once unblocked. http://webkit.org/b/133711
-                    String ariaRelevantAdditions = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Additions);
-                    String ariaRelevantRemovals = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Removals);
-                    String ariaRelevantText = Inspector::Protocol::getWebEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Text);
+                    String ariaRelevantAdditions = Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Additions);
+                    String ariaRelevantRemovals = Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Removals);
+                    String ariaRelevantText = Inspector::Protocol::getEnumConstantValue(Inspector::Protocol::DOM::LiveRegionRelevant::Text);
                      liveRegionRelevant = Inspector::Protocol::Array<String>::create();
                      const SpaceSplitString& values = SpaceSplitString(ariaRelevantAttrValue, true);
                      // @aria-relevant="all" is exposed as ["additions","removals","text"], in order.
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.h b/Source/WebCore/inspector/InspectorDOMAgent.h

index 31c9ce7..cff048b 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMAgent.h
@@ -33,10 +33,10 @@
  #include "EventTarget.h"
  #include "InspectorOverlay.h"
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "RenderLayer.h"
  #include "Timer.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/Deque.h>
  #include <wtf/HashMap.h>
diff --git a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp

index 2f2e664..c1ec74f 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
@@ -36,10 +36,9 @@
  #include "HTMLElement.h"
  #include "InspectorDOMAgent.h"
  #include "InspectorInstrumentation.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
-#include <wtf/text/WTFString.h>
  
  namespace {
  
diff --git a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h

index 79a81b1..c62b279 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
@@ -34,7 +34,7 @@
  #if ENABLE(INSPECTOR)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
  #include <inspector/agents/InspectorDebuggerAgent.h>
  #include <wtf/HashMap.h>
  #include <wtf/RefCounted.h>
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp

index ff94ec8..9e0ce11 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
@@ -40,15 +40,14 @@
  #include "ExceptionCodeDescription.h"
  #include "Frame.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "Page.h"
  #include "PageGroup.h"
  #include "SecurityOrigin.h"
  #include "Storage.h"
-#include "StorageArea.h"
  #include "StorageNamespace.h"
  #include "VoidCallback.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/Vector.h>
  
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.h b/Source/WebCore/inspector/InspectorDOMStorageAgent.h

index bfffa22..66c7325 100644 (file)
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.h
@@ -30,8 +30,8 @@
  #define InspectorDOMStorageAgent_h
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
  #include "StorageArea.h"
+#include <inspector/InspectorBackendDispatchers.h>
  #include <wtf/HashMap.h>
  #include <wtf/text/WTFString.h>
  
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp

index 8891efc..d5a3968 100644 (file)
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
@@ -36,7 +36,6 @@
  #include "ExceptionCode.h"
  #include "ExceptionCodePlaceholder.h"
  #include "InspectorDatabaseResource.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "SQLError.h"
  #include "SQLResultSet.h"
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.h b/Source/WebCore/inspector/InspectorDatabaseAgent.h

index dbcddcb..48bfb21 100644 (file)
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.h
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.h
@@ -32,8 +32,8 @@
  #if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/HashMap.h>
  #include <wtf/text/WTFString.h>
  
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.cpp b/Source/WebCore/inspector/InspectorDatabaseResource.cpp

index aa496fc..83b8842 100644 (file)
--- a/Source/WebCore/inspector/InspectorDatabaseResource.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.cpp
@@ -35,7 +35,6 @@
  #include "InspectorDatabaseResource.h"
  
  #include "Database.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include <inspector/InspectorValues.h>
  
  using namespace Inspector;
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.h b/Source/WebCore/inspector/InspectorDatabaseResource.h

index 8c0150e..988a277 100644 (file)
--- a/Source/WebCore/inspector/InspectorDatabaseResource.h
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.h
@@ -32,7 +32,8 @@
  #define InspectorDatabaseResource_h
  
  #if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
-#include "InspectorWebFrontendDispatchers.h"
+
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/PassRefPtr.h>
  #include <wtf/RefCounted.h>
  #include <wtf/RefPtr.h>
diff --git a/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp b/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp

index 5f74b9f..9aca7b8 100644 (file)
--- a/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
+++ b/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
@@ -44,7 +44,6 @@
  #include "InspectorController.h"
  #include "InspectorFrontendHost.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebBackendDispatchers.h"
  #include "MainFrame.h"
  #include "Page.h"
  #include "ScriptController.h"
@@ -55,9 +54,9 @@
  #include "UserGestureIndicator.h"
  #include "WindowFeatures.h"
  #include <bindings/ScriptValue.h>
+#include <inspector/InspectorBackendDispatchers.h>
  #include <wtf/Deque.h>
  #include <wtf/text/CString.h>
-#include <wtf/text/WTFString.h>
  
  using namespace Inspector;
  
diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp

index c2783f7..da16a84 100644 (file)
--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
@@ -59,11 +59,11 @@
  #include "IDBRequest.h"
  #include "IDBTransaction.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "SecurityOrigin.h"
  #include <inspector/InjectedScript.h>
  #include <inspector/InjectedScriptManager.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/NeverDestroyed.h>
  #include <wtf/Vector.h>
diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.h b/Source/WebCore/inspector/InspectorIndexedDBAgent.h

index 674bc36..1016941 100644 (file)
--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.h
+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.h
@@ -34,7 +34,7 @@
  #if ENABLE(INSPECTOR) && ENABLE(INDEXED_DATABASE)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
  #include <wtf/text/WTFString.h>
  
  namespace Inspector {
diff --git a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp

index f0cef40..a970d2a 100644 (file)
--- a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
+++ b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
@@ -35,7 +35,7 @@
  #include "InspectorLayerTreeAgent.h"
  
  #include "InspectorDOMAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include "InstrumentingAgents.h"
  #include "IntRect.h"
  #include "PseudoElement.h"
diff --git a/Source/WebCore/inspector/InspectorLayerTreeAgent.h b/Source/WebCore/inspector/InspectorLayerTreeAgent.h

index 85a9c46..9d36491 100644 (file)
--- a/Source/WebCore/inspector/InspectorLayerTreeAgent.h
+++ b/Source/WebCore/inspector/InspectorLayerTreeAgent.h
@@ -32,9 +32,9 @@
  #if ENABLE(INSPECTOR)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
-#include "InspectorWebProtocolTypes.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
+#include <inspector/InspectorProtocolObjects.h>
  #include "RenderLayer.h"
  #include <wtf/PassRefPtr.h>
  #include <wtf/Vector.h>
diff --git a/Source/WebCore/inspector/InspectorPageAgent.cpp b/Source/WebCore/inspector/InspectorPageAgent.cpp

index 4399b6a..43ca1ca 100644 (file)
--- a/Source/WebCore/inspector/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorPageAgent.cpp
@@ -57,7 +57,6 @@
  #include "InspectorDOMAgent.h"
  #include "InspectorInstrumentation.h"
  #include "InspectorOverlay.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "MainFrame.h"
  #include "MemoryCache.h"
@@ -75,7 +74,6 @@
  #include <inspector/InspectorValues.h>
  #include <wtf/CurrentTime.h>
  #include <wtf/ListHashSet.h>
-#include <wtf/Vector.h>
  #include <wtf/text/Base64.h>
  #include <wtf/text/StringBuilder.h>
  #include <yarr/RegularExpression.h>
diff --git a/Source/WebCore/inspector/InspectorPageAgent.h b/Source/WebCore/inspector/InspectorPageAgent.h

index 59d0848..ace108a 100644 (file)
--- a/Source/WebCore/inspector/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/InspectorPageAgent.h
@@ -34,10 +34,10 @@
  #if ENABLE(INSPECTOR)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "IntSize.h"
  #include "LayoutRect.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/HashMap.h>
  #include <wtf/RefCounted.h>
  #include <wtf/Vector.h>
diff --git a/Source/WebCore/inspector/InspectorReplayAgent.cpp b/Source/WebCore/inspector/InspectorReplayAgent.cpp

index 619bf2d..d1d48f0 100644 (file)
--- a/Source/WebCore/inspector/InspectorReplayAgent.cpp
+++ b/Source/WebCore/inspector/InspectorReplayAgent.cpp
@@ -37,7 +37,7 @@
  #include "FunctorInputCursor.h"
  #include "InspectorController.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebProtocolTypes.h"
+#include <inspector/InspectorProtocolObjects.h>
  #include "InstrumentingAgents.h"
  #include "Logging.h"
  #include "Page.h"
diff --git a/Source/WebCore/inspector/InspectorReplayAgent.h b/Source/WebCore/inspector/InspectorReplayAgent.h

index 12c1846..e888d50 100644 (file)
--- a/Source/WebCore/inspector/InspectorReplayAgent.h
+++ b/Source/WebCore/inspector/InspectorReplayAgent.h
@@ -31,8 +31,8 @@
  #if ENABLE(INSPECTOR) && ENABLE(WEB_REPLAY)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/Forward.h>
  #include <wtf/HashMap.h>
  #include <wtf/Noncopyable.h>
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.cpp b/Source/WebCore/inspector/InspectorResourceAgent.cpp

index 61bbd8f..d5b9d29 100644 (file)
--- a/Source/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/Source/WebCore/inspector/InspectorResourceAgent.cpp
@@ -47,7 +47,6 @@
  #include "IconController.h"
  #include "InspectorClient.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "JSMainThreadExecState.h"
  #include "MemoryCache.h"
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.h b/Source/WebCore/inspector/InspectorResourceAgent.h

index 283920d..e42e1c1 100644 (file)
--- a/Source/WebCore/inspector/InspectorResourceAgent.h
+++ b/Source/WebCore/inspector/InspectorResourceAgent.h
@@ -32,8 +32,8 @@
  #define InspectorResourceAgent_h
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <wtf/HashSet.h>
  #include <wtf/RefCounted.h>
  #include <wtf/Vector.h>
diff --git a/Source/WebCore/inspector/InspectorStyleSheet.cpp b/Source/WebCore/inspector/InspectorStyleSheet.cpp

index e43c6cd..f61cf23 100644 (file)
--- a/Source/WebCore/inspector/InspectorStyleSheet.cpp
+++ b/Source/WebCore/inspector/InspectorStyleSheet.cpp
@@ -58,8 +58,6 @@
  #include "StyleSheetList.h"
  #include "WebKitCSSKeyframesRule.h"
  #include <inspector/ContentSearchUtilities.h>
-#include <inspector/InspectorValues.h>
-#include <wtf/Vector.h>
  #include <wtf/text/StringBuilder.h>
  #include <yarr/RegularExpression.h>
  
diff --git a/Source/WebCore/inspector/InspectorStyleSheet.h b/Source/WebCore/inspector/InspectorStyleSheet.h

index c1fad09..7b03869 100644 (file)
--- a/Source/WebCore/inspector/InspectorStyleSheet.h
+++ b/Source/WebCore/inspector/InspectorStyleSheet.h
@@ -29,7 +29,7 @@
  #include "CSSStyleDeclaration.h"
  #include "ExceptionCode.h"
  #include "InspectorStyleTextEditor.h"
-#include "InspectorWebProtocolTypes.h"
+#include <inspector/InspectorProtocolObjects.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/HashMap.h>
  #include <wtf/HashSet.h>
diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.cpp b/Source/WebCore/inspector/InspectorTimelineAgent.cpp

index a86ca89..5539fba 100644 (file)
--- a/Source/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/Source/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -41,7 +41,6 @@
  #include "InspectorClient.h"
  #include "InspectorInstrumentation.h"
  #include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "IntRect.h"
  #include "JSDOMWindow.h"
@@ -644,7 +643,7 @@ static Inspector::Protocol::Timeline::EventType toProtocol(TimelineRecordType ty
  
  void InspectorTimelineAgent::addRecordToTimeline(PassRefPtr<InspectorObject> prpRecord, TimelineRecordType type)
  {
-    prpRecord->setString("type", Inspector::Protocol::getWebEnumConstantValue(toProtocol(type)));
+    prpRecord->setString("type", Inspector::Protocol::getEnumConstantValue(toProtocol(type)));
  
      RefPtr<Inspector::Protocol::Timeline::TimelineEvent> record = BindingTraits<Inspector::Protocol::Timeline::TimelineEvent>::runtimeCast(prpRecord);
  
diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.h b/Source/WebCore/inspector/InspectorTimelineAgent.h

index a4cb4c4..31c2f9b 100644 (file)
--- a/Source/WebCore/inspector/InspectorTimelineAgent.h
+++ b/Source/WebCore/inspector/InspectorTimelineAgent.h
@@ -35,9 +35,9 @@
  #if ENABLE(INSPECTOR)
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "LayoutRect.h"
+#include <inspector/InspectorBackendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <inspector/ScriptDebugListener.h>
  #include <wtf/Vector.h>
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/InspectorWorkerAgent.cpp

index ee5abb3..52a8c07 100644 (file)
--- a/Source/WebCore/inspector/InspectorWorkerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
@@ -35,10 +35,10 @@
  #include "InspectorWorkerAgent.h"
  
  #include "InspectorForwarding.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "URL.h"
  #include "WorkerGlobalScopeProxy.h"
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/InspectorValues.h>
  #include <wtf/RefPtr.h>
  
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.h b/Source/WebCore/inspector/InspectorWorkerAgent.h

index 5184f1e..6f0558b 100644 (file)
--- a/Source/WebCore/inspector/InspectorWorkerAgent.h
+++ b/Source/WebCore/inspector/InspectorWorkerAgent.h
@@ -32,7 +32,7 @@
  #define InspectorWorkerAgent_h
  
  #include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
  #include <wtf/Forward.h>
  #include <wtf/HashMap.h>
  
diff --git a/Source/WebCore/inspector/PageRuntimeAgent.h b/Source/WebCore/inspector/PageRuntimeAgent.h

index b6dbc21..1c12cd4 100644 (file)
--- a/Source/WebCore/inspector/PageRuntimeAgent.h
+++ b/Source/WebCore/inspector/PageRuntimeAgent.h
@@ -33,7 +33,7 @@
  
  #if ENABLE(INSPECTOR)
  
-#include <inspector/InspectorJSFrontendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  #include <inspector/agents/InspectorRuntimeAgent.h>
  
  namespace JSC {
diff --git a/Source/WebCore/inspector/TimelineRecordFactory.cpp b/Source/WebCore/inspector/TimelineRecordFactory.cpp

index 3fec400..d8eb65c 100644 (file)
--- a/Source/WebCore/inspector/TimelineRecordFactory.cpp
+++ b/Source/WebCore/inspector/TimelineRecordFactory.cpp
@@ -37,12 +37,12 @@
  
  #include "Event.h"
  #include "FloatQuad.h"
-#include "InspectorWebProtocolTypes.h"
  #include "IntRect.h"
  #include "JSMainThreadExecState.h"
  #include "LayoutRect.h"
  #include "ResourceRequest.h"
  #include "ResourceResponse.h"
+#include <inspector/InspectorProtocolObjects.h>
  #include <inspector/ScriptBreakpoint.h>
  #include <inspector/ScriptCallStack.h>
  #include <inspector/ScriptCallStackFactory.h>
diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp

index 600ea83..7ed3ed9 100644 (file)
--- a/Source/WebCore/inspector/WorkerInspectorController.cpp
+++ b/Source/WebCore/inspector/WorkerInspectorController.cpp
@@ -39,8 +39,6 @@
  #include "InspectorForwarding.h"
  #include "InspectorInstrumentation.h"
  #include "InspectorTimelineAgent.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
  #include "InstrumentingAgents.h"
  #include "JSMainThreadExecState.h"
  #include "WebInjectedScriptHost.h"
@@ -52,6 +50,7 @@
  #include "WorkerRuntimeAgent.h"
  #include "WorkerThread.h"
  #include <inspector/InspectorBackendDispatcher.h>
+#include <inspector/InspectorFrontendDispatchers.h>
  
  using namespace Inspector;
  
diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog

index f775e54..f436061 100644 (file)
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,53 @@
+2014-10-20  Joseph Pecoraro  <pecoraro@apple.com>
+
+        Web Inspector: Generate all Inspector domains together in JavaScriptCore
+        https://bugs.webkit.org/show_bug.cgi?id=137748
+
+        Reviewed by Brian Burg.
+
+        Change the frontend to always load all agents, but only activate a subset
+        of the agents depending on the type of the backend.
+
+        * UserInterface/Base/Main.js:
+        (WebInspector.loaded):
+        * UserInterface/Protocol/InspectorBackend.js:
+        (InspectorBackendClass.prototype.activateDomains):
+        (InspectorBackendClass.prototype.activateAllDomains):
+        (InspectorBackendClass.prototype._agentForDomain):
+        (InspectorBackendClass.prototype._dispatchEvent):
+        (InspectorBackend.Agent):
+        (InspectorBackend.Agent.prototype.get active):
+        (InspectorBackend.Agent.prototype.activate):
+        * UserInterface/Base/Test.js:
+        Only expose "window.FooAgent" or allow dispatches in the "Foo" domain
+        when that particular agent is activated. Currently we hardcode the list
+        of agents to activate for a debuggable type. This should be generated.
+
+        * UserInterface/Protocol/LoadInspectorBackendCommands.js:
+        Now there should always be a single "InspectorBackendCommands.js" file to load.
+        We may want to change the RWI path to return a single file instead of an array.
+
+        * Scripts/update-LegacyInspectorBackendCommands.rb:
+        * UserInterface/Protocol/Legacy/6.0/InspectorBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js.
+        * UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js.
+        * UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorWebBackendCommands.js.
+        * UserInterface/Protocol/Legacy/8.0/InspectorJSBackendCommands.js: Removed.
+        * Versions/Inspector-iOS-8.0.json: Renamed from Source/WebInspectorUI/Versions/InspectorWeb-iOS-8.0.json.
+        * Versions/InspectorJS-iOS-8.0.json: Removed.
+        Update Legacy versions to output a single InspectorBackendCommands.js file.
+        Do a straightforward merge of the iOS 8 JS/Web inputs to a single json file.
+
+        * Configurations/Base.xcconfig:
+        * Configurations/DebugRelease.xcconfig:
+        * Configurations/WebInspectorUIFramework.xcconfig:
+        * Scripts/copy-user-interface-resources-dryrun.rb:
+        * Scripts/copy-user-interface-resources.pl:
+        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+        * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+        * WebInspectorUI.vcxproj/build-webinspectorui.pl:
+        We no longer needed WebCore's Private Headers, so simplify build files
+        and update file names where appropriate.
+
  2014-10-17  Jono Wells  <jonowells@apple.com>
  
          Web Inspector: Add ESLint open source library to the inspector
diff --git a/Source/WebInspectorUI/Configurations/Base.xcconfig b/Source/WebInspectorUI/Configurations/Base.xcconfig

index b239385..8d559f6 100644 (file)
--- a/Source/WebInspectorUI/Configurations/Base.xcconfig
+++ b/Source/WebInspectorUI/Configurations/Base.xcconfig
@@ -58,15 +58,6 @@ TARGET_MAC_OS_X_VERSION_MAJOR = $(MAC_OS_X_VERSION_MAJOR);
  
  SDKROOT = macosx.internal;
  
-
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR_$(USE_STAGING_INSTALL_PATH));
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR_ = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR_NO);
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR_NO = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/Frameworks/WebKit.framework/Versions/A/Frameworks;
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR_YES = $(NEXT_ROOT)$(SYSTEM_LIBRARY_DIR)/StagedFrameworks/Safari;
-
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_RESOURCES_DIR = $(WEBKIT_UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/Resources;
-
  OTHER_LDFLAGS_VERSIONED_FRAMEWORK_PATH = -Wl,-dyld_env -Wl,DYLD_VERSIONED_FRAMEWORK_PATH=/System/Library/StagedFrameworks/Safari;
  
  TOOLCHAINS = $(TOOLCHAINS_$(PLATFORM_NAME));
diff --git a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig

index 971d6d1..0621973 100644 (file)
--- a/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
+++ b/Source/WebInspectorUI/Configurations/DebugRelease.xcconfig
@@ -15,8 +15,6 @@ GCC_WARN_ABOUT_DEPRECATED_FUNCTIONS = YES;
  DEBUG_INFORMATION_FORMAT = dwarf;
  RUN_CLANG_STATIC_ANALYZER = YES;
  
-WEBKIT_UMBRELLA_FRAMEWORKS_DIR = $(BUILT_PRODUCTS_DIR);
-
  OTHER_CFLAGS = $(ASAN_OTHER_CFLAGS);
  OTHER_CPLUSPLUSFLAGS = $(ASAN_OTHER_CPLUSPLUSFLAGS);
  OTHER_LDFLAGS = $(ASAN_OTHER_LDFLAGS);
diff --git a/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig b/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig

index 33e4995..910a5cc 100644 (file)
--- a/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig
+++ b/Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig
@@ -38,20 +38,6 @@ JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(JAVASCRIPTCORE
  JAVASCRIPTCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(PRODUCTION_FRAMEWORKS_DIR)/JavaScriptCore.framework/PrivateHeaders;
  JAVASCRIPTCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/JavaScriptCore.framework/PrivateHeaders;
  
-UMBRELLA_FRAMEWORKS_DIR = $(PRODUCTION_FRAMEWORKS_DIR)/WebKit.framework/Versions/A/Frameworks;
-
-WEBCORE_PRIVATE_HEADERS_DIR = $(WEBCORE_PRIVATE_HEADERS_DIR_$(CONFIGURATION));
-WEBCORE_PRIVATE_HEADERS_DIR_Release = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Debug = $(WEBCORE_PRIVATE_HEADERS_engineering);
-WEBCORE_PRIVATE_HEADERS_DIR_Production = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_$(PLATFORM_NAME));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_iphonesimulator = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_iphoneos);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx = $(SDKROOT)$(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_$(USE_STAGING_INSTALL_PATH));
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_ = $(WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO);
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_NO = $(UMBRELLA_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_DIR_Production_macosx_USE_STAGING_INSTALL_PATH_YES = $(PRODUCTION_FRAMEWORKS_DIR)/WebCore.framework/PrivateHeaders;
-WEBCORE_PRIVATE_HEADERS_engineering = $(BUILT_PRODUCTS_DIR)/WebCore.framework/PrivateHeaders;
-
  COMBINE_INSPECTOR_RESOURCES = $(COMBINE_INSPECTOR_RESOURCES_$(CONFIGURATION));
  COMBINE_INSPECTOR_RESOURCES_Debug = NO;
  COMBINE_INSPECTOR_RESOURCES_Release = NO;
diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb b/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb

index 9afff7f..d34e138 100755 (executable)
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb
@@ -19,13 +19,11 @@ Dir.mktmpdir do |tmpdir|
    FileUtils.mkdir_p $output_directory
    
    # Create empty derived sources expected to exist.
-  FileUtils.touch(File.join(tmpdir, 'InspectorJSBackendCommands.js'))
-  FileUtils.touch(File.join(tmpdir, 'InspectorWebBackendCommands.js'))
+  FileUtils.touch(File.join(tmpdir, 'InspectorBackendCommands.js'))
    
    # Setup the environment and run.
    ENV["DERIVED_SOURCES_DIR"] = tmpdir
    ENV["JAVASCRIPTCORE_PRIVATE_HEADERS_DIR"] = tmpdir
-  ENV["WEBCORE_PRIVATE_HEADERS_DIR"] = tmpdir
    ENV["SRCROOT"] = WEB_INSPECTOR_PATH
    ENV["TARGET_BUILD_DIR"] = $output_directory
    ENV["UNLOCALIZED_RESOURCES_FOLDER_PATH"] = ""
diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl

index d60c4c7..f1f614d 100755 (executable)
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl
@@ -109,8 +109,7 @@ my $eslintLicense = readLicenseFile(File::Spec->catfile($eslintPath, 'LICENSE'))
  make_path($protocolDir, $targetResourcePath);
  
  # Copy over dynamically loaded files from other frameworks, even if we aren't combining resources.
-copy(File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorJSBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorJSBackendCommands.js')) or die "Copy of InspectorJSBackendCommands.js failed: $!";
-copy(File::Spec->catfile($ENV{'WEBCORE_PRIVATE_HEADERS_DIR'}, 'InspectorWebBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorWebBackendCommands.js')) or die "Copy of InspectorWebBackendCommands.js failed: $!";
+copy(File::Spec->catfile($ENV{'JAVASCRIPTCORE_PRIVATE_HEADERS_DIR'}, 'InspectorBackendCommands.js'), File::Spec->catfile($protocolDir, 'InspectorBackendCommands.js')) or die "Copy of InspectorBackendCommands.js failed: $!";
  
  if (defined $ENV{'COMBINE_INSPECTOR_RESOURCES'} && ($ENV{'COMBINE_INSPECTOR_RESOURCES'} eq 'YES')) {
      my $combineResourcesCmd = File::Spec->catfile($scriptsRoot, 'combine-resources.pl');
diff --git a/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb b/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb

index 68235e5..21d306e 100755 (executable)
--- a/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
+++ b/Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb
@@ -16,24 +16,20 @@ $versions_directory_path = File.join WEB_INSPECTOR_PATH, "Versions"
  $web_inspector_protocol_legacy_path = File.join WEB_INSPECTOR_PATH, "UserInterface", "Protocol", "Legacy"
  
  class Task
-  def initialize(input_json_path, dependency_json_path, type, output_directory_path)
-    @type = type
+  def initialize(input_json_path, output_directory_path)
      @input_json_path = input_json_path
-    @dependency_json_path = dependency_json_path
      @output_directory_path = output_directory_path
    end
  
    def run
-    output_filename_prefix = {"JavaScript" => "JS", "Web" => "Web"}[@type]
-    framework = {"JavaScript" => "JavaScriptCore", "Web" => "WebCore"}[@type]
-    output_filename = "Inspector#{output_filename_prefix}BackendCommands.js"
+    output_filename = "InspectorBackendCommands.js"
      display_input = File.basename @input_json_path
      display_output = File.join @output_directory_path.gsub(/^.*?\/UserInterface/, "UserInterface"), output_filename
      puts "#{display_input} -> #{display_output}"
  
      Dir.mktmpdir do |tmpdir|
        dependency = @dependency_json_path ? "'#{@dependency_json_path}'" : ""
-      cmd = "#{$code_generator_path} --force --outputDir '#{tmpdir}' --framework #{framework} '#{@input_json_path}' #{dependency}"
+      cmd = "#{$code_generator_path} --force --outputDir '#{tmpdir}' --framework JavaScriptCore '#{@input_json_path}' #{dependency}"
        %x{ #{cmd} }
        if $?.exitstatus != 0
          puts "ERROR: Error Code (#{$?.exitstatus}) Evaluating: #{cmd}"
@@ -57,22 +53,12 @@ def all_tasks
  
    had_error = false
    Dir.glob(File.join($versions_directory_path, "*.json")).each do |version_path|
-    match = File.basename(version_path).match(/^Inspector(.*?)\-(.*?)\-([^-]+?)\.json$/)
+    match = File.basename(version_path).match(/^Inspector\-(.*?)\-([^-]+?)\.json$/)
      if match
-      output_path = File.join $web_inspector_protocol_legacy_path, match[3]
-      type = "Web"
-      dependency_path = nil
-      if !match[1].empty?
-        if match[1] == "JS"
-          type = "JavaScript"
-        else
-          dependency_filename = version_path.sub(/InspectorWeb/, "InspectorJS")
-          dependency_path = File.join($versions_directory_path, dependency_filename)
-        end
-      end
-      tasks << Task.new(version_path, dependency_filename, type, output_path)
+      output_path = File.join $web_inspector_protocol_legacy_path, match[2]
+      tasks << Task.new(version_path, output_path)
      else
-      puts "ERROR: Version file (#{version_path}) did not match the template Inspector(Web|JS)?-<ANYTHING>-<VERSION>.js"
+      puts "ERROR: Version file (#{version_path}) did not match the template Inspector-<ANYTHING>-<VERSION>.js"
        had_error = true
      end
    end
diff --git a/Source/WebInspectorUI/UserInterface/Base/Main.js b/Source/WebInspectorUI/UserInterface/Base/Main.js

index 011f377..4860919 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Base/Main.js
+++ b/Source/WebInspectorUI/UserInterface/Base/Main.js
@@ -52,6 +52,14 @@ WebInspector.loaded = function()
      // Initialize WebSocket to communication.
      this._initializeWebSocketIfNeeded();
  
+    this.debuggableType = InspectorFrontendHost.debuggableType() === "web" ? WebInspector.DebuggableType.Web : WebInspector.DebuggableType.JavaScript;
+
+    // FIXME: <https://webkit.org/b/137753> Web Inspector: InspectorBackendCommands should include when to activate particular domains
+    if (this.debuggableType === WebInspector.DebuggableType.JavaScript)
+        InspectorBackend.activateDomains(["Inspector", "Console", "Debugger", "Runtime", "Profiler"]);
+    else
+        InspectorBackend.activateAllDomains();
+
      // Register observers for events from the InspectorBackend.
      if (InspectorBackend.registerInspectorDispatcher)
          InspectorBackend.registerInspectorDispatcher(new WebInspector.InspectorObserver);
@@ -163,11 +171,11 @@ WebInspector.loaded = function()
      this.showReplayInterfaceSetting = new WebInspector.Setting("show-web-replay", false);
  
      this.showJavaScriptTypeInformationSetting = new WebInspector.Setting("show-javascript-type-information", false);
-    if (this.showJavaScriptTypeInformationSetting.value && RuntimeAgent && RuntimeAgent.enableTypeProfiler)
+    if (this.showJavaScriptTypeInformationSetting.value && window.RuntimeAgent && RuntimeAgent.enableTypeProfiler)
          RuntimeAgent.enableTypeProfiler();
  
      this.showPaintRectsSetting = new WebInspector.Setting("show-paint-rects", false);
-    if (this.showPaintRectsSetting.value && PageAgent && PageAgent.setShowPaintRects)
+    if (this.showPaintRectsSetting.value && window.PageAgent && PageAgent.setShowPaintRects)
          PageAgent.setShowPaintRects(true);
  
      this.mouseCoords = {
@@ -205,7 +213,6 @@ WebInspector.contentLoaded = function()
      if (WebInspector.Platform.version.name)
          document.body.classList.add(WebInspector.Platform.version.name);
  
-    this.debuggableType = InspectorFrontendHost.debuggableType() === "web" ? WebInspector.DebuggableType.Web : WebInspector.DebuggableType.JavaScript;
      document.body.classList.add(this.debuggableType);
  
      // Create the user interface elements.
diff --git a/Source/WebInspectorUI/UserInterface/Base/Test.js b/Source/WebInspectorUI/UserInterface/Base/Test.js

index 380ea67..b39a789 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Base/Test.js
+++ b/Source/WebInspectorUI/UserInterface/Base/Test.js
@@ -25,6 +25,9 @@
  
  WebInspector.loaded = function()
  {
+    // FIXME: <https://webkit.org/b/137753> Web Inspector: InspectorBackendCommands should include when to activate particular domains
+    InspectorBackend.activateAllDomains();
+
      // Register observers for events from the InspectorBackend.
      // The initialization order should match the same in Main.js.
      InspectorBackend.registerInspectorDispatcher(new WebInspector.InspectorObserver);
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js b/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js

index d16ab43..4e66628 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js
+++ b/Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js
@@ -99,6 +99,21 @@ InspectorBackendClass.prototype = {
              this._deferredScripts.push(script);
      },
  
+    activateDomains: function(domains)
+    {
+        for (var domainName of domains) {
+            var agent = this._agents[domainName];
+            if (agent)
+                agent.activate();
+        }
+    },
+
+    activateAllDomains: function()
+    {
+        for (var domainName in this._agents)
+            this._agents[domainName].activate();
+    },
+
      // Private
  
      _agentForDomain: function(domainName)
@@ -108,7 +123,6 @@ InspectorBackendClass.prototype = {
  
          var agent = new InspectorBackend.Agent(domainName);
          this._agents[domainName] = agent;
-        window[domainName + "Agent"] = agent;
          return agent;
      },
  
@@ -197,6 +211,11 @@ InspectorBackendClass.prototype = {
          }
  
          var agent = this._agentForDomain(domainName);
+        if (!agent.active) {
+            console.error("Protocol Error: Attempted to dispatch method for domain '" + domainName + "' which exists but is not active.");
+            return;
+        }
+
          var event = agent.getEvent(eventName);
          if (!event) {
              console.error("Protocol Error: Attempted to dispatch an unspecified method '" + qualifiedName + "'");
@@ -269,6 +288,9 @@ InspectorBackend.Agent = function(domainName)
  {
      this._domainName = domainName;
  
+    // Agents are always created, but are only useable after they are activated.
+    this._active = false;
+
      // Commands are stored directly on the Agent instance using their unqualified
      // method name as the property. Thus, callers can write: FooAgent.methodName().
      // Enums are stored similarly based on the unqualified type name.
@@ -281,6 +303,11 @@ InspectorBackend.Agent.prototype = {
          return this._domainName;
      },
  
+    get active()
+    {
+        return this._active;
+    },
+
      set dispatcher(value)
      {
          this._dispatcher = value;
@@ -311,6 +338,12 @@ InspectorBackend.Agent.prototype = {
          return eventName in this._events;
      },
  
+    activate: function()
+    {
+        this._active = true;
+        window[this._domainName + "Agent"] = this;
+    },
+
      dispatchEvent: function(eventName, eventArguments)
      {
          if (!(eventName in this._dispatcher)) {
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js b/Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorBackendCommands.js

similarity index 100%

rename from Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js

rename to Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorBackendCommands.js
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js b/Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js

similarity index 100%

rename from Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js

rename to Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorWebBackendCommands.js b/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js

similarity index 74%

rename from Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorWebBackendCommands.js

rename to Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js

index b0cc394..eceec1c 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorWebBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js
@@ -25,9 +25,96 @@
   * THE POSSIBILITY OF SUCH DAMAGE.
   */
  
-// DO NOT EDIT THIS FILE. It is automatically generated from InspectorWeb-iOS-8.0.json
+// DO NOT EDIT THIS FILE. It is automatically generated from Inspector-iOS-8.0.json
  // by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
  
+// Console.
+InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
+InspectorBackend.registerEnum("Console.ConsoleMessageSource", {XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Storage: "storage", Appcache: "appcache", Rendering: "rendering", CSS: "css", Security: "security", Other: "other"});
+InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
+InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Table: "table", Trace: "trace", Clear: "clear", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert", Timing: "timing", Profile: "profile", ProfileEnd: "profileEnd"});
+InspectorBackend.registerEvent("Console.messageAdded", ["message"]);
+InspectorBackend.registerEvent("Console.messageRepeatCountUpdated", ["count"]);
+InspectorBackend.registerEvent("Console.messagesCleared", []);
+InspectorBackend.registerCommand("Console.enable", [], []);
+InspectorBackend.registerCommand("Console.disable", [], []);
+InspectorBackend.registerCommand("Console.clearMessages", [], []);
+InspectorBackend.registerCommand("Console.setMonitoringXHREnabled", [{"name": "enabled", "type": "boolean", "optional": false}], []);
+InspectorBackend.registerCommand("Console.addInspectedNode", [{"name": "nodeId", "type": "number", "optional": false}], []);
+
+// Debugger.
+InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
+InspectorBackend.registerEnum("Debugger.BreakpointActionType", {Log: "log", Evaluate: "evaluate", Sound: "sound", Probe: "probe"});
+InspectorBackend.registerEnum("Debugger.ScopeType", {Global: "global", Local: "local", With: "with", Closure: "closure", Catch: "catch"});
+InspectorBackend.registerEvent("Debugger.globalObjectCleared", []);
+InspectorBackend.registerEvent("Debugger.scriptParsed", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "isContentScript", "sourceMapURL", "hasSourceURL"]);
+InspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["url", "scriptSource", "startLine", "errorLine", "errorMessage"]);
+InspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", "location"]);
+InspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data"]);
+InspectorBackend.registerEvent("Debugger.resumed", []);
+InspectorBackend.registerEvent("Debugger.didSampleProbe", ["sample"]);
+InspectorBackend.registerEvent("Debugger.playBreakpointActionSound", ["breakpointActionId"]);
+InspectorBackend.registerCommand("Debugger.enable", [], []);
+InspectorBackend.registerCommand("Debugger.disable", [], []);
+InspectorBackend.registerCommand("Debugger.setBreakpointsActive", [{"name": "active", "type": "boolean", "optional": false}], []);
+InspectorBackend.registerCommand("Debugger.setBreakpointByUrl", [{"name": "lineNumber", "type": "number", "optional": false}, {"name": "url", "type": "string", "optional": true}, {"name": "urlRegex", "type": "string", "optional": true}, {"name": "columnNumber", "type": "number", "optional": true}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "locations"]);
+InspectorBackend.registerCommand("Debugger.setBreakpoint", [{"name": "location", "type": "object", "optional": false}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "actualLocation"]);
+InspectorBackend.registerCommand("Debugger.removeBreakpoint", [{"name": "breakpointId", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Debugger.continueToLocation", [{"name": "location", "type": "object", "optional": false}], []);
+InspectorBackend.registerCommand("Debugger.stepOver", [], []);
+InspectorBackend.registerCommand("Debugger.stepInto", [], []);
+InspectorBackend.registerCommand("Debugger.stepOut", [], []);
+InspectorBackend.registerCommand("Debugger.pause", [], []);
+InspectorBackend.registerCommand("Debugger.resume", [], []);
+InspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
+InspectorBackend.registerCommand("Debugger.getScriptSource", [{"name": "scriptId", "type": "string", "optional": false}], ["scriptSource"]);
+InspectorBackend.registerCommand("Debugger.getFunctionDetails", [{"name": "functionId", "type": "string", "optional": false}], ["details"]);
+InspectorBackend.registerCommand("Debugger.setPauseOnExceptions", [{"name": "state", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Debugger.evaluateOnCallFrame", [{"name": "callFrameId", "type": "string", "optional": false}, {"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
+
+// Inspector.
+InspectorBackend.registerInspectorDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Inspector");
+InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["script"]);
+InspectorBackend.registerEvent("Inspector.inspect", ["object", "hints"]);
+InspectorBackend.registerEvent("Inspector.detached", ["reason"]);
+InspectorBackend.registerEvent("Inspector.targetCrashed", []);
+InspectorBackend.registerCommand("Inspector.enable", [], []);
+InspectorBackend.registerCommand("Inspector.disable", [], []);
+
+// Profiler.
+InspectorBackend.registerProfilerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Profiler");
+InspectorBackend.registerEnum("Profiler.ProfileHeaderTypeId", {CPU: "CPU"});
+InspectorBackend.registerEvent("Profiler.addProfileHeader", ["header"]);
+InspectorBackend.registerEvent("Profiler.setRecordingProfile", ["isProfiling"]);
+InspectorBackend.registerEvent("Profiler.resetProfiles", []);
+InspectorBackend.registerCommand("Profiler.enable", [], []);
+InspectorBackend.registerCommand("Profiler.disable", [], []);
+InspectorBackend.registerCommand("Profiler.start", [], []);
+InspectorBackend.registerCommand("Profiler.stop", [], []);
+InspectorBackend.registerCommand("Profiler.getProfileHeaders", [], ["headers"]);
+InspectorBackend.registerCommand("Profiler.getCPUProfile", [{"name": "uid", "type": "number", "optional": false}], ["profile"]);
+InspectorBackend.registerCommand("Profiler.removeProfile", [{"name": "type", "type": "string", "optional": false}, {"name": "uid", "type": "number", "optional": false}], []);
+InspectorBackend.registerCommand("Profiler.clearProfiles", [], []);
+
+// Runtime.
+InspectorBackend.registerRuntimeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Runtime");
+InspectorBackend.registerEnum("Runtime.RemoteObjectType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
+InspectorBackend.registerEnum("Runtime.RemoteObjectSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
+InspectorBackend.registerEnum("Runtime.PropertyPreviewType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
+InspectorBackend.registerEnum("Runtime.PropertyPreviewSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
+InspectorBackend.registerEnum("Runtime.SyntaxErrorType", {None: "none", Irrecoverable: "irrecoverable", UnterminatedLiteral: "unterminated-literal", Recoverable: "recoverable"});
+InspectorBackend.registerEvent("Runtime.executionContextCreated", ["context"]);
+InspectorBackend.registerCommand("Runtime.parse", [{"name": "source", "type": "string", "optional": false}], ["result", "message", "range"]);
+InspectorBackend.registerCommand("Runtime.evaluate", [{"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "contextId", "type": "number", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Runtime.callFunctionOn", [{"name": "objectId", "type": "string", "optional": false}, {"name": "functionDeclaration", "type": "string", "optional": false}, {"name": "arguments", "type": "object", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
+InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Runtime.run", [], []);
+InspectorBackend.registerCommand("Runtime.enable", [], []);
+InspectorBackend.registerCommand("Runtime.disable", [], []);
+
  // ApplicationCache.
  InspectorBackend.registerApplicationCacheDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "ApplicationCache");
  InspectorBackend.registerEvent("ApplicationCache.applicationCacheStatusUpdated", ["frameId", "manifestURL", "status"]);
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorJSBackendCommands.js b/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorJSBackendCommands.js

deleted file mode 100644 (file)

index 3420100..0000000
--- a/Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorJSBackendCommands.js
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (C) 2013 Google Inc. All rights reserved.
- * Copyright (C) 2013, 2014 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
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
- * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
- * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
- * THE POSSIBILITY OF SUCH DAMAGE.
- */
-
-// DO NOT EDIT THIS FILE. It is automatically generated from InspectorJS-iOS-8.0.json
-// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
-
-// Console.
-InspectorBackend.registerConsoleDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Console");
-InspectorBackend.registerEnum("Console.ConsoleMessageSource", {XML: "xml", Javascript: "javascript", Network: "network", ConsoleAPI: "console-api", Storage: "storage", Appcache: "appcache", Rendering: "rendering", CSS: "css", Security: "security", Other: "other"});
-InspectorBackend.registerEnum("Console.ConsoleMessageLevel", {Log: "log", Warning: "warning", Error: "error", Debug: "debug"});
-InspectorBackend.registerEnum("Console.ConsoleMessageType", {Log: "log", Dir: "dir", DirXML: "dirxml", Table: "table", Trace: "trace", Clear: "clear", StartGroup: "startGroup", StartGroupCollapsed: "startGroupCollapsed", EndGroup: "endGroup", Assert: "assert", Timing: "timing", Profile: "profile", ProfileEnd: "profileEnd"});
-InspectorBackend.registerEvent("Console.messageAdded", ["message"]);
-InspectorBackend.registerEvent("Console.messageRepeatCountUpdated", ["count"]);
-InspectorBackend.registerEvent("Console.messagesCleared", []);
-InspectorBackend.registerCommand("Console.enable", [], []);
-InspectorBackend.registerCommand("Console.disable", [], []);
-InspectorBackend.registerCommand("Console.clearMessages", [], []);
-InspectorBackend.registerCommand("Console.setMonitoringXHREnabled", [{"name": "enabled", "type": "boolean", "optional": false}], []);
-InspectorBackend.registerCommand("Console.addInspectedNode", [{"name": "nodeId", "type": "number", "optional": false}], []);
-
-// Debugger.
-InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
-InspectorBackend.registerEnum("Debugger.BreakpointActionType", {Log: "log", Evaluate: "evaluate", Sound: "sound", Probe: "probe"});
-InspectorBackend.registerEnum("Debugger.ScopeType", {Global: "global", Local: "local", With: "with", Closure: "closure", Catch: "catch"});
-InspectorBackend.registerEvent("Debugger.globalObjectCleared", []);
-InspectorBackend.registerEvent("Debugger.scriptParsed", ["scriptId", "url", "startLine", "startColumn", "endLine", "endColumn", "isContentScript", "sourceMapURL", "hasSourceURL"]);
-InspectorBackend.registerEvent("Debugger.scriptFailedToParse", ["url", "scriptSource", "startLine", "errorLine", "errorMessage"]);
-InspectorBackend.registerEvent("Debugger.breakpointResolved", ["breakpointId", "location"]);
-InspectorBackend.registerEvent("Debugger.paused", ["callFrames", "reason", "data"]);
-InspectorBackend.registerEvent("Debugger.resumed", []);
-InspectorBackend.registerEvent("Debugger.didSampleProbe", ["sample"]);
-InspectorBackend.registerEvent("Debugger.playBreakpointActionSound", ["breakpointActionId"]);
-InspectorBackend.registerCommand("Debugger.enable", [], []);
-InspectorBackend.registerCommand("Debugger.disable", [], []);
-InspectorBackend.registerCommand("Debugger.setBreakpointsActive", [{"name": "active", "type": "boolean", "optional": false}], []);
-InspectorBackend.registerCommand("Debugger.setBreakpointByUrl", [{"name": "lineNumber", "type": "number", "optional": false}, {"name": "url", "type": "string", "optional": true}, {"name": "urlRegex", "type": "string", "optional": true}, {"name": "columnNumber", "type": "number", "optional": true}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "locations"]);
-InspectorBackend.registerCommand("Debugger.setBreakpoint", [{"name": "location", "type": "object", "optional": false}, {"name": "options", "type": "object", "optional": true}], ["breakpointId", "actualLocation"]);
-InspectorBackend.registerCommand("Debugger.removeBreakpoint", [{"name": "breakpointId", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Debugger.continueToLocation", [{"name": "location", "type": "object", "optional": false}], []);
-InspectorBackend.registerCommand("Debugger.stepOver", [], []);
-InspectorBackend.registerCommand("Debugger.stepInto", [], []);
-InspectorBackend.registerCommand("Debugger.stepOut", [], []);
-InspectorBackend.registerCommand("Debugger.pause", [], []);
-InspectorBackend.registerCommand("Debugger.resume", [], []);
-InspectorBackend.registerCommand("Debugger.searchInContent", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}, {"name": "caseSensitive", "type": "boolean", "optional": true}, {"name": "isRegex", "type": "boolean", "optional": true}], ["result"]);
-InspectorBackend.registerCommand("Debugger.getScriptSource", [{"name": "scriptId", "type": "string", "optional": false}], ["scriptSource"]);
-InspectorBackend.registerCommand("Debugger.getFunctionDetails", [{"name": "functionId", "type": "string", "optional": false}], ["details"]);
-InspectorBackend.registerCommand("Debugger.setPauseOnExceptions", [{"name": "state", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Debugger.evaluateOnCallFrame", [{"name": "callFrameId", "type": "string", "optional": false}, {"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
-InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
-
-// Inspector.
-InspectorBackend.registerInspectorDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Inspector");
-InspectorBackend.registerEvent("Inspector.evaluateForTestInFrontend", ["script"]);
-InspectorBackend.registerEvent("Inspector.inspect", ["object", "hints"]);
-InspectorBackend.registerEvent("Inspector.detached", ["reason"]);
-InspectorBackend.registerEvent("Inspector.targetCrashed", []);
-InspectorBackend.registerCommand("Inspector.enable", [], []);
-InspectorBackend.registerCommand("Inspector.disable", [], []);
-
-// Profiler.
-InspectorBackend.registerProfilerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Profiler");
-InspectorBackend.registerEnum("Profiler.ProfileHeaderTypeId", {CPU: "CPU"});
-InspectorBackend.registerEvent("Profiler.addProfileHeader", ["header"]);
-InspectorBackend.registerEvent("Profiler.setRecordingProfile", ["isProfiling"]);
-InspectorBackend.registerEvent("Profiler.resetProfiles", []);
-InspectorBackend.registerCommand("Profiler.enable", [], []);
-InspectorBackend.registerCommand("Profiler.disable", [], []);
-InspectorBackend.registerCommand("Profiler.start", [], []);
-InspectorBackend.registerCommand("Profiler.stop", [], []);
-InspectorBackend.registerCommand("Profiler.getProfileHeaders", [], ["headers"]);
-InspectorBackend.registerCommand("Profiler.getCPUProfile", [{"name": "uid", "type": "number", "optional": false}], ["profile"]);
-InspectorBackend.registerCommand("Profiler.removeProfile", [{"name": "type", "type": "string", "optional": false}, {"name": "uid", "type": "number", "optional": false}], []);
-InspectorBackend.registerCommand("Profiler.clearProfiles", [], []);
-
-// Runtime.
-InspectorBackend.registerRuntimeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Runtime");
-InspectorBackend.registerEnum("Runtime.RemoteObjectType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
-InspectorBackend.registerEnum("Runtime.RemoteObjectSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
-InspectorBackend.registerEnum("Runtime.PropertyPreviewType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
-InspectorBackend.registerEnum("Runtime.PropertyPreviewSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
-InspectorBackend.registerEnum("Runtime.SyntaxErrorType", {None: "none", Irrecoverable: "irrecoverable", UnterminatedLiteral: "unterminated-literal", Recoverable: "recoverable"});
-InspectorBackend.registerEvent("Runtime.executionContextCreated", ["context"]);
-InspectorBackend.registerCommand("Runtime.parse", [{"name": "source", "type": "string", "optional": false}], ["result", "message", "range"]);
-InspectorBackend.registerCommand("Runtime.evaluate", [{"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "contextId", "type": "number", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
-InspectorBackend.registerCommand("Runtime.callFunctionOn", [{"name": "objectId", "type": "string", "optional": false}, {"name": "functionDeclaration", "type": "string", "optional": false}, {"name": "arguments", "type": "object", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
-InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
-InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Runtime.run", [], []);
-InspectorBackend.registerCommand("Runtime.enable", [], []);
-InspectorBackend.registerCommand("Runtime.disable", [], []);
diff --git a/Source/WebInspectorUI/UserInterface/Protocol/LoadInspectorBackendCommands.js b/Source/WebInspectorUI/UserInterface/Protocol/LoadInspectorBackendCommands.js

index 5c1b8ec..6e17412 100644 (file)
--- a/Source/WebInspectorUI/UserInterface/Protocol/LoadInspectorBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/Protocol/LoadInspectorBackendCommands.js
@@ -31,11 +31,8 @@
              backendURLs = suggestedBackendCommandsURLs;
      }
  
-    if (!backendURLs) {
-        backendURLs = ["Protocol/InspectorJSBackendCommands.js"];
-        if (InspectorFrontendHost.debuggableType() === "web")
-            backendURLs.push("Protocol/InspectorWebBackendCommands.js");
-    }
+    if (!backendURLs)
+        backendURLs = ["Protocol/InspectorBackendCommands.js"];
  
      console.assert(backendURLs.length);
      for (var backendCommandsURL of backendURLs)
diff --git a/Source/WebInspectorUI/Versions/InspectorWeb-iOS-8.0.json b/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json

similarity index 74%

rename from Source/WebInspectorUI/Versions/InspectorWeb-iOS-8.0.json

rename to Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json

index 2046319..80d1f9f 100644 (file)
--- a/Source/WebInspectorUI/Versions/InspectorWeb-iOS-8.0.json
+++ b/Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json
@@ -1,5 +1,787 @@
  {"domains":[
  {
+    "domain": "Console",
+    "description": "Console domain defines methods and events for interaction with the JavaScript console. Console collects messages created by means of the <a href='http://getfirebug.com/wiki/index.php/Console_API'>JavaScript Console API</a>. One needs to enable this domain using <code>enable</code> command in order to start receiving the console messages. Browser collects messages issued while console domain is not enabled as well and reports them using <code>messageAdded</code> notification upon enabling.",
+    "types": [
+        {
+            "id": "ConsoleNetworkRequestId",
+            "type": "string",
+            "description": "Unique request identifier. FIXME: Duplicate of Network.RequestId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
+        },
+        {
+            "id": "ConsoleDOMNodeId",
+            "type": "integer",
+            "description": "Unique DOM node identifier. FIXME: Duplicate of DOM.NodeId <https://webkit.org/b/125664> Web Inspector: FIX Type Dependency Issues"
+        },
+        {
+            "id": "ConsoleMessage",
+            "type": "object",
+            "description": "Console message.",
+            "properties": [
+                { "name": "source", "type": "string", "enum": ["xml", "javascript", "network", "console-api", "storage", "appcache", "rendering", "css", "security", "other"], "description": "Message source." },
+                { "name": "level", "type": "string", "enum": ["log", "warning", "error", "debug"], "description": "Message severity." },
+                { "name": "text", "type": "string", "description": "Message text." },
+                { "name": "type", "type": "string", "optional": true, "enum": ["log", "dir", "dirxml", "table", "trace", "clear", "startGroup", "startGroupCollapsed", "endGroup", "assert", "timing", "profile", "profileEnd"], "description": "Console message type." },
+                { "name": "url", "type": "string", "optional": true, "description": "URL of the message origin." },
+                { "name": "line", "type": "integer", "optional": true, "description": "Line number in the resource that generated this message." },
+                { "name": "column", "type": "integer", "optional": true, "description": "Column number on the line in the resource that generated this message." },
+                { "name": "repeatCount", "type": "integer", "optional": true, "description": "Repeat count for repeated messages." },
+                { "name": "parameters", "type": "array", "items": { "$ref": "Runtime.RemoteObject" }, "optional": true, "description": "Message parameters in case of the formatted message." },
+                { "name": "stackTrace", "$ref": "StackTrace", "optional": true, "description": "JavaScript stack trace for assertions and error messages." },
+                { "name": "networkRequestId", "$ref": "ConsoleNetworkRequestId", "optional": true, "description": "Identifier of the network request associated with this message." }
+            ]
+        },
+        {
+            "id": "CallFrame",
+            "type": "object",
+            "description": "Stack entry for console errors and assertions.",
+            "properties": [
+                { "name": "functionName", "type": "string", "description": "JavaScript function name." },
+                { "name": "url", "type": "string", "description": "JavaScript script name or url." },
+                { "name": "lineNumber", "type": "integer", "description": "JavaScript script line number." },
+                { "name": "columnNumber", "type": "integer", "description": "JavaScript script column number." }
+            ]
+        },
+        {
+            "id": "StackTrace",
+            "type": "array",
+            "items": { "$ref": "CallFrame" },
+            "description": "Call frames for assertions or error messages."
+        }
+    ],
+    "commands": [
+        {
+            "name": "enable",
+            "description": "Enables console domain, sends the messages collected so far to the client by means of the <code>messageAdded</code> notification."
+        },
+        {
+            "name": "disable",
+            "description": "Disables console domain, prevents further console messages from being reported to the client."
+        },
+        {
+            "name": "clearMessages",
+            "description": "Clears console messages collected in the browser."
+        },
+        {
+            "name": "setMonitoringXHREnabled",
+            "parameters": [
+                { "name&q
author	joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)
committer	joepeck@webkit.org <joepeck@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
	Mon, 20 Oct 2014 17:59:24 +0000 (17:59 +0000)
ChangeLog		patch \| blob \| history
Source/JavaScriptCore/CMakeLists.txt		patch \| blob \| history
Source/JavaScriptCore/ChangeLog		patch \| blob \| history
Source/JavaScriptCore/DerivedSources.make		patch \| blob \| history
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj		patch \| blob \| history
Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters		patch \| blob \| history
Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd		patch \| blob \| history
Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/JavaScriptCore/inspector/ConsoleMessage.h		patch \| blob \| history
Source/JavaScriptCore/inspector/ContentSearchUtilities.cpp		patch \| blob \| history
Source/JavaScriptCore/inspector/ContentSearchUtilities.h		patch \| blob \| history
Source/JavaScriptCore/inspector/InjectedScript.h		patch \| blob \| history
Source/JavaScriptCore/inspector/InjectedScriptBase.h		patch \| blob \| history
Source/JavaScriptCore/inspector/ScriptCallFrame.h		patch \| blob \| history
Source/JavaScriptCore/inspector/ScriptCallStack.h		patch \| blob \| history
Source/JavaScriptCore/inspector/agents/InspectorAgent.h		patch \| blob \| history
Source/JavaScriptCore/inspector/agents/InspectorConsoleAgent.h		patch \| blob \| history
Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.cpp		patch \| blob \| history
Source/JavaScriptCore/inspector/agents/InspectorDebuggerAgent.h		patch \| blob \| history
Source/JavaScriptCore/inspector/agents/InspectorRuntimeAgent.h		patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/ApplicationCache.json	[moved from Source/WebCore/inspector/protocol/ApplicationCache.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/CSS.json	[moved from Source/WebCore/inspector/protocol/CSS.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/DOM.json	[moved from Source/WebCore/inspector/protocol/DOM.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/DOMDebugger.json	[moved from Source/WebCore/inspector/protocol/DOMDebugger.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/DOMStorage.json	[moved from Source/WebCore/inspector/protocol/DOMStorage.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Database.json	[moved from Source/WebCore/inspector/protocol/Database.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/IndexedDB.json	[moved from Source/WebCore/inspector/protocol/IndexedDB.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/LayerTree.json	[moved from Source/WebCore/inspector/protocol/LayerTree.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Network.json	[moved from Source/WebCore/inspector/protocol/Network.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Page.json	[moved from Source/WebCore/inspector/protocol/Page.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Replay.json	[moved from Source/WebCore/inspector/protocol/Replay.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Timeline.json	[moved from Source/WebCore/inspector/protocol/Timeline.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/protocol/Worker.json	[moved from Source/WebCore/inspector/protocol/Worker.json with 100% similarity]	patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_commands.py	[changed mode: 0644->0755]	patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_header.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_backend_dispatcher_implementation.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_header.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_frontend_dispatcher_implementation.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_header.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/generate_protocol_types_implementation.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/codegen/models.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-async-attribute.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/commands-with-optional-call-return-parameters.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/domains-with-varying-command-sizes.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/events-with-optional-parameters.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/generate-domains-with-feature-guards.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/same-type-id-different-domain.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/shadowed-optional-type-setters.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-aliased-primitive-type.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-array-type.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-enum-type.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/type-declaration-object-type.json-result		patch \| blob \| history
Source/JavaScriptCore/inspector/scripts/tests/expected/type-requiring-runtime-casts.json-result		patch \| blob \| history
Source/JavaScriptCore/runtime/TypeProfiler.cpp		patch \| blob \| history
Source/JavaScriptCore/runtime/TypeSet.cpp		patch \| blob \| history
Source/PlatformEfl.cmake		patch \| blob \| history
Source/WebCore/CMakeLists.txt		patch \| blob \| history
Source/WebCore/ChangeLog		patch \| blob \| history
Source/WebCore/DerivedSources.make		patch \| blob \| history
Source/WebCore/ForwardingHeaders/inspector/InspectorBackendDispatchers.h	[new file with mode: 0644]	patch \| blob
Source/WebCore/ForwardingHeaders/inspector/InspectorFrontendDispatchers.h	[new file with mode: 0644]	patch \| blob
Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h	[deleted file]	patch \| blob \| history
Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h	[deleted file]	patch \| blob \| history
Source/WebCore/ForwardingHeaders/inspector/InspectorJSProtocolTypes.h	[deleted file]	patch \| blob \| history
Source/WebCore/ForwardingHeaders/inspector/InspectorProtocolObjects.h	[new file with mode: 0644]	patch \| blob
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj		patch \| blob \| history
Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters		patch \| blob \| history
Source/WebCore/WebCore.vcxproj/copyForwardingHeaders.cmd		patch \| blob \| history
Source/WebCore/WebCore.xcodeproj/project.pbxproj		patch \| blob \| history
Source/WebCore/inspector/CommandLineAPIHost.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorApplicationCacheAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorCSSAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorCSSAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorController.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMDebuggerAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMStorageAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDOMStorageAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorDatabaseAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDatabaseAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorDatabaseResource.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorDatabaseResource.h		patch \| blob \| history
Source/WebCore/inspector/InspectorFrontendClientLocal.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorIndexedDBAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorIndexedDBAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorLayerTreeAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorLayerTreeAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorPageAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorPageAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorReplayAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorReplayAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorResourceAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorResourceAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorStyleSheet.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorStyleSheet.h		patch \| blob \| history
Source/WebCore/inspector/InspectorTimelineAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorTimelineAgent.h		patch \| blob \| history
Source/WebCore/inspector/InspectorWorkerAgent.cpp		patch \| blob \| history
Source/WebCore/inspector/InspectorWorkerAgent.h		patch \| blob \| history
Source/WebCore/inspector/PageRuntimeAgent.h		patch \| blob \| history
Source/WebCore/inspector/TimelineRecordFactory.cpp		patch \| blob \| history
Source/WebCore/inspector/WorkerInspectorController.cpp		patch \| blob \| history
Source/WebInspectorUI/ChangeLog		patch \| blob \| history
Source/WebInspectorUI/Configurations/Base.xcconfig		patch \| blob \| history
Source/WebInspectorUI/Configurations/DebugRelease.xcconfig		patch \| blob \| history
Source/WebInspectorUI/Configurations/WebInspectorUIFramework.xcconfig		patch \| blob \| history
Source/WebInspectorUI/Scripts/copy-user-interface-resources-dryrun.rb		patch \| blob \| history
Source/WebInspectorUI/Scripts/copy-user-interface-resources.pl		patch \| blob \| history
Source/WebInspectorUI/Scripts/update-LegacyInspectorBackendCommands.rb		patch \| blob \| history
Source/WebInspectorUI/UserInterface/Base/Main.js		patch \| blob \| history
Source/WebInspectorUI/UserInterface/Base/Test.js		patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/InspectorBackend.js		patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorBackendCommands.js	[moved from Source/WebInspectorUI/UserInterface/Protocol/Legacy/6.0/InspectorWebBackendCommands.js with 100% similarity]	patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorBackendCommands.js	[moved from Source/WebInspectorUI/UserInterface/Protocol/Legacy/7.0/InspectorWebBackendCommands.js with 100% similarity]	patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorBackendCommands.js	[moved from Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorWebBackendCommands.js with 74% similarity]	patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/Legacy/8.0/InspectorJSBackendCommands.js	[deleted file]	patch \| blob \| history
Source/WebInspectorUI/UserInterface/Protocol/LoadInspectorBackendCommands.js		patch \| blob \| history
Source/WebInspectorUI/Versions/Inspector-iOS-8.0.json	[moved from Source/WebInspectorUI/Versions/InspectorWeb-iOS-8.0.json with 74% similarity]	patch \| blob \| history
Source/WebInspectorUI/Versions/InspectorJS-iOS-8.0.json	[deleted file]	patch \| blob \| history
Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj		patch \| blob \| history
Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters		patch \| blob \| history
Source/WebInspectorUI/WebInspectorUI.vcxproj/build-webinspectorui.pl		patch \| blob \| history
Source/WebKit2/ChangeLog		patch \| blob \| history
Source/WebKit2/PlatformGTK.cmake		patch \| blob \| history