+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
)
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)
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
)
+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
# 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 \
#
all : \
- InspectorJS.json \
- InspectorJSFrontendDispatchers.h \
+ Inspector.json \
+ InspectorFrontendDispatchers.h \
InjectedScriptSource.h \
#
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
<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>
<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" />
<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" />
<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">
<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">
)\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
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, ); }; };
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 */; };
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>"; };
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 */,
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 */,
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 */,
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 */,
#if ENABLE(INSPECTOR)
#include "ConsoleTypes.h"
-#include "InspectorJSFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#include <wtf/Forward.h>
namespace JSC {
#if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
#include "InspectorValues.h"
#include "RegularExpression.h"
#include "Yarr.h"
#if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#include <wtf/Vector.h>
#include <wtf/text/TextPosition.h>
#include <wtf/text/WTFString.h>
#if ENABLE(INSPECTOR)
#include "InjectedScriptBase.h"
-#include "InspectorJSProtocolTypes.h"
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
#include <wtf/PassRefPtr.h>
#if ENABLE(INSPECTOR)
#include "InspectorEnvironment.h"
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#include "bindings/ScriptObject.h"
#include <wtf/Forward.h>
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
#if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#endif
namespace Inspector {
#include <wtf/Vector.h>
#if ENABLE(INSPECTOR)
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#endif
namespace Inspector {
#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>
#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>
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;
}
#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"
#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>
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):
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>']
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))
'<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]),
}
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),
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)
'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)
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)
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>',
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))
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]),
}
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),
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()
'<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()),
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)
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('')
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)
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)
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)
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(' }')
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()
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]),
}
# 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):
_FRAMEWORK_CONFIG_MAP = {
"Global": {
- "prefix": "",
},
"JavaScriptCore": {
- "prefix": "JS",
"export_macro": "JS_EXPORT_PRIVATE"
},
- "WebCore": {
- "prefix": "Web",
- },
# Used for code generator tests.
"Test": {
- "prefix": "Test",
}
}
if frameworkString == "JavaScriptCore":
return Frameworks.JavaScriptCore
- if frameworkString == "WebCore":
- return Frameworks.WebCore
-
if frameworkString == "Test":
return Frameworks.Test
class Frameworks:
Global = Framework("Global")
JavaScriptCore = Framework("JavaScriptCore")
- WebCore = Framework("WebCore")
Test = Framework("Test")
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.")
-### 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.
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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(INSPECTOR)
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);
}
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());
}
#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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"black",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(INSPECTOR)
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);
}
#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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"black",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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));
}
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
-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)
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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));
}
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
-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 {
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>();
}
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"array",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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));
}
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"Hungry",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
-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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"Flamingos",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
-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 {
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
static const char* const enum_constant_values[] = {
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
-### 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.
// 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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestBackendDispatchers.h"
+#include "InspectorBackendDispatchers.h"
#if ENABLE(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.
// 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>
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestFrontendDispatchers.h"
+#include "InspectorFrontendDispatchers.h"
#if ENABLE(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.
// 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>
} // 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 {
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>();
}
#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.
// by the script: Source/JavaScriptCore/inspector/scripts/generate-inspector-protocol-bindings.py
#include "config.h"
-#include "InspectorTestProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#if ENABLE(INSPECTOR)
"Cats",
};
-String getTestEnumConstantValue(int code) {
+String getEnumConstantValue(int code) {
return enum_constant_values[code];
}
#endif // ENABLE(INSPECTOR)
-### End File: InspectorTestProtocolTypes.cpp
+### End File: InspectorProtocolObjects.cpp
#include "config.h"
#include "TypeProfiler.h"
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#include "TypeLocation.h"
namespace JSC {
#include "config.h"
#include "TypeSet.h"
-#include "InspectorJSProtocolTypes.h"
+#include "InspectorProtocolObjects.h"
#include "JSCJSValue.h"
#include "JSCJSValueInlines.h"
#include <wtf/text/CString.h>
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
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
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)
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"
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
+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.
-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
--- /dev/null
+#ifndef WebCore_FWD_InspectorBackendDispatchers_h
+#define WebCore_FWD_InspectorBackendDispatchers_h
+#include <JavaScriptCore/InspectorBackendDispatchers.h>
+#endif
--- /dev/null
+#ifndef WebCore_FWD_InspectorFrontendDispatchers_h
+#define WebCore_FWD_InspectorFrontendDispatchers_h
+#include <JavaScriptCore/InspectorFrontendDispatchers.h>
+#endif
+++ /dev/null
-#ifndef WebCore_FWD_InspectorJSBackendDispatchers_h
-#define WebCore_FWD_InspectorJSBackendDispatchers_h
-#include <JavaScriptCore/InspectorJSBackendDispatchers.h>
-#endif
+++ /dev/null
-#ifndef WebCore_FWD_InspectorJSFrontendDispatchers_h
-#define WebCore_FWD_InspectorJSFrontendDispatchers_h
-#include <JavaScriptCore/InspectorJSFrontendDispatchers.h>
-#endif
+++ /dev/null
-#ifndef WebCore_FWD_InspectorJSProtocolTypes_h
-#define WebCore_FWD_InspectorJSProtocolTypes_h
-#include <JavaScriptCore/InspectorJSProtocolTypes.h>
-#endif
--- /dev/null
+#ifndef WebCore_FWD_InspectorProtocolObjects_h
+#define WebCore_FWD_InspectorProtocolObjects_h
+#include <JavaScriptCore/InspectorProtocolObjects.h>
+#endif
<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>
<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" />
<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" />
<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>
<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">
<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>
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"
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 */; };
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 */; };
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 */; };
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 */,
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>"; };
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>"; };
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>"; };
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>"; };
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 */,
1C81B94D0E9732D900266E07 /* inspector */ = {
isa = PBXGroup;
children = (
- A593CF7218402CE900BFCE27 /* protocol */,
A584FE311864D5AF00843B10 /* CommandLineAPIHost.cpp */,
A584FE321864D5AF00843B10 /* CommandLineAPIHost.h */,
A584FE331864D5AF00843B10 /* CommandLineAPIHost.idl */,
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 */,
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 */,
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 */,
#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"
#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>
#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 {
#include "HTMLStyleElement.h"
#include "InspectorDOMAgent.h"
#include "InspectorHistory.h"
-#include "InspectorWebProtocolTypes.h"
#include "InstrumentingAgents.h"
#include "NamedFlowCollection.h"
#include "Node.h"
#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>
#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>
#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"
#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>
#include "Event.h"
#include "EventListener.h"
#include "EventNames.h"
-#include "EventTarget.h"
#include "ExceptionCodeDescription.h"
#include "FrameTree.h"
#include "HTMLElement.h"
#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"
#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>
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.
#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>
#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 {
#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>
#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>
#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>
#include "ExceptionCode.h"
#include "ExceptionCodePlaceholder.h"
#include "InspectorDatabaseResource.h"
-#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "SQLError.h"
#include "SQLResultSet.h"
#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>
#include "InspectorDatabaseResource.h"
#include "Database.h"
-#include "InspectorWebFrontendDispatchers.h"
#include <inspector/InspectorValues.h>
using namespace Inspector;
#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>
#include "InspectorController.h"
#include "InspectorFrontendHost.h"
#include "InspectorPageAgent.h"
-#include "InspectorWebBackendDispatchers.h"
#include "MainFrame.h"
#include "Page.h"
#include "ScriptController.h"
#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;
#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>
#if ENABLE(INSPECTOR) && ENABLE(INDEXED_DATABASE)
#include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
#include <wtf/text/WTFString.h>
namespace Inspector {
#include "InspectorLayerTreeAgent.h"
#include "InspectorDOMAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
+#include <inspector/InspectorFrontendDispatchers.h>
#include "InstrumentingAgents.h"
#include "IntRect.h"
#include "PseudoElement.h"
#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>
#include "InspectorDOMAgent.h"
#include "InspectorInstrumentation.h"
#include "InspectorOverlay.h"
-#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
#include "MemoryCache.h"
#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>
#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>
#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"
#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>
#include "IconController.h"
#include "InspectorClient.h"
#include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "JSMainThreadExecState.h"
#include "MemoryCache.h"
#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>
#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>
#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>
#include "InspectorClient.h"
#include "InspectorInstrumentation.h"
#include "InspectorPageAgent.h"
-#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "IntRect.h"
#include "JSDOMWindow.h"
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);
#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>
#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>
#define InspectorWorkerAgent_h
#include "InspectorWebAgentBase.h"
-#include "InspectorWebBackendDispatchers.h"
+#include <inspector/InspectorBackendDispatchers.h>
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#if ENABLE(INSPECTOR)
-#include <inspector/InspectorJSFrontendDispatchers.h>
+#include <inspector/InspectorFrontendDispatchers.h>
#include <inspector/agents/InspectorRuntimeAgent.h>
namespace JSC {
#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>
#include "InspectorForwarding.h"
#include "InspectorInstrumentation.h"
#include "InspectorTimelineAgent.h"
-#include "InspectorWebBackendDispatchers.h"
-#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "JSMainThreadExecState.h"
#include "WebInjectedScriptHost.h"
#include "WorkerRuntimeAgent.h"
#include "WorkerThread.h"
#include <inspector/InspectorBackendDispatcher.h>
+#include <inspector/InspectorFrontendDispatchers.h>
using namespace Inspector;
+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
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));
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);
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;
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"] = ""
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');
$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}"
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
// 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);
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 = {
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.
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);
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)
var agent = new InspectorBackend.Agent(domainName);
this._agents[domainName] = agent;
- window[domainName + "Agent"] = agent;
return agent;
},
}
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 + "'");
{
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.
return this._domainName;
},
+ get active()
+ {
+ return this._active;
+ },
+
set dispatcher(value)
{
this._dispatcher = value;
return eventName in this._events;
},
+ activate: function()
+ {
+ this._active = true;
+ window[this._domainName + "Agent"] = this;
+ },
+
dispatchEvent: function(eventName, eventArguments)
{
if (!(eventName in this._dispatcher)) {
* 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"]);
+++ /dev/null
-/*
- * 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", [], []);
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)
{"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": "enabled", "type": "boolean", "description": "Monitoring enabled state." }
+ ],
+ "description": "Toggles monitoring of XMLHttpRequest. If <code>true</code>, console will receive messages upon each XHR issued."
+ },
+ {
+ "name": "addInspectedNode",
+ "parameters": [
+ { "name": "nodeId", "$ref": "ConsoleDOMNodeId", "description": "DOM node id to be accessible by means of $x command line API." }
+ ],
+ "description": "Enables console to refer to the node with given id via $x (see Command Line API for more details $x functions)."
+ }
+ ],
+ "events": [
+ {
+ "name": "messageAdded",
+ "parameters": [
+ { "name": "message", "$ref": "ConsoleMessage", "description": "Console message that has been added." }
+ ],
+ "description": "Issued when new console message is added."
+ },
+ {
+ "name": "messageRepeatCountUpdated",
+ "parameters": [
+ { "name": "count", "type": "integer", "description": "New repeat count value." }
+ ],
+ "description": "Issued when subsequent message(s) are equal to the previous one(s)."
+ },
+ {
+ "name": "messagesCleared",
+ "description": "Issued when console is cleared. This happens either upon <code>clearMessages</code> command or after page navigation."
+ }
+ ]
+}
+,
+{
+ "domain": "Debugger",
+ "description": "Debugger domain exposes JavaScript debugging capabilities. It allows setting and removing breakpoints, stepping through execution, exploring stack traces, etc.",
+ "types": [
+ {
+ "id": "BreakpointId",
+ "type": "string",
+ "description": "Breakpoint identifier."
+ },
+ {
+ "id": "BreakpointActionIdentifier",
+ "type": "integer",
+ "description": "Breakpoint action identifier."
+ },
+ {
+ "id": "ScriptId",
+ "type": "string",
+ "description": "Unique script identifier."
+ },
+ {
+ "id": "CallFrameId",
+ "type": "string",
+ "description": "Call frame identifier."
+ },
+ {
+ "id": "Location",
+ "type": "object",
+ "properties": [
+ { "name": "scriptId", "$ref": "ScriptId", "description": "Script identifier as reported in the <code>Debugger.scriptParsed</code>." },
+ { "name": "lineNumber", "type": "integer", "description": "Line number in the script." },
+ { "name": "columnNumber", "type": "integer", "optional": true, "description": "Column number in the script." }
+ ],
+ "description": "Location in the source code."
+ },
+ {
+ "id": "BreakpointAction",
+ "type": "object",
+ "properties": [
+ { "name": "type", "type": "string", "enum": ["log", "evaluate", "sound", "probe"], "description": "Different kinds of breakpoint actions." },
+ { "name": "data", "type": "string", "optional": true, "description": "Data associated with this breakpoint type (e.g. for type \"eval\" this is the JavaScript string to evalulate)." },
+ { "name": "id", "$ref": "BreakpointActionIdentifier", "optional": true, "description": "A frontend-assigned identifier for this breakpoint action." }
+ ],
+ "description": "Action to perform when a breakpoint is triggered."
+ },
+ {
+ "id": "BreakpointOptions",
+ "type": "object",
+ "properties": [
+ { "name": "condition", "type": "string", "optional": true, "description": "Expression to use as a breakpoint condition. When specified, debugger will only stop on the breakpoint if this expression evaluates to true." },
+ { "name": "actions", "type": "array", "optional": true, "items": { "$ref": "BreakpointAction" }, "description": "Actions to perform automatically when the breakpoint is triggered." },
+ { "name": "autoContinue", "type": "boolean", "optional": true, "description": "Automatically continue after hitting this breakpoint and running actions." }
+ ],
+ "description": "Extra options that modify breakpoint behavior."
+ },
+ {
+ "id": "FunctionDetails",
+ "type": "object",
+ "properties": [
+ { "name": "location", "$ref": "Location", "description": "Location of the function." },
+ { "name": "name", "type": "string", "optional": true, "description": "Name of the function. Not present for anonymous functions." },
+ { "name": "displayName", "type": "string", "optional": true, "description": "Display name of the function(specified in 'displayName' property on the function object)." },
+ { "name": "inferredName", "type": "string", "optional": true, "description": "Name of the function inferred from its initial assignment." },
+ { "name": "scopeChain", "type": "array", "optional": true, "items": { "$ref": "Scope" }, "description": "Scope chain for this closure." }
+ ],
+ "description": "Information about the function."
+ },
+ {
+ "id": "CallFrame",
+ "type": "object",
+ "properties": [
+ { "name": "callFrameId", "$ref": "CallFrameId", "description": "Call frame identifier. This identifier is only valid while the virtual machine is paused." },
+ { "name": "functionName", "type": "string", "description": "Name of the JavaScript function called on this call frame." },
+ { "name": "location", "$ref": "Location", "description": "Location in the source code." },
+ { "name": "scopeChain", "type": "array", "items": { "$ref": "Scope" }, "description": "Scope chain for this call frame." },
+ { "name": "this", "$ref": "Runtime.RemoteObject", "description": "<code>this</code> object for this call frame." }
+ ],
+ "description": "JavaScript call frame. Array of call frames form the call stack."
+ },
+ {
+ "id": "Scope",
+ "type": "object",
+ "properties": [
+ { "name": "type", "type": "string", "enum": ["global", "local", "with", "closure", "catch"], "description": "Scope type." },
+ { "name": "object", "$ref": "Runtime.RemoteObject", "description": "Object representing the scope. For <code>global</code> and <code>with</code> scopes it represents the actual object; for the rest of the scopes, it is artificial transient object enumerating scope variables as its properties." }
+ ],
+ "description": "Scope description."
+ },
+ {
+ "id": "ProbeSample",
+ "description": "A sample collected by evaluating a probe breakpoint action.",
+ "type": "object",
+ "properties": [
+ { "name": "probeId", "$ref": "BreakpointActionIdentifier", "description": "Identifier of the probe breakpoint action that created the sample." },
+ { "name": "sampleId", "type": "integer", "description": "Unique identifier for this sample." },
+ { "name": "batchId", "type": "integer", "description": "A batch identifier which is the same for all samples taken at the same breakpoint hit." },
+ { "name": "timestamp", "type": "number", "description": "Timestamp of when the sample was taken." },
+ { "name": "payload", "$ref": "Runtime.RemoteObject", "description": "Contents of the sample." }
+ ]
+ }
+ ],
+ "commands": [
+ {
+ "name": "enable",
+ "description": "Enables debugger for the given page. Clients should not assume that the debugging has been enabled until the result for this command is received."
+ },
+ {
+ "name": "disable",
+ "description": "Disables debugger for given page."
+ },
+ {
+ "name": "setBreakpointsActive",
+ "parameters": [
+ { "name": "active", "type": "boolean", "description": "New value for breakpoints active state." }
+ ],
+ "description": "Activates / deactivates all breakpoints on the page."
+ },
+ {
+ "name": "setBreakpointByUrl",
+ "parameters": [
+ { "name": "lineNumber", "type": "integer", "description": "Line number to set breakpoint at." },
+ { "name": "url", "type": "string", "optional": true, "description": "URL of the resources to set breakpoint on." },
+ { "name": "urlRegex", "type": "string", "optional": true, "description": "Regex pattern for the URLs of the resources to set breakpoints on. Either <code>url</code> or <code>urlRegex</code> mu