Web Inspector: Add Inspector Code Generation to JavaScriptCore for Runtime Domain
https://bugs.webkit.org/show_bug.cgi?id=125595
Reviewed by Timothy Hatcher.
* GNUmakefile.am:
Source/JavaScriptCore:
- Move CodeGeneration scripts from WebCore into JavaScriptCore/inspector/scripts
- For ports that build WebKit frameworks separately, export the scripts as PrivateHeaders
- Update CodeGeneratorInspector.py in a few ways:
- output dynamic filenames, so JavaScriptCore generates InspectorJSFoo.* and WebCore generates InspectorWebFoo.*
- take in more then one protocol JSON file. The first contains domains to generate, the others are dependencies
that are generated elsewhere that we can depend on for Types.
- Add DerivedSources build step to generate the Inspector Interfaces
* CMakeLists.txt:
* DerivedSources.make:
* GNUmakefile.am:
* GNUmakefile.list.am:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
* JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
* JavaScriptCore.vcxproj/copy-files.cmd:
* JavaScriptCore.xcodeproj/project.pbxproj:
Add scripts and code generation.
* inspector/protocol/Runtime.json: Renamed from Source/WebCore/inspector/protocol/Runtime.json.
Move protocol file into JavaScriptCore so its types will be generated in JavaScriptCore.
* inspector/scripts/CodeGeneratorInspector.py: Renamed from Source/WebCore/inspector/CodeGeneratorInspector.py.
Updates to the script as listed above.
* inspector/scripts/CodeGeneratorInspectorStrings.py: Renamed from Source/WebCore/inspector/CodeGeneratorInspectorStrings.py.
* inspector/scripts/generate-combined-inspector-json.py: Renamed from Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py.
Moved from WebCore into JavaScriptCore for code generation.
Source/WebCore:
- CodeGeneration changed to output Frontend and Backend dispatchers
in namespace Inspector. So update all the agent's appropriately.
- Update Derived Sources code generation to use the Scripts that had
moved to JavaScriptCore. Some ports just use JSC/inspector/scripts
directly, but others have to use the Scripts exported by JSC
in JavaScriptCore's PrivateHeaders.
- Add ForwardingHeaders for the files generated in JavaScriptCore.
- Update the names of Inspector DerivedSources files, since they
were renamed to InspectorWeb*.
No new tests, this only moves code around. There are no functional changes.
* CMakeLists.txt:
* DerivedSources.make:
* ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h: Added.
* ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h: Added.
* ForwardingHeaders/inspector/InspectorJSTypeBuilders.h: Added.
* GNUmakefile.am:
* GNUmakefile.list.am:
* WebCore.vcxproj/WebCore.vcxproj:
* WebCore.vcxproj/WebCore.vcxproj.filters:
* WebCore.vcxproj/build-generated-files.sh:
* WebCore.xcodeproj/project.pbxproj:
Remove files, rename files, update code generation.
* make-generated-sources.sh:
Update this standalone developer script to fill in the new InspectorScripts variable.
* inspector/ConsoleMessage.h:
* inspector/InjectedScriptHost.cpp:
* inspector/InspectorAgent.cpp:
* inspector/InspectorAgent.h:
* inspector/InspectorApplicationCacheAgent.cpp:
* inspector/InspectorApplicationCacheAgent.h:
* inspector/InspectorCSSAgent.h:
* inspector/InspectorCanvasAgent.cpp:
* inspector/InspectorCanvasAgent.h:
* inspector/InspectorConsoleAgent.cpp:
* inspector/InspectorConsoleAgent.h:
* inspector/InspectorController.cpp:
* inspector/InspectorDOMAgent.cpp:
* 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/InspectorDebuggerAgent.cpp:
* inspector/InspectorDebuggerAgent.h:
* inspector/InspectorFrontendClientLocal.cpp:
* inspector/InspectorHeapProfilerAgent.h:
* inspector/InspectorIndexedDBAgent.cpp:
* inspector/InspectorIndexedDBAgent.h:
* inspector/InspectorInputAgent.h:
* inspector/InspectorLayerTreeAgent.cpp:
* inspector/InspectorLayerTreeAgent.h:
* inspector/InspectorMemoryAgent.cpp:
* inspector/InspectorMemoryAgent.h:
* inspector/InspectorPageAgent.cpp:
* inspector/InspectorPageAgent.h:
* inspector/InspectorProfilerAgent.cpp:
* inspector/InspectorProfilerAgent.h:
* inspector/InspectorResourceAgent.cpp:
* inspector/InspectorResourceAgent.h:
* inspector/InspectorRuntimeAgent.h:
* inspector/InspectorTimelineAgent.cpp:
* inspector/InspectorTimelineAgent.h:
* inspector/InspectorWorkerAgent.cpp:
* inspector/InspectorWorkerAgent.h:
* inspector/PageRuntimeAgent.h:
* inspector/ScriptCallFrame.cpp:
* inspector/WorkerInspectorController.cpp:
* inspector/WorkerRuntimeAgent.h:
Updates header names and class namespace changes.
Source/WebInspectorUI:
* Scripts/copy-user-interface-resources.sh:
Copy all the different backend commands files.
* Scripts/update-InspectorBackendCommands.rb:
Update with respect to new script location and new file names.
* WebInspectorUI.xcodeproj/project.pbxproj:
Remove Inputs and Outputs of build phase, which were wrong.
Now this build phase always runs, and not by accident.
* UserInterface/InspectorJSBackendCommands.js: Added.
* UserInterface/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js.
* UserInterface/Legacy/6.0/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorBackendCommands.js.
* UserInterface/Legacy/7.0/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorBackendCommands.js.
* UserInterface/LoadInspectorBackendCommands.js:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
* WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
LayoutTests:
* http/tests/inspector-protocol/resources/InspectorTest.js:
(InspectorTest.importInspectorScripts):
Update for the new backend commands files.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@160557 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/JavaScriptCore/CMakeLists.txt b/Source/JavaScriptCore/CMakeLists.txt
index be8b27c..3d7ea95 100644
--- a/Source/JavaScriptCore/CMakeLists.txt
+++ b/Source/JavaScriptCore/CMakeLists.txt
@@ -652,6 +652,43 @@
VERBATIM)
ADD_SOURCE_DEPENDENCIES(${CMAKE_CURRENT_SOURCE_DIR}/parser/Lexer.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/KeywordLookup.h)
+
+# Inspector Interfaces
+
+set(JavaScriptCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
+
+set(JavaScriptCore_INSPECTOR_DOMAINS
+ inspector/protocol/Runtime.json
+)
+
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.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_DIR}/inspector/protocol > ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+ VERBATIM)
+
+# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
+add_custom_command(
+ OUTPUT ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+ MAIN_DEPENDENCY ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json
+ DEPENDS ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py
+ COMMAND ${PYTHON_EXECUTABLE} ${JavaScriptCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}" --output_type JavaScript --write_always && mkdir -p ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector && cp ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/inspector
+ VERBATIM)
+
+list(APPEND JavaScriptCore_SOURCES
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.cpp
+)
+
+list(APPEND JavaScriptCore_HEADERS
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSBackendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSFrontendDispatchers.h
+ ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+)
+
+
if (WTF_CPU_ARM)
list(APPEND JavaScriptCore_SOURCES
assembler/ARMAssembler.cpp
diff --git a/Source/JavaScriptCore/ChangeLog b/Source/JavaScriptCore/ChangeLog
index cbacecc..70c93e8 100644
--- a/Source/JavaScriptCore/ChangeLog
+++ b/Source/JavaScriptCore/ChangeLog
@@ -1,3 +1,38 @@
+2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Inspector Code Generation to JavaScriptCore for Runtime Domain
+ https://bugs.webkit.org/show_bug.cgi?id=125595
+
+ Reviewed by Timothy Hatcher.
+
+ - Move CodeGeneration scripts from WebCore into JavaScriptCore/inspector/scripts
+ - For ports that build WebKit frameworks separately, export the scripts as PrivateHeaders
+ - Update CodeGeneratorInspector.py in a few ways:
+ - output dynamic filenames, so JavaScriptCore generates InspectorJSFoo.* and WebCore generates InspectorWebFoo.*
+ - take in more then one protocol JSON file. The first contains domains to generate, the others are dependencies
+ that are generated elsewhere that we can depend on for Types.
+ - Add DerivedSources build step to generate the Inspector Interfaces
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj:
+ * JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters:
+ * JavaScriptCore.vcxproj/copy-files.cmd:
+ * JavaScriptCore.xcodeproj/project.pbxproj:
+ Add scripts and code generation.
+
+ * inspector/protocol/Runtime.json: Renamed from Source/WebCore/inspector/protocol/Runtime.json.
+ Move protocol file into JavaScriptCore so its types will be generated in JavaScriptCore.
+
+ * inspector/scripts/CodeGeneratorInspector.py: Renamed from Source/WebCore/inspector/CodeGeneratorInspector.py.
+ Updates to the script as listed above.
+
+ * inspector/scripts/CodeGeneratorInspectorStrings.py: Renamed from Source/WebCore/inspector/CodeGeneratorInspectorStrings.py.
+ * inspector/scripts/generate-combined-inspector-json.py: Renamed from Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py.
+ Moved from WebCore into JavaScriptCore for code generation.
+
2013-12-13 Peter Szanka <h868064@stud.u-szeged.hu>
Delete INTEL C compiler related code parts.
diff --git a/Source/JavaScriptCore/DerivedSources.make b/Source/JavaScriptCore/DerivedSources.make
index ef43021..4e10517 100644
--- a/Source/JavaScriptCore/DerivedSources.make
+++ b/Source/JavaScriptCore/DerivedSources.make
@@ -5,13 +5,13 @@
# are met:
#
# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
+# 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.
+# documentation and/or other materials provided with the distribution.
# 3. Neither the name of Apple Computer, Inc. ("Apple") nor the names of
# its contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
+# from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY APPLE AND ITS CONTRIBUTORS "AS IS" AND ANY
# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
@@ -79,3 +79,27 @@
udis86_itab.h: $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml
(PYTHONPATH=$(JavaScriptCore)/disassembler/udis86 python $(JavaScriptCore)/disassembler/udis86/itab.py $(JavaScriptCore)/disassembler/udis86/optable.xml || exit 1)
+
+
+# Inspector interfaces
+
+INSPECTOR_DOMAINS = \
+ $(JavaScriptCore)/inspector/protocol/Runtime.json \
+#
+
+INSPECTOR_GENERATOR_SCRIPTS = \
+ $(JavaScriptCore)/inspector/scripts/CodeGeneratorInspector.py \
+ $(JavaScriptCore)/inspector/scripts/CodeGeneratorInspectorStrings.py \
+#
+
+all : \
+ InspectorJS.json \
+ InspectorJSFrontendDispatchers.h \
+#
+
+InspectorJS.json : inspector/scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
+ python $(JavaScriptCore)/inspector/scripts/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > ./InspectorJS.json
+
+# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
+InspectorJSFrontendDispatchers.h : InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
+ python $(JavaScriptCore)/inspector/scripts/CodeGeneratorInspector.py ./InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type JavaScript
diff --git a/Source/JavaScriptCore/GNUmakefile.am b/Source/JavaScriptCore/GNUmakefile.am
index 75dbee5..e8b66a9 100644
--- a/Source/JavaScriptCore/GNUmakefile.am
+++ b/Source/JavaScriptCore/GNUmakefile.am
@@ -215,3 +215,27 @@
typelibs_DATA += JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
CLEANFILES += JavaScriptCore-@WEBKITGTK_API_VERSION@.gir JavaScriptCore-@WEBKITGTK_API_VERSION@.typelib
endif
+
+
+# Inspector Interfaces
+
+INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts
+
+INSPECTOR_DOMAINS := \
+ $(JavaScriptCore)/inspector/protocol/Runtime.json
+
+DerivedSources/JavaScriptCore/InspectorJS.json: $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
+ $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(JavaScriptCore)/inspector/protocol > $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json
+
+# Inspector Backend Dispatchers, Frontend Dispatchers, Type Builders
+# Copy generated header files to DerivedSources/JavaScriptCore/inspector so that WebCore's ForwardingHeader style of #include <inspector/Foo.h> will work.
+DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp: DerivedSources/JavaScriptCore/InspectorJS.json $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspectorStrings.py
+ $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_JAVASCRIPTCORE) --output_cpp_dir $(GENSOURCES_JAVASCRIPTCORE) --output_js_dir $(GENSOURCES_JAVASCRIPTCORE) --output_type JavaScript
+ mkdir -p DerivedSources/JavaScriptCore/inspector
+ cp DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h DerivedSources/JavaScriptCore/inspector
+DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h: DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.cpp
+DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.cpp: DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h
+DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h: DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp
+DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp: DerivedSources/JavaScriptCore/InspectorJSBackendCommands.js
+DerivedSources/JavaScriptCore/InspectorJSBackendCommands.js: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h
+DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h: DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp
diff --git a/Source/JavaScriptCore/GNUmakefile.list.am b/Source/JavaScriptCore/GNUmakefile.list.am
index fbb004d..98ced6f 100644
--- a/Source/JavaScriptCore/GNUmakefile.list.am
+++ b/Source/JavaScriptCore/GNUmakefile.list.am
@@ -1186,7 +1186,13 @@
Source/JavaScriptCore/yarr/YarrPattern.cpp \
Source/JavaScriptCore/yarr/YarrPattern.h \
Source/JavaScriptCore/yarr/YarrSyntaxChecker.cpp \
- Source/JavaScriptCore/yarr/YarrSyntaxChecker.h
+ Source/JavaScriptCore/yarr/YarrSyntaxChecker.h \
+ DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.cpp \
+ DerivedSources/JavaScriptCore/InspectorJSBackendDispatchers.h \
+ DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.cpp \
+ DerivedSources/JavaScriptCore/InspectorJSFrontendDispatchers.h \
+ DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.cpp \
+ DerivedSources/JavaScriptCore/InspectorJSTypeBuilders.h
llint_nosources += \
Source/JavaScriptCore/llint/LowLevelInterpreter32_64.asm \
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
index 5d13169..7fe53e5 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj
@@ -692,6 +692,9 @@
<ClCompile Include="..\yarr\YarrJIT.cpp" />
<ClCompile Include="..\yarr\YarrPattern.cpp" />
<ClCompile Include="..\yarr\YarrSyntaxChecker.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp" />
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\ArrayConstructor.lut.h" />
@@ -701,6 +704,9 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\DatePrototype.lut.h" />
<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\InspectorJSBackendDispatchers.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h" />
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.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" />
@@ -1368,4 +1374,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
index a28f241..9bd49ae 100644
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/JavaScriptCore.vcxproj.filters
@@ -1296,6 +1296,15 @@
<ClCompile Include="..\runtime\ArrayBufferNeuteringWatchpoint.cpp">
<Filter>runtime</Filter>
</ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.cpp">
+ <Filter>Derived Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.cpp">
+ <Filter>Derived Sources</Filter>
+ </ClCompile>
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.cpp">
+ <Filter>Derived Sources</Filter>
+ </ClCompile>
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\API\APICallbackFunction.h">
@@ -2448,6 +2457,15 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HeaderDetection.h">
<Filter>Derived Sources</Filter>
</ClInclude>
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSBackendDispatchers.h">
+ <Filter>Derived Sources</Filter>
+ </ClInclude>
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSFrontendDispatchers.h">
+ <Filter>Derived Sources</Filter>
+ </ClInclude>
+ <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorJSTypeBuilders.h">
+ <Filter>Derived Sources</Filter>
+ </ClInclude>
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSGlobalObject.lut.h">
<Filter>Derived Sources</Filter>
</ClInclude>
@@ -3239,4 +3257,4 @@
<Filter>jit</Filter>
</MASM>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd b/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
index 882ce83..2b83fa6 100755
--- a/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
+++ b/Source/JavaScriptCore/JavaScriptCore.vcxproj/copy-files.cmd
@@ -3,6 +3,7 @@
set PublicHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\JavaScriptCore
set PrivateHeadersDirectory=%CONFIGURATIONBUILDDIR%\include\private\JavaScriptCore
set ResourcesDirectory=%CONFIGURATIONBUILDDIR%\bin%PlatformArchitecture%\JavaScriptCore.resources
+set DerivedSourcesDirectory=%CONFIGURATIONBUILDDIR%\obj%PlatformArchitecture%\JavaScriptCore\DerivedSources
if "%1" EQU "clean" goto :clean
if "%1" EQU "rebuild" call :clean
@@ -57,6 +58,19 @@
xcopy /y /d ..\%%d\*.h "%PrivateHeadersDirectory%" >NUL
)
+echo Copying Inspector scripts as if they were private headers...
+for %%d in (
+ inspector\scripts
+) do (
+ xcopy /y /d ..\%%d\*.py "%PrivateHeadersDirectory%" >NUL
+)
+
+echo Copying Inspector generated files as if they were private headers...
+xcopy /y "%DerivedSourcesDirectory%\InspectorJS.json" "%PrivateHeadersDirectory%" >NUL
+xcopy /y "%DerivedSourcesDirectory%\InspectorJSTypeBuilders.h" "%PrivateHeadersDirectory%" >NUL
+xcopy /y "%DerivedSourcesDirectory%\InspectorJSBackendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
+xcopy /y "%DerivedSourcesDirectory%\InspectorJSFrontendDispatchers.h" "%PrivateHeadersDirectory%" >NUL
+
echo Copying resources...
mkdir "%ResourcesDirectory%" 2>NUL
xcopy /y /d JavaScriptCore.resources\* "%ResourcesDirectory%" >NUL
diff --git a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
index 000c5fd..2dd95ab 100644
--- a/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
+++ b/Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj
@@ -543,7 +543,6 @@
0FFB921C16D02F110055A5DB /* DFGOSRExitCompilationInfo.h in Headers */ = {isa = PBXBuildFile; fileRef = 65987F2C167FE84B003C2F8D /* DFGOSRExitCompilationInfo.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FFB921D16D02F300055A5DB /* DFGSlowPathGenerator.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F1E3A501537C2CB000F9456 /* DFGSlowPathGenerator.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FFB921E16D02F470055A5DB /* DFGVariadicFunction.h in Headers */ = {isa = PBXBuildFile; fileRef = 0F85A31E16AB76AE0077571E /* DFGVariadicFunction.h */; settings = {ATTRIBUTES = (Private, ); }; };
- 0FFB921F16D033050055A5DB /* (null) in Headers */ = {isa = PBXBuildFile; settings = {ATTRIBUTES = (Private, ); }; };
0FFB922016D033B70055A5DB /* NodeConstructors.h in Headers */ = {isa = PBXBuildFile; fileRef = 930DAD030FB1EB1A0082D205 /* NodeConstructors.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FFC99D1184EC8AD009C10AB /* ConstantMode.h in Headers */ = {isa = PBXBuildFile; fileRef = 0FFC99D0184EC8AD009C10AB /* ConstantMode.h */; settings = {ATTRIBUTES = (Private, ); }; };
0FFC99D4184EE318009C10AB /* ArrayBufferNeuteringWatchpoint.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 0FFC99D2184EE318009C10AB /* ArrayBufferNeuteringWatchpoint.cpp */; };
@@ -895,6 +894,16 @@
A1712B4111C7B235007A5315 /* RegExpKey.h in Headers */ = {isa = PBXBuildFile; fileRef = A1712B4011C7B235007A5315 /* RegExpKey.h */; settings = {ATTRIBUTES = (Private, ); }; };
A1A009C01831A22D00CF8711 /* MacroAssemblerARM64.h in Headers */ = {isa = PBXBuildFile; fileRef = 8640923C156EED3B00566CB2 /* MacroAssemblerARM64.h */; settings = {ATTRIBUTES = (Private, ); }; };
A1A009C11831A26E00CF8711 /* ARM64Assembler.h in Headers */ = {isa = PBXBuildFile; fileRef = 8640923B156EED3B00566CB2 /* ARM64Assembler.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 /* InspectorJSTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */; };
+ A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = A532438618568317002ED692 /* InspectorJSTypeBuilders.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ A532439218569709002ED692 /* CodeGeneratorInspector.py in Headers */ = {isa = PBXBuildFile; fileRef = A532438F185696E6002ED692 /* CodeGeneratorInspector.py */; settings = {ATTRIBUTES = (Private, ); }; };
+ A532439318569709002ED692 /* CodeGeneratorInspectorStrings.py in Headers */ = {isa = PBXBuildFile; fileRef = A5324390185696E6002ED692 /* CodeGeneratorInspectorStrings.py */; 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, ); }; };
A54CF2F5184EAB2400237F19 /* ScriptValue.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54CF2F2184EAB2400237F19 /* ScriptValue.cpp */; };
A54CF2F6184EAB2400237F19 /* ScriptValue.h in Headers */ = {isa = PBXBuildFile; fileRef = A54CF2F3184EAB2400237F19 /* ScriptValue.h */; settings = {ATTRIBUTES = (Private, ); }; };
A54CF2F9184EAEDA00237F19 /* ScriptObject.cpp in Sources */ = {isa = PBXBuildFile; fileRef = A54CF2F7184EAEDA00237F19 /* ScriptObject.cpp */; };
@@ -2241,6 +2250,18 @@
A1712B3A11C7B212007A5315 /* RegExpCache.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RegExpCache.cpp; sourceTree = "<group>"; };
A1712B3E11C7B228007A5315 /* RegExpCache.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpCache.h; sourceTree = "<group>"; };
A1712B4011C7B235007A5315 /* RegExpKey.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RegExpKey.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 /* InspectorJSTypeBuilders.cpp */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorJSTypeBuilders.cpp; sourceTree = "<group>"; };
+ A532438618568317002ED692 /* InspectorJSTypeBuilders.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = InspectorJSTypeBuilders.h; sourceTree = "<group>"; };
+ A532438D185696CA002ED692 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; name = protocol; path = inspector/protocol; sourceTree = "<group>"; };
+ A532438F185696E6002ED692 /* CodeGeneratorInspector.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = CodeGeneratorInspector.py; path = inspector/scripts/CodeGeneratorInspector.py; sourceTree = "<group>"; };
+ A5324390185696E6002ED692 /* CodeGeneratorInspectorStrings.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = CodeGeneratorInspectorStrings.py; path = inspector/scripts/CodeGeneratorInspectorStrings.py; sourceTree = "<group>"; };
+ A5324391185696E6002ED692 /* generate-combined-inspector-json.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; name = "generate-combined-inspector-json.py"; path = "inspector/scripts/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>"; };
A54CF2F2184EAB2400237F19 /* ScriptValue.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptValue.cpp; sourceTree = "<group>"; };
A54CF2F3184EAB2400237F19 /* ScriptValue.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScriptValue.h; sourceTree = "<group>"; };
A54CF2F7184EAEDA00237F19 /* ScriptObject.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptObject.cpp; sourceTree = "<group>"; };
@@ -3314,6 +3335,14 @@
children = (
BC18C5230E16FC8A00B34460 /* ArrayPrototype.lut.h */,
BCD203E70E1718F4002C7E82 /* DatePrototype.lut.h */,
+ A53243951856A475002ED692 /* InspectorJS.json */,
+ A53243961856A475002ED692 /* InspectorJSBackendCommands.js */,
+ A532438118568317002ED692 /* InspectorJSBackendDispatchers.cpp */,
+ A532438218568317002ED692 /* InspectorJSBackendDispatchers.h */,
+ A532438318568317002ED692 /* InspectorJSFrontendDispatchers.cpp */,
+ A532438418568317002ED692 /* InspectorJSFrontendDispatchers.h */,
+ A532438518568317002ED692 /* InspectorJSTypeBuilders.cpp */,
+ A532438618568317002ED692 /* InspectorJSTypeBuilders.h */,
BC87CDB810712ACA000614CF /* JSONObject.lut.h */,
7C184E2417BFFA36007CB63A /* JSPromiseConstructor.lut.h */,
7C184E2517BFFA36007CB63A /* JSPromisePrototype.lut.h */,
@@ -4230,6 +4259,16 @@
path = bytecode;
sourceTree = "<group>";
};
+ A532438E185696CE002ED692 /* scripts */ = {
+ isa = PBXGroup;
+ children = (
+ A532438F185696E6002ED692 /* CodeGeneratorInspector.py */,
+ A5324390185696E6002ED692 /* CodeGeneratorInspectorStrings.py */,
+ A5324391185696E6002ED692 /* generate-combined-inspector-json.py */,
+ );
+ name = scripts;
+ sourceTree = "<group>";
+ };
A54CF2EA184EA73900237F19 /* bindings */ = {
isa = PBXGroup;
children = (
@@ -4246,7 +4285,9 @@
A5BA15DF1823409200A82E69 /* inspector */ = {
isa = PBXGroup;
children = (
+ A532438D185696CA002ED692 /* protocol */,
A5BA15E01823409D00A82E69 /* remote */,
+ A532438E185696CE002ED692 /* scripts */,
A593CF7E1840362C00BFCE27 /* InspectorAgentBase.h */,
A593CF84184038CA00BFCE27 /* InspectorAgentRegistry.cpp */,
A593CF85184038CA00BFCE27 /* InspectorAgentRegistry.h */,
@@ -4306,12 +4347,12 @@
isa = PBXHeadersBuildPhase;
buildActionMask = 2147483647;
files = (
- 0FFB921F16D033050055A5DB /* (null) in Headers */,
0FFA549816B8835300B3A982 /* A64DOpcode.h in Headers */,
860161E30F3A83C100F84710 /* AbstractMacroAssembler.h in Headers */,
0F55F0F514D1063C00AC7649 /* AbstractPC.h in Headers */,
2A48D1911772365B00C65A5F /* APICallbackFunction.h in Headers */,
BC18C3E50E16F5CD00B34460 /* APICast.h in Headers */,
+ A532438C18568335002ED692 /* InspectorJSTypeBuilders.h in Headers */,
865F408810E7D56300947361 /* APIShims.h in Headers */,
BCF605140E203EF800B9A64D /* ArgList.h in Headers */,
BC257DE80E1F51C50016B6C9 /* Arguments.h in Headers */,
@@ -4320,12 +4361,16 @@
86D3B2C410156BDE002865E7 /* ARMAssembler.h in Headers */,
86ADD1450FDDEA980006EEC2 /* ARMv7Assembler.h in Headers */,
65C0285D1717966800351E35 /* ARMv7DOpcode.h in Headers */,
+ A532439218569709002ED692 /* CodeGeneratorInspector.py in Headers */,
+ A532439318569709002ED692 /* CodeGeneratorInspectorStrings.py in Headers */,
+ A532439418569709002ED692 /* generate-combined-inspector-json.py in Headers */,
FE5932A8183C5A2600A1ECCC /* VMEntryScope.h in Headers */,
0F24E54F17EE274900ABB217 /* TempRegisterSet.h in Headers */,
A7BFF3C0179868940002F462 /* DFGFiltrationResult.h in Headers */,
C2FCAE1117A9C24E0034C735 /* BytecodeBasicBlock.h in Headers */,
C2FCAE1317A9C24E0034C735 /* BytecodeLivenessAnalysis.h in Headers */,
0F8335B81639C1EA001443B5 /* ArrayAllocationProfile.h in Headers */,
+ A53243981856A489002ED692 /* InspectorJS.json in Headers */,
FEA08620182B7A0400F6D851 /* Breakpoint.h in Headers */,
A7A8AF3517ADB5F3005AB174 /* ArrayBuffer.h in Headers */,
FEA08621182B7A0400F6D851 /* DebuggerPrimitives.h in Headers */,
@@ -4812,6 +4857,7 @@
86D3B2C610156BDE002865E7 /* MacroAssemblerARM.h in Headers */,
86ADD1460FDDEA980006EEC2 /* MacroAssemblerARMv7.h in Headers */,
863B23E00FC6118900703AA4 /* MacroAssemblerCodeRef.h in Headers */,
+ A532438A18568335002ED692 /* InspectorJSFrontendDispatchers.h in Headers */,
86C568E111A213EE0007F7F0 /* MacroAssemblerMIPS.h in Headers */,
86AE64A9135E5E1C00963012 /* MacroAssemblerSH4.h in Headers */,
860161E40F3A83C100F84710 /* MacroAssemblerX86.h in Headers */,
@@ -4892,6 +4938,7 @@
0FF7168C15A3B235008F5DAA /* PropertyOffset.h in Headers */,
BC18C4550E16F5CD00B34460 /* PropertySlot.h in Headers */,
0FB7F39C15ED8E4600F167B2 /* PropertyStorage.h in Headers */,
+ A532438818568335002ED692 /* InspectorJSBackendDispatchers.h in Headers */,
BC18C4560E16F5CD00B34460 /* Protect.h in Headers */,
1474C33B16AA2D950062F01D /* PrototypeMap.h in Headers */,
0F9332A414CA7DD90085F3C6 /* PutByIdStatus.h in Headers */,
@@ -5605,6 +5652,7 @@
0FEA0A1E1708B00700BB722C /* FTLAbstractHeapRepository.cpp in Sources */,
0FEA0A09170513DB00BB722C /* FTLCapabilities.cpp in Sources */,
0FEA0A271709623B00BB722C /* FTLCommonValues.cpp in Sources */,
+ A532438918568335002ED692 /* InspectorJSFrontendDispatchers.cpp in Sources */,
0FEA0A0B170513DB00BB722C /* FTLCompile.cpp in Sources */,
0F235BD317178E1C00690C7F /* FTLExitArgument.cpp in Sources */,
0F235BD517178E1C00690C7F /* FTLExitArgumentForOperand.cpp in Sources */,
@@ -5734,6 +5782,7 @@
146AAB380B66A94400E55F16 /* JSStringRefCF.cpp in Sources */,
0F919D0C157EE09F004A4E7D /* JSSymbolTableObject.cpp in Sources */,
0F2B66FA17B6B5AB00A7AE3F /* JSTypedArrayConstructors.cpp in Sources */,
+ A532438B18568335002ED692 /* InspectorJSTypeBuilders.cpp in Sources */,
0F2B66FC17B6B5AB00A7AE3F /* JSTypedArrayPrototypes.cpp in Sources */,
0F2B66FE17B6B5AB00A7AE3F /* JSTypedArrays.cpp in Sources */,
86E3C61A167BABEE006D760A /* JSValue.mm in Sources */,
@@ -5767,6 +5816,7 @@
0FEB3ECF16237F6C00AB67AD /* MacroAssembler.cpp in Sources */,
86C568E011A213EE0007F7F0 /* MacroAssemblerARM.cpp in Sources */,
A729009C17976C6000317298 /* MacroAssemblerARMv7.cpp in Sources */,
+ A532438718568335002ED692 /* InspectorJSBackendDispatchers.cpp in Sources */,
A7A4AE0817973B26005612B1 /* MacroAssemblerX86Common.cpp in Sources */,
A700873917CBE85300C3E643 /* MapConstructor.cpp in Sources */,
A78507D617CBC6FD0011F6E7 /* MapData.cpp in Sources */,
diff --git a/Source/WebCore/inspector/protocol/Runtime.json b/Source/JavaScriptCore/inspector/protocol/Runtime.json
similarity index 100%
rename from Source/WebCore/inspector/protocol/Runtime.json
rename to Source/JavaScriptCore/inspector/protocol/Runtime.json
diff --git a/Source/WebCore/inspector/CodeGeneratorInspector.py b/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
similarity index 94%
rename from Source/WebCore/inspector/CodeGeneratorInspector.py
rename to Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
index a1db1b7..43f50d2 100755
--- a/Source/WebCore/inspector/CodeGeneratorInspector.py
+++ b/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
@@ -72,21 +72,40 @@
EXACTLY_INT_SUPPORTED = False
+INSPECTOR_TYPES_GENERATOR_CONFIG_MAP = {
+ "JavaScript": {
+ "prefix": "JS",
+ "typebuilder_dependency": "",
+ "export_macro": "JS_EXPORT_PRIVATE",
+ },
+ "Web": {
+ "prefix": "Web",
+ "typebuilder_dependency": "#include <inspector/InspectorJSTypeBuilders.h>",
+ "export_macro": "",
+ },
+}
+
cmdline_parser = optparse.OptionParser(usage="usage: %prog [options] <Inspector.json>")
cmdline_parser.add_option("--output_h_dir")
cmdline_parser.add_option("--output_cpp_dir")
cmdline_parser.add_option("--output_js_dir")
+cmdline_parser.add_option("--output_type") # JavaScript, Web
cmdline_parser.add_option("--write_always", action="store_true")
cmdline_parser.add_option("--no_verification", action="store_true")
try:
arg_options, arg_values = cmdline_parser.parse_args()
- if (len(arg_values) != 1):
- raise Exception("Exactly one plain argument expected (found %s)" % len(arg_values))
+ if (len(arg_values) < 1):
+ raise Exception("At least one plain argument expected")
+
input_json_filename = arg_values[0]
+ dependency_json_filenames = arg_values[1:]
+
output_header_dirname = arg_options.output_h_dir
output_cpp_dirname = arg_options.output_cpp_dir
output_js_dirname = arg_options.output_js_dir
+ output_type = arg_options.output_type
+
write_always = arg_options.write_always
verification = not arg_options.no_verification
if not output_header_dirname:
@@ -95,6 +114,8 @@
raise Exception("Output .cpp directory must be specified")
if not output_js_dirname:
raise Exception("Output .js directory must be specified")
+ if output_type not in INSPECTOR_TYPES_GENERATOR_CONFIG_MAP.keys():
+ raise Exception("Unknown output type. Allowed types are: %s" % INSPECTOR_TYPES_GENERATOR_CONFIG_MAP.keys())
except Exception:
# Work with python 2 and 3 http://docs.python.org/py3k/howto/pyporting.html
exc = sys.exc_info()[1]
@@ -1269,7 +1290,7 @@
if class_binding_cls.need_internal_runtime_cast_:
writer.append("#if %s\n" % VALIDATOR_IFDEF_NAME)
- writer.newline(" static void assertCorrectValue(Inspector::InspectorValue* value);\n")
+ writer.newline(" static %s void assertCorrectValue(Inspector::InspectorValue* value);\n" % INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["export_macro"])
writer.append("#endif // %s\n" % VALIDATOR_IFDEF_NAME)
closed_field_set = (context_domain_name + "." + class_name) not in TYPES_WITH_OPEN_FIELD_LIST_SET
@@ -1311,9 +1332,8 @@
validator_writer.newline(" }\n")
if closed_field_set:
- validator_writer.newline(" if (foundPropertiesCount != object->size()) {\n")
- validator_writer.newline(" FATAL(\"Unexpected properties in object: %s\\n\", object->toJSONString().ascii().data());\n")
- validator_writer.newline(" }\n")
+ validator_writer.newline(" if (foundPropertiesCount != object->size())\n")
+ validator_writer.newline(" FATAL(\"Unexpected properties in object: %s\\n\", object->toJSONString().ascii().data());\n")
validator_writer.newline("}\n")
if domain_guard:
@@ -1585,8 +1605,7 @@
raise Exception("Unknown type")
json_type_name = json_type["type"]
- raw_type = RawTypes.get(json_type_name)
- self.raw_type_ = raw_type
+ self.raw_type_ = RawTypes.get(json_type_name)
self.binding_being_resolved_ = False
self.binding_ = None
@@ -1596,7 +1615,7 @@
def get_binding(self):
if not self.binding_:
if self.binding_being_resolved_:
- raise Error("Type %s is already being resolved" % self.json_type_["type"])
+ raise Exception("Type %s is already being resolved" % self.json_type_["type"])
# Resolve only lazily, because resolving one named type may require resolving some other named type.
self.binding_being_resolved_ = True
try:
@@ -1632,33 +1651,44 @@
class TypeMap:
- def __init__(self, api):
+ def __init__(self, api, dependency_api):
self.map_ = {}
self.domains_ = []
+ self.domains_to_generate_ = []
for json_domain in api["domains"]:
- domain_name = json_domain["domain"]
+ self.add_domain(json_domain, True)
+ for json_domain in dependency_api["domains"]:
+ self.add_domain(json_domain, False)
- domain_map = {}
- self.map_[domain_name] = domain_map
+ def add_domain(self, json_domain, should_generate):
+ domain_name = json_domain["domain"]
- domain_data = DomainData(json_domain)
+ domain_map = {}
+ self.map_[domain_name] = domain_map
+ domain_data = DomainData(json_domain)
+ self.domains_.append(domain_data)
+
+ if should_generate:
# FIXME: The order of types should not matter. The generated code should work regardless of the order of types.
if domain_name == "Page":
- self.domains_.insert(0, domain_data)
+ self.domains_to_generate_.insert(0, domain_data)
else:
- self.domains_.append(domain_data)
+ self.domains_to_generate_.append(domain_data)
- if "types" in json_domain:
- for json_type in json_domain["types"]:
- type_name = json_type["id"]
- type_data = TypeData(json_type, json_domain, domain_data)
- domain_map[type_name] = type_data
- domain_data.add_type(type_data)
+ if "types" in json_domain:
+ for json_type in json_domain["types"]:
+ type_name = json_type["id"]
+ type_data = TypeData(json_type, json_domain, domain_data)
+ domain_map[type_name] = type_data
+ domain_data.add_type(type_data)
def domains(self):
return self.domains_
+ def domains_to_generate(self):
+ return self.domains_to_generate_
+
def get(self, domain_name, type_name):
return self.map_[domain_name][type_name]
@@ -1675,6 +1705,7 @@
else:
raise Exception("Unknown type")
+
def resolve_param_raw_type(json_parameter, scope_domain_name):
if "$ref" in json_parameter:
json_ref = json_parameter["$ref"]
@@ -1702,11 +1733,20 @@
input_file = open(input_json_filename, "r")
json_string = input_file.read()
json_api = json.loads(json_string)
-
-# Allow this script to work when the input is a single domain.
+input_file.close()
if not "domains" in json_api:
json_api = {"domains": [json_api]}
+dependency_api = {"domains": []}
+for dependency_json_filename in dependency_json_filenames:
+ dependency_input_file = open(dependency_json_filename, "r")
+ dependency_json_string = dependency_input_file.read()
+ dependency_json_api = json.loads(dependency_json_string)
+ dependency_input_file.close()
+ if not "domains" in dependency_json_api:
+ dependency_json_api = {"domains": [dependency_json_api]}
+ dependency_api["domains"] += dependency_json_api["domains"]
+
class Templates:
def get_this_script_path_(absolute_path):
@@ -1752,7 +1792,7 @@
-type_map = TypeMap(json_api)
+type_map = TypeMap(json_api, dependency_api)
class NeedRuntimeCastRequest:
@@ -1785,11 +1825,10 @@
for domain_data in type_map.domains():
for type_data in domain_data.types():
- # Do not generate forwards for this type any longer.
- ForwardListener.already_declared_set.add(type_data)
-
binding = type_data.get_binding()
binding.resolve_inner(ResolveContext)
+ # Do not generate forwards for this type any longer.
+ ForwardListener.already_declared_set.add(type_data)
for domain_data in type_map.domains():
for type_data in domain_data.types():
@@ -1802,9 +1841,11 @@
if request and not request.is_acknowledged():
raise Exception("Failed to generate runtimeCast in " + full_type_name)
- if verification:
- for full_type_name in runtime_cast_generate_requests:
- raise Exception("Failed to generate runtimeCast. Type " + full_type_name + " not found")
+ # FIXME: This assumes all the domains are processed at once. Change this verification
+ # to only verify runtime casts for the domains being generated.
+ # if verification:
+ # for full_type_name in runtime_cast_generate_requests:
+ # raise Exception("Failed to generate runtimeCast. Type " + full_type_name + " not found")
return ForwardListener
@@ -1826,6 +1867,7 @@
else:
return value_ref
+
class Generator:
frontend_domain_class_lines = []
@@ -1890,6 +1932,7 @@
Generator.process_event(json_event, domain_name, frontend_method_declaration_lines)
Generator.frontend_domain_class_lines.append(Templates.frontend_domain_class.substitute(None,
+ exportMacro=INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["export_macro"],
domainClassName="Inspector%sFrontendDispatcher" % domain_name,
frontendDomainMethodDeclarations="".join(flatten_list(frontend_method_declaration_lines))))
@@ -1900,13 +1943,13 @@
dispatcher_name = "Inspector" + Capitalizer.lower_camel_case_to_upper(domain_name) + "BackendDispatcher"
agent_interface_name = dispatcher_name + "Handler"
- Generator.backend_dispatcher_interface_list.append("class %s FINAL : public Inspector::InspectorSupplementalBackendDispatcher {\n" % dispatcher_name)
+ Generator.backend_dispatcher_interface_list.append("class %s %s FINAL : public Inspector::InspectorSupplementalBackendDispatcher {\n" % (INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["export_macro"], dispatcher_name))
Generator.backend_dispatcher_interface_list.append("public:\n")
Generator.backend_dispatcher_interface_list.append(" static PassRefPtr<%s> create(Inspector::InspectorBackendDispatcher*, %s*);\n" % (dispatcher_name, agent_interface_name))
Generator.backend_dispatcher_interface_list.append(" virtual void dispatch(long callId, const String& method, PassRefPtr<Inspector::InspectorObject> message) OVERRIDE;\n")
Generator.backend_dispatcher_interface_list.append("private:\n")
- Generator.backend_handler_interface_list.append("class %s {\n" % agent_interface_name)
+ Generator.backend_handler_interface_list.append("class %s %s {\n" % (INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["export_macro"], agent_interface_name))
Generator.backend_handler_interface_list.append("public:\n")
backend_method_count = len(Generator.backend_method_implementation_list)
@@ -2308,7 +2351,7 @@
def generate_all_domains_code(out, type_data_callback):
writer = Writer(out, "")
- for domain_data in type_map.domains():
+ for domain_data in type_map.domains_to_generate():
domain_fixes = DomainNameFixes.get_fixed_data(domain_data.name())
domain_guard = domain_fixes.get_guard()
@@ -2407,37 +2450,46 @@
Generator.go()
-backend_h_file = SmartOutput(output_header_dirname + "/InspectorBackendDispatchers.h")
-backend_cpp_file = SmartOutput(output_cpp_dirname + "/InspectorBackendDispatchers.cpp")
+output_file_name_prefix = INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["prefix"]
-frontend_h_file = SmartOutput(output_header_dirname + "/InspectorFrontend.h")
-frontend_cpp_file = SmartOutput(output_cpp_dirname + "/InspectorFrontend.cpp")
+backend_h_file = SmartOutput(output_header_dirname + ("/Inspector%sBackendDispatchers.h" % output_file_name_prefix))
+backend_cpp_file = SmartOutput(output_cpp_dirname + ("/Inspector%sBackendDispatchers.cpp" % output_file_name_prefix))
-typebuilder_h_file = SmartOutput(output_header_dirname + "/InspectorWebTypeBuilders.h")
-typebuilder_cpp_file = SmartOutput(output_cpp_dirname + "/InspectorWebTypeBuilders.cpp")
+frontend_h_file = SmartOutput(output_header_dirname + ("/Inspector%sFrontendDispatchers.h" % output_file_name_prefix))
+frontend_cpp_file = SmartOutput(output_cpp_dirname + ("/Inspector%sFrontendDispatchers.cpp" % output_file_name_prefix))
-backend_js_file = SmartOutput(output_js_dirname + "/InspectorBackendCommands.js")
+typebuilder_h_file = SmartOutput(output_header_dirname + ("/Inspector%sTypeBuilders.h" % output_file_name_prefix))
+typebuilder_cpp_file = SmartOutput(output_cpp_dirname + ("/Inspector%sTypeBuilders.cpp" % output_file_name_prefix))
+
+backend_js_file = SmartOutput(output_js_dirname + ("/Inspector%sBackendCommands.js" % output_file_name_prefix))
backend_h_file.write(Templates.backend_h.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
handlerInterfaces="".join(flatten_list(Generator.backend_handler_interface_list)),
dispatcherInterfaces="".join(flatten_list(Generator.backend_dispatcher_interface_list))))
backend_cpp_file.write(Templates.backend_cpp.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
methods="\n".join(Generator.backend_method_implementation_list)))
frontend_h_file.write(Templates.frontend_h.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
domainClassList="".join(Generator.frontend_domain_class_lines)))
frontend_cpp_file.write(Templates.frontend_cpp.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
methods="\n".join(Generator.frontend_method_list)))
typebuilder_h_file.write(Templates.typebuilder_h.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
+ typeBuilderDependencies=INSPECTOR_TYPES_GENERATOR_CONFIG_MAP[output_type]["typebuilder_dependency"],
typeBuilders="".join(flatten_list(Generator.type_builder_fragments)),
forwards="".join(Generator.type_builder_forwards),
validatorIfdefName=VALIDATOR_IFDEF_NAME))
typebuilder_cpp_file.write(Templates.typebuilder_cpp.substitute(None,
+ outputFileNamePrefix=output_file_name_prefix,
enumConstantValues=EnumConstants.get_enum_constant_code(),
implCode="".join(flatten_list(Generator.type_builder_impl_list)),
validatorCode="".join(flatten_list(Generator.validator_impl_list)),
diff --git a/Source/WebCore/inspector/CodeGeneratorInspectorStrings.py b/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py
similarity index 85%
rename from Source/WebCore/inspector/CodeGeneratorInspectorStrings.py
rename to Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py
index 01fe512..5d2fdb0 100644
--- a/Source/WebCore/inspector/CodeGeneratorInspectorStrings.py
+++ b/Source/JavaScriptCore/inspector/scripts/CodeGeneratorInspectorStrings.py
@@ -31,9 +31,9 @@
# Its syntax is a Python syntax subset, suitable for manual parsing.
frontend_domain_class = (
-"""class $domainClassName {
+"""class ${exportMacro} ${domainClassName} {
public:
- $domainClassName(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
+ ${domainClassName}(InspectorFrontendChannel* inspectorFrontendChannel) : m_inspectorFrontendChannel(inspectorFrontendChannel) { }
${frontendDomainMethodDeclarations}private:
InspectorFrontendChannel* m_inspectorFrontendChannel;
};
@@ -122,16 +122,16 @@
""")
frontend_h = (
-"""#ifndef InspectorFrontend_h
-#define InspectorFrontend_h
+"""#ifndef Inspector${outputFileNamePrefix}FrontendDispatchers_h
+#define Inspector${outputFileNamePrefix}FrontendDispatchers_h
-#include "InspectorWebTypeBuilders.h"
-#include "InspectorForwarding.h"
+#include "Inspector${outputFileNamePrefix}TypeBuilders.h"
+#include <inspector/InspectorFrontendChannel.h>
#include <inspector/InspectorValues.h>
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
-namespace WebCore {
+namespace Inspector {
#if ENABLE(INSPECTOR)
@@ -139,52 +139,48 @@
#endif // ENABLE(INSPECTOR)
-} // namespace WebCore
+} // namespace Inspector
-#endif // !defined(InspectorFrontend_h)
+#endif // !defined(Inspector${outputFileNamePrefix}FrontendDispatchers_h)
""")
backend_h = (
-"""#ifndef InspectorBackendDispatchers_h
-#define InspectorBackendDispatchers_h
+"""#ifndef Inspector${outputFileNamePrefix}BackendDispatchers_h
+#define Inspector${outputFileNamePrefix}BackendDispatchers_h
-#include "InspectorWebTypeBuilders.h"
+#include "Inspector${outputFileNamePrefix}TypeBuilders.h"
#include <inspector/InspectorBackendDispatcher.h>
#include <wtf/PassRefPtr.h>
#include <wtf/text/WTFString.h>
-namespace WebCore {
+namespace Inspector {
typedef String ErrorString;
$handlerInterfaces
$dispatcherInterfaces
-} // namespace WebCore
+} // namespace Inspector
-#endif // !defined(InspectorBackendDispatchers_h)
+#endif // !defined(Inspector${outputFileNamePrefix}BackendDispatchers_h)
""")
backend_cpp = (
"""
#include "config.h"
+#include "Inspector${outputFileNamePrefix}BackendDispatchers.h"
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-
-#include "InspectorAgent.h"
-#include "InspectorForwarding.h"
+#include <inspector/InspectorFrontendChannel.h>
#include <inspector/InspectorValues.h>
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-using namespace Inspector;
-
-namespace WebCore {
+namespace Inspector {
$methods
-} // namespace WebCore
+} // namespace Inspector
#endif // ENABLE(INSPECTOR)
""")
@@ -193,34 +189,31 @@
"""
#include "config.h"
+#include "Inspector${outputFileNamePrefix}FrontendDispatchers.h"
#if ENABLE(INSPECTOR)
-#include "InspectorFrontend.h"
-
#include <wtf/text/CString.h>
#include <wtf/text/WTFString.h>
-using namespace Inspector;
-
-namespace WebCore {
+namespace Inspector {
$methods
-} // namespace WebCore
+} // namespace Inspector
#endif // ENABLE(INSPECTOR)
""")
typebuilder_h = (
"""
-// FIXME: TYPE.
-#ifndef InspectorWebTypeBuilders_h
-#define InspectorWebTypeBuilders_h
+#ifndef Inspector${outputFileNamePrefix}TypeBuilders_h
+#define Inspector${outputFileNamePrefix}TypeBuilders_h
#if ENABLE(INSPECTOR)
#include <inspector/InspectorTypeBuilder.h>
+${typeBuilderDependencies}
#include <wtf/Assertions.h>
#include <wtf/PassRefPtr.h>
@@ -239,7 +232,7 @@
#endif // ENABLE(INSPECTOR)
-#endif // !defined(InspectorWebTypeBuilders_h)
+#endif // !defined(Inspector${outputFileNamePrefix}TypeBuilders_h)
""")
@@ -247,13 +240,12 @@
"""
#include "config.h"
+#include "Inspector${outputFileNamePrefix}TypeBuilders.h"
+
#if ENABLE(INSPECTOR)
-#include "InspectorWebTypeBuilders.h"
#include <wtf/text/CString.h>
-using namespace Inspector;
-
namespace Inspector {
namespace TypeBuilder {
diff --git a/Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py b/Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py
similarity index 100%
rename from Source/WebCore/inspector/Scripts/generate-combined-inspector-json.py
rename to Source/JavaScriptCore/inspector/scripts/generate-combined-inspector-json.py
diff --git a/Source/WebCore/CMakeLists.txt b/Source/WebCore/CMakeLists.txt
index 00a39ad..44d09aa 100644
--- a/Source/WebCore/CMakeLists.txt
+++ b/Source/WebCore/CMakeLists.txt
@@ -112,6 +112,7 @@
"${JAVASCRIPTCORE_DIR}/runtime"
"${JAVASCRIPTCORE_DIR}/yarr"
"${WTF_DIR}"
+ "${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}"
"${DERIVED_SOURCES_WEBCORE_DIR}"
"${CMAKE_SOURCE_DIR}/Source"
"${CMAKE_BINARY_DIR}"
@@ -750,6 +751,8 @@
${WebCore_SVG_IDL_FILES}
)
+set(WebCore_INSPECTOR_SCRIPTS_DIR "${JAVASCRIPTCORE_DIR}/inspector/scripts")
+
set(WebCore_INSPECTOR_DOMAINS
inspector/protocol/ApplicationCache.json
inspector/protocol/CSS.json
@@ -770,7 +773,6 @@
inspector/protocol/Network.json
inspector/protocol/Page.json
inspector/protocol/Profiler.json
- inspector/protocol/Runtime.json
inspector/protocol/Timeline.json
inspector/protocol/Worker.json
)
@@ -3038,22 +3040,27 @@
VERBATIM)
-# Generate Inspector.json
+# Generate InspectorWeb.json
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.json
- MAIN_DEPENDENCY ${WEBCORE_DIR}/inspector/Scripts/generate-combined-inspector-json.py
+ 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_DIR}/inspector/Scripts/generate-combined-inspector-json.py ${WEBCORE_DIR}/inspector/protocol > ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.json
+ COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/generate-combined-inspector-json.py ${WEBCORE_DIR}/inspector/protocol > ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
VERBATIM)
# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.pm
add_custom_command(
- OUTPUT ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatchers.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.h ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h
- MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.json
- DEPENDS ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.py ${WEBCORE_DIR}/inspector/CodeGeneratorInspectorStrings.py
- COMMAND ${PYTHON_EXECUTABLE} ${WEBCORE_DIR}/inspector/CodeGeneratorInspector.py ${DERIVED_SOURCES_WEBCORE_DIR}/Inspector.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --write_always
+ 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}/InspectorWebTypeBuilders.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.h
+ MAIN_DEPENDENCY ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json
+ DEPENDS ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspectorStrings.py ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJSTypeBuilders.h
+ COMMAND ${PYTHON_EXECUTABLE} ${WebCore_INSPECTOR_SCRIPTS_DIR}/CodeGeneratorInspector.py ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWeb.json ${DERIVED_SOURCES_JAVASCRIPTCORE_DIR}/InspectorJS.json --output_h_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_cpp_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_js_dir "${DERIVED_SOURCES_WEBCORE_DIR}" --output_type Web --write_always
VERBATIM)
-list(APPEND WebCore_SOURCES ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorBackendDispatchers.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorFrontend.cpp ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp)
+
+list(APPEND WebCore_SOURCES
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebBackendDispatchers.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebFrontendDispatchers.cpp
+ ${DERIVED_SOURCES_WEBCORE_DIR}/InspectorWebTypeBuilders.cpp
+)
# Generate InspectorOverlayPage.h
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 38334f0..fdc382b 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,88 @@
+2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Inspector Code Generation to JavaScriptCore for Runtime Domain
+ https://bugs.webkit.org/show_bug.cgi?id=125595
+
+ Reviewed by Timothy Hatcher.
+
+ - CodeGeneration changed to output Frontend and Backend dispatchers
+ in namespace Inspector. So update all the agent's appropriately.
+ - Update Derived Sources code generation to use the Scripts that had
+ moved to JavaScriptCore. Some ports just use JSC/inspector/scripts
+ directly, but others have to use the Scripts exported by JSC
+ in JavaScriptCore's PrivateHeaders.
+ - Add ForwardingHeaders for the files generated in JavaScriptCore.
+ - Update the names of Inspector DerivedSources files, since they
+ were renamed to InspectorWeb*.
+
+ No new tests, this only moves code around. There are no functional changes.
+
+ * CMakeLists.txt:
+ * DerivedSources.make:
+ * ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h: Added.
+ * ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h: Added.
+ * ForwardingHeaders/inspector/InspectorJSTypeBuilders.h: Added.
+ * GNUmakefile.am:
+ * GNUmakefile.list.am:
+ * WebCore.vcxproj/WebCore.vcxproj:
+ * WebCore.vcxproj/WebCore.vcxproj.filters:
+ * WebCore.vcxproj/build-generated-files.sh:
+ * WebCore.xcodeproj/project.pbxproj:
+ Remove files, rename files, update code generation.
+
+ * make-generated-sources.sh:
+ Update this standalone developer script to fill in the new InspectorScripts variable.
+
+ * inspector/ConsoleMessage.h:
+ * inspector/InjectedScriptHost.cpp:
+ * inspector/InspectorAgent.cpp:
+ * inspector/InspectorAgent.h:
+ * inspector/InspectorApplicationCacheAgent.cpp:
+ * inspector/InspectorApplicationCacheAgent.h:
+ * inspector/InspectorCSSAgent.h:
+ * inspector/InspectorCanvasAgent.cpp:
+ * inspector/InspectorCanvasAgent.h:
+ * inspector/InspectorConsoleAgent.cpp:
+ * inspector/InspectorConsoleAgent.h:
+ * inspector/InspectorController.cpp:
+ * inspector/InspectorDOMAgent.cpp:
+ * 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/InspectorDebuggerAgent.cpp:
+ * inspector/InspectorDebuggerAgent.h:
+ * inspector/InspectorFrontendClientLocal.cpp:
+ * inspector/InspectorHeapProfilerAgent.h:
+ * inspector/InspectorIndexedDBAgent.cpp:
+ * inspector/InspectorIndexedDBAgent.h:
+ * inspector/InspectorInputAgent.h:
+ * inspector/InspectorLayerTreeAgent.cpp:
+ * inspector/InspectorLayerTreeAgent.h:
+ * inspector/InspectorMemoryAgent.cpp:
+ * inspector/InspectorMemoryAgent.h:
+ * inspector/InspectorPageAgent.cpp:
+ * inspector/InspectorPageAgent.h:
+ * inspector/InspectorProfilerAgent.cpp:
+ * inspector/InspectorProfilerAgent.h:
+ * inspector/InspectorResourceAgent.cpp:
+ * inspector/InspectorResourceAgent.h:
+ * inspector/InspectorRuntimeAgent.h:
+ * inspector/InspectorTimelineAgent.cpp:
+ * inspector/InspectorTimelineAgent.h:
+ * inspector/InspectorWorkerAgent.cpp:
+ * inspector/InspectorWorkerAgent.h:
+ * inspector/PageRuntimeAgent.h:
+ * inspector/ScriptCallFrame.cpp:
+ * inspector/WorkerInspectorController.cpp:
+ * inspector/WorkerRuntimeAgent.h:
+ Updates header names and class namespace changes.
+
2013-12-13 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
Adding RTCPeerConnectionErrorCallback
diff --git a/Source/WebCore/DerivedSources.make b/Source/WebCore/DerivedSources.make
index f017b7f..bb1677c 100644
--- a/Source/WebCore/DerivedSources.make
+++ b/Source/WebCore/DerivedSources.make
@@ -661,31 +661,6 @@
InternalSettingsGenerated.idl
#
-INSPECTOR_DOMAINS = \
- $(WebCore)/inspector/protocol/ApplicationCache.json \
- $(WebCore)/inspector/protocol/CSS.json \
- $(WebCore)/inspector/protocol/Canvas.json \
- $(WebCore)/inspector/protocol/Console.json \
- $(WebCore)/inspector/protocol/DOM.json \
- $(WebCore)/inspector/protocol/DOMDebugger.json \
- $(WebCore)/inspector/protocol/DOMStorage.json \
- $(WebCore)/inspector/protocol/Database.json \
- $(WebCore)/inspector/protocol/Debugger.json \
- $(WebCore)/inspector/protocol/FileSystem.json \
- $(WebCore)/inspector/protocol/HeapProfiler.json \
- $(WebCore)/inspector/protocol/IndexedDB.json \
- $(WebCore)/inspector/protocol/Input.json \
- $(WebCore)/inspector/protocol/InspectorDomain.json \
- $(WebCore)/inspector/protocol/LayerTree.json \
- $(WebCore)/inspector/protocol/Memory.json \
- $(WebCore)/inspector/protocol/Network.json \
- $(WebCore)/inspector/protocol/Page.json \
- $(WebCore)/inspector/protocol/Profiler.json \
- $(WebCore)/inspector/protocol/Runtime.json \
- $(WebCore)/inspector/protocol/Timeline.json \
- $(WebCore)/inspector/protocol/Worker.json
-#
-
.PHONY : all
DOM_CLASSES=$(basename $(notdir $(BINDING_IDLS)))
@@ -1093,17 +1068,44 @@
# Inspector interfaces generator
-all : Inspector.json
+INSPECTOR_DOMAINS = \
+ $(WebCore)/inspector/protocol/ApplicationCache.json \
+ $(WebCore)/inspector/protocol/CSS.json \
+ $(WebCore)/inspector/protocol/Canvas.json \
+ $(WebCore)/inspector/protocol/Console.json \
+ $(WebCore)/inspector/protocol/DOM.json \
+ $(WebCore)/inspector/protocol/DOMDebugger.json \
+ $(WebCore)/inspector/protocol/DOMStorage.json \
+ $(WebCore)/inspector/protocol/Database.json \
+ $(WebCore)/inspector/protocol/Debugger.json \
+ $(WebCore)/inspector/protocol/FileSystem.json \
+ $(WebCore)/inspector/protocol/HeapProfiler.json \
+ $(WebCore)/inspector/protocol/IndexedDB.json \
+ $(WebCore)/inspector/protocol/Input.json \
+ $(WebCore)/inspector/protocol/InspectorDomain.json \
+ $(WebCore)/inspector/protocol/LayerTree.json \
+ $(WebCore)/inspector/protocol/Memory.json \
+ $(WebCore)/inspector/protocol/Network.json \
+ $(WebCore)/inspector/protocol/Page.json \
+ $(WebCore)/inspector/protocol/Profiler.json \
+ $(WebCore)/inspector/protocol/Timeline.json \
+ $(WebCore)/inspector/protocol/Worker.json \
+#
-Inspector.json : inspector/Scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
- python $(WebCore)/inspector/Scripts/generate-combined-inspector-json.py "$(WebCore)/inspector/protocol" > ./Inspector.json
+INSPECTOR_GENERATOR_SCRIPTS = \
+ $(InspectorScripts)/CodeGeneratorInspector.py \
+ $(InspectorScripts)/CodeGeneratorInspectorStrings.py \
+#
-all : InspectorFrontend.h
+all : InspectorWeb.json
-INSPECTOR_GENERATOR_SCRIPTS = inspector/CodeGeneratorInspector.py inspector/CodeGeneratorInspectorStrings.py
+InspectorWeb.json : $(InspectorScripts)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
+ python $(InspectorScripts)/generate-combined-inspector-json.py $(WebCore)/inspector/protocol > ./InspectorWeb.json
-InspectorFrontend.h : Inspector.json $(INSPECTOR_GENERATOR_SCRIPTS)
- python $(WebCore)/inspector/CodeGeneratorInspector.py ./Inspector.json --output_h_dir . --output_cpp_dir . --output_js_dir .
+all : InspectorWebFrontendDispatchers.h
+
+InspectorWebFrontendDispatchers.h : InspectorWeb.json $(InspectorScripts)/InspectorJS.json $(INSPECTOR_GENERATOR_SCRIPTS)
+ python $(InspectorScripts)/CodeGeneratorInspector.py ./InspectorWeb.json $(InspectorScripts)/InspectorJS.json --output_h_dir . --output_cpp_dir . --output_js_dir . --output_type Web
all : InspectorOverlayPage.h
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h
new file mode 100644
index 0000000..d668187
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSBackendDispatchers.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorJSBackendDispatchers_h
+#define WebCore_FWD_InspectorJSBackendDispatchers_h
+#include <JavaScriptCore/InspectorJSBackendDispatchers.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h
new file mode 100644
index 0000000..69767b0
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSFrontendDispatchers.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorJSFrontendDispatchers_h
+#define WebCore_FWD_InspectorJSFrontendDispatchers_h
+#include <JavaScriptCore/InspectorJSFrontendDispatchers.h>
+#endif
diff --git a/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h
new file mode 100644
index 0000000..fb9494e
--- /dev/null
+++ b/Source/WebCore/ForwardingHeaders/inspector/InspectorJSTypeBuilders.h
@@ -0,0 +1,4 @@
+#ifndef WebCore_FWD_InspectorJSTypeBuilders_h
+#define WebCore_FWD_InspectorJSTypeBuilders_h
+#include <JavaScriptCore/InspectorJSTypeBuilders.h>
+#endif
diff --git a/Source/WebCore/GNUmakefile.am b/Source/WebCore/GNUmakefile.am
index c262ad7..eab69b6 100644
--- a/Source/WebCore/GNUmakefile.am
+++ b/Source/WebCore/GNUmakefile.am
@@ -333,6 +333,8 @@
DerivedSources/WebCore/InternalSettingsGenerated.idl
+INSPECTOR_SCRIPTS_DIR := $(JavaScriptCore)/inspector/scripts
+
INSPECTOR_DOMAINS := \
$(WebCore)/inspector/protocol/ApplicationCache.json \
$(WebCore)/inspector/protocol/CSS.json \
@@ -353,22 +355,21 @@
$(WebCore)/inspector/protocol/Network.json \
$(WebCore)/inspector/protocol/Page.json \
$(WebCore)/inspector/protocol/Profiler.json \
- $(WebCore)/inspector/protocol/Runtime.json \
$(WebCore)/inspector/protocol/Timeline.json \
$(WebCore)/inspector/protocol/Worker.json
-DerivedSources/WebCore/Inspector.json: $(WebCore)/inspector/Scripts/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
- $(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/Scripts/generate-combined-inspector-json.py $(WebCore)/inspector/protocol > $(GENSOURCES_WEBCORE)/Inspector.json
+DerivedSources/WebCore/InspectorWeb.json: $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(INSPECTOR_DOMAINS)
+ $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/generate-combined-inspector-json.py $(WebCore)/inspector/protocol > $(GENSOURCES_WEBCORE)/InspectorWeb.json
# All Web Inspector generated files are created with this one call to CodeGeneratorInspector.py
-DerivedSources/WebCore/InspectorBackendDispatchers.cpp: DerivedSources/WebCore/Inspector.json $(WebCore)/inspector/CodeGeneratorInspector.py $(WebCore)/inspector/CodeGeneratorInspectorStrings.py
- $(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/CodeGeneratorInspector.py $< --output_h_dir $(GENSOURCES_WEBCORE) --output_cpp_dir $(GENSOURCES_WEBCORE) --output_js_dir $(GENSOURCES_WEBCORE)
+DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp: $(GENSOURCES_WEBCORE)/InspectorWeb.json $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspectorStrings.py $(GENSOURCES_JAVASCRIPTCORE)/InspectorJSTypeBuilders.h
+ $(AM_V_GEN)$(PYTHON) $(INSPECTOR_SCRIPTS_DIR)/CodeGeneratorInspector.py $(GENSOURCES_WEBCORE)/InspectorWeb.json $(GENSOURCES_JAVASCRIPTCORE)/InspectorJS.json --output_h_dir $(GENSOURCES_WEBCORE) --output_cpp_dir $(GENSOURCES_WEBCORE) --output_js_dir $(GENSOURCES_WEBCORE) --output_type Web
DerivedSources/WebCore/InspectorWebTypeBuilders.h: DerivedSources/WebCore/InspectorWebTypeBuilders.cpp
-DerivedSources/WebCore/InspectorWebTypeBuilders.cpp: DerivedSources/WebCore/InspectorFrontend.h
-DerivedSources/WebCore/InspectorFrontend.h: DerivedSources/WebCore/InspectorFrontend.cpp
-DerivedSources/WebCore/InspectorFrontend.cpp: DerivedSources/WebCore/InspectorBackendCommands.js
-DerivedSources/WebCore/InspectorBackendCommands.js: DerivedSources/WebCore/InspectorBackendDispatchers.h
-DerivedSources/WebCore/InspectorBackendDispatchers.h: DerivedSources/WebCore/InspectorBackendDispatchers.cpp
+DerivedSources/WebCore/InspectorWebTypeBuilders.cpp: DerivedSources/WebCore/InspectorWebFrontendDispatchers.h
+DerivedSources/WebCore/InspectorWebFrontendDispatchers.h: DerivedSources/WebCore/InspectorWebFrontendDispatchers.cpp
+DerivedSources/WebCore/InspectorWebFrontendDispatchers.cpp: DerivedSources/WebCore/InspectorWebBackendCommands.js
+DerivedSources/WebCore/InspectorWebBackendCommands.js: DerivedSources/WebCore/InspectorWebBackendDispatchers.h
+DerivedSources/WebCore/InspectorWebBackendDispatchers.h: DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp
DerivedSources/WebCore/InspectorOverlayPage.h: $(WebCore)/inspector/InspectorOverlayPage.html $(WebCore)/inspector/InspectorOverlayPage.css $(WebCore)/inspector/InspectorOverlayPage.js
$(AM_V_GEN)$(PYTHON) $(WebCore)/inspector/Scripts/inline-and-minify-stylesheets-and-scripts.py $(WebCore)/inspector/InspectorOverlayPage.html $(GENSOURCES_WEBCORE)/InspectorOverlayPage.combined.html
diff --git a/Source/WebCore/GNUmakefile.list.am b/Source/WebCore/GNUmakefile.list.am
index f656dce..60b370c 100644
--- a/Source/WebCore/GNUmakefile.list.am
+++ b/Source/WebCore/GNUmakefile.list.am
@@ -21,11 +21,11 @@
DerivedSources/WebCore/HTMLNames.h \
DerivedSources/WebCore/InjectedScriptCanvasModuleSource.h \
DerivedSources/WebCore/InjectedScriptSource.h \
- DerivedSources/WebCore/InspectorBackendDispatchers.cpp \
- DerivedSources/WebCore/InspectorBackendDispatchers.h \
- DerivedSources/WebCore/InspectorFrontend.cpp \
- DerivedSources/WebCore/InspectorFrontend.h \
DerivedSources/WebCore/InspectorOverlayPage.h \
+ DerivedSources/WebCore/InspectorWebBackendDispatchers.cpp \
+ DerivedSources/WebCore/InspectorWebBackendDispatchers.h \
+ DerivedSources/WebCore/InspectorWebFrontendDispatchers.cpp \
+ DerivedSources/WebCore/InspectorWebFrontendDispatchers.h \
DerivedSources/WebCore/InspectorWebTypeBuilders.cpp \
DerivedSources/WebCore/InspectorWebTypeBuilders.h \
DerivedSources/WebCore/JSAbstractWorker.cpp \
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
index e4563ad..c06947e 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj
@@ -746,8 +746,8 @@
<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\InspectorBackendDispatchers.cpp" />
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontend.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\InspectorWebTypeBuilders.cpp" />
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.cpp">
<ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">true</ExcludedFromBuild>
@@ -18081,9 +18081,9 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptCanvasModuleSource.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptSource.h" />
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.h" />
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontend.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\InspectorWebTypeBuilders.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\WebCore\DerivedSources\JSAbstractWorker.h" />
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\JSAttr.h" />
@@ -18566,6 +18566,9 @@
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorAgentRegistry.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorBackendDispatcher.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h" />
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h" />
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorValues.h" />
<ClInclude Include="..\ForwardingHeaders\masm\X86Assembler.h" />
@@ -21052,4 +21055,4 @@
<ImportGroup Label="ExtensionTargets">
<Import Project="$(VCTargetsPath)\BuildCustomizations\masm.targets" />
</ImportGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
index a9935e7..4add0f2 100644
--- a/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
+++ b/Source/WebCore/WebCore.vcxproj/WebCore.vcxproj.filters
@@ -5272,10 +5272,10 @@
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\HTMLNames.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebBackendDispatchers.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
- <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontend.cpp">
+ <ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebFrontendDispatchers.cpp">
<Filter>DerivedSources</Filter>
</ClCompile>
<ClCompile Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorWebTypeBuilders.cpp">
@@ -12248,6 +12248,15 @@
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorFrontendChannel.h">
<Filter>ForwardingHeaders\inspector</Filter>
</ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSBackendDispatchers.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSFrontendDispatchers.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
+ <ClInclude Include="..\ForwardingHeaders\inspector\InspectorJSTypeBuilders.h">
+ <Filter>ForwardingHeaders\inspector</Filter>
+ </ClInclude>
<ClInclude Include="..\ForwardingHeaders\inspector\InspectorTypeBuilder.h">
<Filter>ForwardingHeaders\inspector</Filter>
</ClInclude>
@@ -13069,15 +13078,15 @@
<ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InjectedScriptSource.h">
<Filter>DerivedSources</Filter>
</ClInclude>
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorBackendDispatchers.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
- <ClInclude Include="$(ConfigurationBuildDir)\obj$(PlatformArchitecture)\$(ProjectName)\DerivedSources\InspectorFrontend.h">
- <Filter>DerivedSources</Filter>
- </ClInclude>
<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\InspectorWebTypeBuilders.h">
<Filter>DerivedSources</Filter>
</ClInclude>
@@ -15188,4 +15197,4 @@
<Filter>platform\win</Filter>
</MASM>
</ItemGroup>
-</Project>
\ No newline at end of file
+</Project>
diff --git a/Source/WebCore/WebCore.vcxproj/build-generated-files.sh b/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
old mode 100644
new mode 100755
index a153920..0de20fc
--- a/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
+++ b/Source/WebCore/WebCore.vcxproj/build-generated-files.sh
@@ -60,4 +60,6 @@
export WebCore="${XSRCROOT}"
export FEATURE_DEFINES=`$SDKROOT/tools/scripts/feature-defines.sh $SDKROOT $3`
+export InspectorScripts="$XDSTROOT/include/private/JavaScriptCore"
+
make -f "$WebCore/DerivedSources.make" -j ${NUMCPUS} || exit 1
diff --git a/Source/WebCore/WebCore.xcodeproj/project.pbxproj b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
index c727af2..b0f2d49 100644
--- a/Source/WebCore/WebCore.xcodeproj/project.pbxproj
+++ b/Source/WebCore/WebCore.xcodeproj/project.pbxproj
@@ -1608,11 +1608,11 @@
4F1534E011B533020021FD86 /* EditingBehaviorTypes.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */; settings = {ATTRIBUTES = (Private, ); }; };
4F2D205412EAE7B3005C2874 /* InspectorAgent.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F2D205212EAE7B3005C2874 /* InspectorAgent.h */; settings = {ATTRIBUTES = (Private, ); }; };
4F2D205512EAE7B3005C2874 /* InspectorAgent.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F2D205312EAE7B3005C2874 /* InspectorAgent.cpp */; };
- 4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */; };
+ 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 */; };
- 4F707A9911EF679400ACDA69 /* InspectorBackendDispatchers.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4F707A9711EF679400ACDA69 /* InspectorBackendDispatchers.cpp */; };
- 4F707A9A11EF679400ACDA69 /* InspectorBackendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F707A9811EF679400ACDA69 /* InspectorBackendDispatchers.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 */; };
@@ -1896,7 +1896,7 @@
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 /* InspectorWebTypeBuilders.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */; };
- 578DA20E1520EB8C006141C1 /* InspectorFrontend.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */; settings = {ATTRIBUTES = (Private, ); }; };
+ 578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */ = {isa = PBXBuildFile; fileRef = 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */; settings = {ATTRIBUTES = (Private, ); }; };
578DA20F1520EBA3006141C1 /* InspectorWebTypeBuilders.h in Headers */ = {isa = PBXBuildFile; fileRef = 573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.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, ); }; };
@@ -8353,12 +8353,12 @@
4F1534DF11B533020021FD86 /* EditingBehaviorTypes.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EditingBehaviorTypes.h; sourceTree = "<group>"; };
4F2D205212EAE7B3005C2874 /* InspectorAgent.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorAgent.h; sourceTree = "<group>"; };
4F2D205312EAE7B3005C2874 /* InspectorAgent.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorAgent.cpp; sourceTree = "<group>"; };
- 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorFrontend.cpp; sourceTree = "<group>"; };
- 4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorFrontend.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 /* InspectorBackendDispatchers.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = InspectorBackendDispatchers.cpp; sourceTree = "<group>"; };
- 4F707A9811EF679400ACDA69 /* InspectorBackendDispatchers.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = InspectorBackendDispatchers.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>"; };
@@ -10355,8 +10355,6 @@
A5732B08136A161D005C8D7C /* DateComponents.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DateComponents.cpp; sourceTree = "<group>"; };
A5732B09136A161D005C8D7C /* DateComponents.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DateComponents.h; sourceTree = "<group>"; };
A593CF7218402CE900BFCE27 /* protocol */ = {isa = PBXFileReference; lastKnownFileType = folder; path = protocol; sourceTree = "<group>"; };
- A593CF7318402D4B00BFCE27 /* CodeGeneratorInspector.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = CodeGeneratorInspector.py; sourceTree = "<group>"; };
- A593CF7418402D4B00BFCE27 /* CodeGeneratorInspectorStrings.py */ = {isa = PBXFileReference; lastKnownFileType = text.script.python; path = CodeGeneratorInspectorStrings.py; sourceTree = "<group>"; };
A593CF7518402D4B00BFCE27 /* combine-javascript-resources.pl */ = {isa = PBXFileReference; lastKnownFileType = text.script.perl; path = "combine-javascript-resources.pl"; 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>"; };
@@ -14458,10 +14456,10 @@
children = (
AA912750157E35A500454E54 /* InjectedScriptCanvasModuleSource.h */,
7A563E5412DE32B000F4536D /* InjectedScriptSource.h */,
- 4F707A9711EF679400ACDA69 /* InspectorBackendDispatchers.cpp */,
- 4F707A9811EF679400ACDA69 /* InspectorBackendDispatchers.h */,
- 4F4F5FFA11CBD2D200A186BF /* InspectorFrontend.cpp */,
- 4F4F5FFC11CBD30100A186BF /* InspectorFrontend.h */,
+ 4F707A9711EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp */,
+ 4F707A9811EF679400ACDA69 /* InspectorWebBackendDispatchers.h */,
+ 4F4F5FFA11CBD2D200A186BF /* InspectorWebFrontendDispatchers.cpp */,
+ 4F4F5FFC11CBD30100A186BF /* InspectorWebFrontendDispatchers.h */,
573D134514CE39FF0057ABCA /* InspectorWebTypeBuilders.cpp */,
573D134614CE39FF0057ABCA /* InspectorWebTypeBuilders.h */,
7A0E76D810BF059800A0276E /* JSInjectedScriptHost.cpp */,
@@ -14483,8 +14481,6 @@
children = (
A593CF7218402CE900BFCE27 /* protocol */,
A518225317E28CF100A9BA1D /* Scripts */,
- A593CF7318402D4B00BFCE27 /* CodeGeneratorInspector.py */,
- A593CF7418402D4B00BFCE27 /* CodeGeneratorInspectorStrings.py */,
A593CF7518402D4B00BFCE27 /* combine-javascript-resources.pl */,
F35AE5AB14925F5B004D5776 /* BindingVisitors.h */,
2DF2E9D4166E39740035BEF2 /* ConsoleAPITypes.h */,
@@ -23408,7 +23404,7 @@
93309DF2099E64920056E581 /* InsertTextCommand.h in Headers */,
4F2D205412EAE7B3005C2874 /* InspectorAgent.h in Headers */,
B885E8D511E06DD2009FFBF4 /* InspectorApplicationCacheAgent.h in Headers */,
- 4F707A9A11EF679400ACDA69 /* InspectorBackendDispatchers.h in Headers */,
+ 4F707A9A11EF679400ACDA69 /* InspectorWebBackendDispatchers.h in Headers */,
AAD766EC157E502F00E85423 /* InspectorCanvasAgent.h in Headers */,
AAD766ED157E502F00E85423 /* InspectorCanvasInstrumentation.h in Headers */,
1C81B95C0E97330800266E07 /* InspectorClient.h in Headers */,
@@ -23427,7 +23423,7 @@
F3D4C47912E07663003DA150 /* InspectorDOMDebuggerAgent.h in Headers */,
7A74ECBB101839A600BF939E /* InspectorDOMStorageAgent.h in Headers */,
0705853417FDE6D9005F2BCB /* JSMediaTrackConstraints.h in Headers */,
- 578DA20E1520EB8C006141C1 /* InspectorFrontend.h in Headers */,
+ 578DA20E1520EB8C006141C1 /* InspectorWebFrontendDispatchers.h in Headers */,
227777601345DEA9008EA455 /* InspectorForwarding.h in Headers */,
F344C7141125B82C00F26EEE /* InspectorFrontendClient.h in Headers */,
F344C75311294D9D00F26EEE /* InspectorFrontendClientLocal.h in Headers */,
@@ -25674,7 +25670,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\n\nif [ ! $CC ]; then\n export CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\n export GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=\"${SDKROOT}\"\nfi\n";
+ shellScript = "mkdir -p \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\ncd \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore\"\n\n/bin/ln -sfh \"${SRCROOT}\" WebCore\nexport WebCore=\"WebCore\"\nexport InspectorScripts=\"${JAVASCRIPTCORE_PRIVATE_HEADERS_DIR}\"\n\nif [ ! $CC ]; then\n export CC=\"`xcrun -find clang`\"\nfi\n\nif [ ! $GPERF ]; then\n export GPERF=\"`xcrun -find gperf`\"\nfi\n\nif [ \"${ACTION}\" = \"build\" -o \"${ACTION}\" = \"install\" -o \"${ACTION}\" = \"installhdrs\" ]; then\n make --no-builtin-rules -f \"WebCore/DerivedSources.make\" -j `/usr/sbin/sysctl -n hw.activecpu` SDKROOT=\"${SDKROOT}\"\nfi\n";
};
/* End PBXShellScriptBuildPhase section */
@@ -26670,7 +26666,7 @@
93309DF1099E64920056E581 /* InsertTextCommand.cpp in Sources */,
4F2D205512EAE7B3005C2874 /* InspectorAgent.cpp in Sources */,
B885E8D411E06DD2009FFBF4 /* InspectorApplicationCacheAgent.cpp in Sources */,
- 4F707A9911EF679400ACDA69 /* InspectorBackendDispatchers.cpp in Sources */,
+ 4F707A9911EF679400ACDA69 /* InspectorWebBackendDispatchers.cpp in Sources */,
E1F80B8A183172A2007885C3 /* JSCryptoKeyPairCustom.cpp in Sources */,
AAD766EB157E502F00E85423 /* InspectorCanvasAgent.cpp in Sources */,
7A1F2B52126C61B20006A7E6 /* InspectorClient.cpp in Sources */,
@@ -26685,7 +26681,7 @@
7A24587B1021EAF4000A00AA /* InspectorDOMAgent.cpp in Sources */,
F3D4C47812E07663003DA150 /* InspectorDOMDebuggerAgent.cpp in Sources */,
7A74ECBA101839A600BF939E /* InspectorDOMStorageAgent.cpp in Sources */,
- 4F4F5FFB11CBD2E100A186BF /* InspectorFrontend.cpp in Sources */,
+ 4F4F5FFB11CBD2E100A186BF /* InspectorWebFrontendDispatchers.cpp in Sources */,
F344C75811294FF600F26EEE /* InspectorFrontendClientLocal.cpp in Sources */,
7A0E770E10C00A8800A0276E /* InspectorFrontendHost.cpp in Sources */,
5112935F3D54B4B52FAF973F /* InspectorHeapProfilerAgent.cpp in Sources */,
diff --git a/Source/WebCore/inspector/ConsoleMessage.h b/Source/WebCore/inspector/ConsoleMessage.h
index 7fd16fc..16ccf1e 100644
--- a/Source/WebCore/inspector/ConsoleMessage.h
+++ b/Source/WebCore/inspector/ConsoleMessage.h
@@ -33,7 +33,7 @@
#include "ConsoleAPITypes.h"
#include "ConsoleTypes.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "ScriptState.h"
#include <wtf/Forward.h>
#include <wtf/Vector.h>
@@ -59,8 +59,8 @@
ConsoleMessage(bool canGenerateCallStack, MessageSource, MessageType, MessageLevel, const String& message, PassRefPtr<ScriptArguments>, JSC::ExecState*, unsigned long requestIdentifier = 0);
~ConsoleMessage();
- void addToFrontend(InspectorConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
- void updateRepeatCountInConsole(InspectorConsoleFrontendDispatcher*);
+ void addToFrontend(Inspector::InspectorConsoleFrontendDispatcher*, InjectedScriptManager*, bool generatePreview);
+ void updateRepeatCountInConsole(Inspector::InspectorConsoleFrontendDispatcher*);
void incrementCount() { ++m_repeatCount; }
bool isEqual(ConsoleMessage* msg) const;
diff --git a/Source/WebCore/inspector/InjectedScriptHost.cpp b/Source/WebCore/inspector/InjectedScriptHost.cpp
index 5467575..adc4245 100644
--- a/Source/WebCore/inspector/InjectedScriptHost.cpp
+++ b/Source/WebCore/inspector/InjectedScriptHost.cpp
@@ -46,7 +46,7 @@
#include "InspectorDOMStorageAgent.h"
#include "InspectorDatabaseAgent.h"
#include "InspectorDebuggerAgent.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "Pasteboard.h"
#include "Storage.h"
#include "markup.h"
diff --git a/Source/WebCore/inspector/InspectorAgent.cpp b/Source/WebCore/inspector/InspectorAgent.cpp
index 194b779..1d5137b 100644
--- a/Source/WebCore/inspector/InspectorAgent.cpp
+++ b/Source/WebCore/inspector/InspectorAgent.cpp
@@ -40,8 +40,8 @@
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
#include "InspectorController.h"
-#include "InspectorFrontend.h"
#include "InspectorInstrumentation.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
#include "Page.h"
diff --git a/Source/WebCore/inspector/InspectorAgent.h b/Source/WebCore/inspector/InspectorAgent.h
index 1cea7c2..00ac015 100644
--- a/Source/WebCore/inspector/InspectorAgent.h
+++ b/Source/WebCore/inspector/InspectorAgent.h
@@ -30,8 +30,8 @@
#ifndef InspectorAgent_h
#define InspectorAgent_h
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
@@ -39,6 +39,7 @@
namespace Inspector {
class InspectorObject;
+class InspectorInspectorFrontendDispatcher;
}
namespace WebCore {
@@ -47,13 +48,12 @@
class DocumentLoader;
class Frame;
class InjectedScriptManager;
-class InspectorInspectorFrontendDispatcher;
class InstrumentingAgents;
class Page;
typedef String ErrorString;
-class InspectorAgent : public InspectorAgentBase, public InspectorInspectorBackendDispatcherHandler {
+class InspectorAgent : public InspectorAgentBase, public Inspector::InspectorInspectorBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorAgent);
public:
static PassOwnPtr<InspectorAgent> create(Page* page, InjectedScriptManager* injectedScriptManager, InstrumentingAgents* instrumentingAgents)
@@ -90,8 +90,8 @@
InspectorAgent(Page*, InjectedScriptManager*, InstrumentingAgents*);
Page* m_inspectedPage;
- std::unique_ptr<InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorInspectorBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorInspectorFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorInspectorBackendDispatcher> m_backendDispatcher;
InjectedScriptManager* m_injectedScriptManager;
Vector<pair<long, String>> m_pendingEvaluateTestCommands;
diff --git a/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp b/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
index 6d7d805..83557f9 100644
--- a/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
+++ b/Source/WebCore/inspector/InspectorApplicationCacheAgent.cpp
@@ -34,8 +34,8 @@
#include "Frame.h"
#include "FrameLoader.h"
#include "InspectorAgent.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "NetworkStateNotifier.h"
#include "Page.h"
diff --git a/Source/WebCore/inspector/InspectorApplicationCacheAgent.h b/Source/WebCore/inspector/InspectorApplicationCacheAgent.h
index 8211a36..6e49fc4 100644
--- a/Source/WebCore/inspector/InspectorApplicationCacheAgent.h
+++ b/Source/WebCore/inspector/InspectorApplicationCacheAgent.h
@@ -28,13 +28,14 @@
#if ENABLE(INSPECTOR)
#include "ApplicationCacheHost.h"
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
namespace Inspector {
+class InspectorApplicationCacheFrontendDispatcher;
class InspectorObject;
class InspectorValue;
}
@@ -43,7 +44,6 @@
class Frame;
class InspectorAgent;
-class InspectorApplicationCacheFrontendDispatcher;
class InspectorPageAgent;
class InstrumentingAgents;
class Page;
@@ -51,7 +51,7 @@
typedef String ErrorString;
-class InspectorApplicationCacheAgent : public InspectorAgentBase, public InspectorApplicationCacheBackendDispatcherHandler {
+class InspectorApplicationCacheAgent : public InspectorAgentBase, public Inspector::InspectorApplicationCacheBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorApplicationCacheAgent); WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<InspectorApplicationCacheAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
@@ -80,8 +80,8 @@
DocumentLoader* assertFrameWithDocumentLoader(ErrorString*, String frameId);
InspectorPageAgent* m_pageAgent;
- std::unique_ptr<InspectorApplicationCacheFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorApplicationCacheBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorApplicationCacheFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorApplicationCacheBackendDispatcher> m_backendDispatcher;
};
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorCSSAgent.h b/Source/WebCore/inspector/InspectorCSSAgent.h
index a16fec8..1d72c9f 100644
--- a/Source/WebCore/inspector/InspectorCSSAgent.h
+++ b/Source/WebCore/inspector/InspectorCSSAgent.h
@@ -27,10 +27,10 @@
#include "CSSSelector.h"
#include "ContentSecurityPolicy.h"
-#include "InspectorBackendDispatchers.h"
#include "InspectorDOMAgent.h"
#include "InspectorStyleSheet.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include "SecurityContext.h"
#include <inspector/InspectorValues.h>
#include <wtf/HashMap.h>
@@ -39,6 +39,10 @@
#include <wtf/RefPtr.h>
#include <wtf/text/WTFString.h>
+namespace Inspector {
+class InspectorCSSFrontendDispatcher;
+}
+
namespace WebCore {
class CSSRule;
@@ -50,7 +54,6 @@
class DocumentStyleSheetCollection;
class Element;
class InspectorCSSOMWrappers;
-class InspectorCSSFrontendDispatcher;
class InstrumentingAgents;
class NameNodeMap;
class Node;
@@ -66,7 +69,7 @@
class InspectorCSSAgent
: public InspectorAgentBase
, public InspectorDOMAgent::DOMListener
- , public InspectorCSSBackendDispatcherHandler
+ , public Inspector::InspectorCSSBackendDispatcherHandler
, public InspectorStyleSheet::Listener {
WTF_MAKE_NONCOPYABLE(InspectorCSSAgent);
public:
@@ -183,8 +186,8 @@
void resetPseudoStates();
- std::unique_ptr<InspectorCSSFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorCSSBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorCSSFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorCSSBackendDispatcher> m_backendDispatcher;
InspectorDOMAgent* m_domAgent;
IdToInspectorStyleSheet m_idToInspectorStyleSheet;
diff --git a/Source/WebCore/inspector/InspectorCanvasAgent.cpp b/Source/WebCore/inspector/InspectorCanvasAgent.cpp
index 9430995..51ce447 100644
--- a/Source/WebCore/inspector/InspectorCanvasAgent.cpp
+++ b/Source/WebCore/inspector/InspectorCanvasAgent.cpp
@@ -41,8 +41,8 @@
#include "InjectedScript.h"
#include "InjectedScriptCanvasModule.h"
#include "InjectedScriptManager.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
#include "NodeList.h"
diff --git a/Source/WebCore/inspector/InspectorCanvasAgent.h b/Source/WebCore/inspector/InspectorCanvasAgent.h
index 27d3edc..bb912ba 100644
--- a/Source/WebCore/inspector/InspectorCanvasAgent.h
+++ b/Source/WebCore/inspector/InspectorCanvasAgent.h
@@ -33,9 +33,9 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InspectorWebTypeBuilders.h"
#include "ScriptState.h"
#include <wtf/HashMap.h>
@@ -57,7 +57,7 @@
typedef String ErrorString;
-class InspectorCanvasAgent : public InspectorAgentBase, public InspectorCanvasBackendDispatcherHandler {
+class InspectorCanvasAgent : public InspectorAgentBase, public Inspector::InspectorCanvasBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorCanvasAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InjectedScriptManager* injectedScriptManager)
{
@@ -104,8 +104,8 @@
InspectorPageAgent* m_pageAgent;
InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<InspectorCanvasFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorCanvasBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorCanvasFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorCanvasBackendDispatcher> m_backendDispatcher;
bool m_enabled;
// Contains all frames with canvases, value is true only for frames that have an uninstrumented canvas.
typedef HashMap<Frame*, bool> FramesWithUninstrumentedCanvases;
diff --git a/Source/WebCore/inspector/InspectorConsoleAgent.cpp b/Source/WebCore/inspector/InspectorConsoleAgent.cpp
index de16f49..019c295 100644
--- a/Source/WebCore/inspector/InspectorConsoleAgent.cpp
+++ b/Source/WebCore/inspector/InspectorConsoleAgent.cpp
@@ -34,7 +34,7 @@
#include "DOMWindow.h"
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "ResourceError.h"
#include "ResourceResponse.h"
diff --git a/Source/WebCore/inspector/InspectorConsoleAgent.h b/Source/WebCore/inspector/InspectorConsoleAgent.h
index 99455ca..90d0f1a 100644
--- a/Source/WebCore/inspector/InspectorConsoleAgent.h
+++ b/Source/WebCore/inspector/InspectorConsoleAgent.h
@@ -29,15 +29,15 @@
#include "ConsoleAPITypes.h"
#include "ConsoleTypes.h"
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "ScriptState.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
-#include <wtf/text/StringHash.h>
#include <wtf/Vector.h>
+#include <wtf/text/StringHash.h>
namespace WebCore {
@@ -53,7 +53,7 @@
typedef String ErrorString;
-class InspectorConsoleAgent : public InspectorAgentBase, public InspectorConsoleBackendDispatcherHandler {
+class InspectorConsoleAgent : public InspectorAgentBase, public Inspector::InspectorConsoleBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorConsoleAgent);
public:
InspectorConsoleAgent(InstrumentingAgents*, InjectedScriptManager*);
@@ -101,8 +101,8 @@
virtual bool developerExtrasEnabled() = 0;
InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorConsoleBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorConsoleFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorConsoleBackendDispatcher> m_backendDispatcher;
ConsoleMessage* m_previousMessage;
Vector<OwnPtr<ConsoleMessage>> m_consoleMessages;
int m_expiredConsoleMessageCount;
diff --git a/Source/WebCore/inspector/InspectorController.cpp b/Source/WebCore/inspector/InspectorController.cpp
index 4377580..d0b55c8 100644
--- a/Source/WebCore/inspector/InspectorController.cpp
+++ b/Source/WebCore/inspector/InspectorController.cpp
@@ -41,7 +41,6 @@
#include "InjectedScriptManager.h"
#include "InspectorAgent.h"
#include "InspectorApplicationCacheAgent.h"
-#include "InspectorBackendDispatchers.h"
#include "InspectorCSSAgent.h"
#include "InspectorCanvasAgent.h"
#include "InspectorClient.h"
@@ -50,7 +49,6 @@
#include "InspectorDOMStorageAgent.h"
#include "InspectorDatabaseAgent.h"
#include "InspectorDebuggerAgent.h"
-#include "InspectorFrontend.h"
#include "InspectorFrontendClient.h"
#include "InspectorHeapProfilerAgent.h"
#include "InspectorIndexedDBAgent.h"
@@ -63,13 +61,15 @@
#include "InspectorProfilerAgent.h"
#include "InspectorResourceAgent.h"
#include "InspectorTimelineAgent.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InspectorWorkerAgent.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
+#include "Page.h"
#include "PageConsoleAgent.h"
#include "PageDebuggerAgent.h"
#include "PageRuntimeAgent.h"
-#include "Page.h"
#include "Settings.h"
#include <inspector/InspectorBackendDispatcher.h>
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.cpp b/Source/WebCore/inspector/InspectorDOMAgent.cpp
index e1d273c..62071d2 100644
--- a/Source/WebCore/inspector/InspectorDOMAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMAgent.cpp
@@ -69,11 +69,11 @@
#include "IdentifiersFactory.h"
#include "InjectedScriptManager.h"
#include "InspectorClient.h"
-#include "InspectorFrontend.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"
diff --git a/Source/WebCore/inspector/InspectorDOMAgent.h b/Source/WebCore/inspector/InspectorDOMAgent.h
index f01f9ad..3c4ca3c 100644
--- a/Source/WebCore/inspector/InspectorDOMAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMAgent.h
@@ -33,10 +33,10 @@
#include "EventTarget.h"
#include "InjectedScript.h"
#include "InjectedScriptManager.h"
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorOverlay.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "RenderLayer.h"
#include "Timer.h"
#include <inspector/InspectorValues.h>
@@ -93,7 +93,7 @@
const EventListenerVector eventListenerVector;
};
-class InspectorDOMAgent : public InspectorAgentBase, public InspectorDOMBackendDispatcherHandler {
+class InspectorDOMAgent : public InspectorAgentBase, public Inspector::InspectorDOMBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorDOMAgent);
public:
struct DOMListener {
@@ -247,8 +247,8 @@
InjectedScriptManager* m_injectedScriptManager;
InspectorOverlay* m_overlay;
InspectorClient* m_client;
- std::unique_ptr<InspectorDOMFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorDOMBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorDOMFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorDOMBackendDispatcher> m_backendDispatcher;
DOMListener* m_domListener;
NodeToIdMap m_documentNodeToIdMap;
typedef HashMap<RefPtr<Node>, BackendNodeId> NodeToBackendIdMap;
diff --git a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
index 143170a..0f77c09 100644
--- a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.cpp
@@ -38,8 +38,8 @@
#include "InspectorAgent.h"
#include "InspectorDOMAgent.h"
#include "InspectorDebuggerAgent.h"
-#include "InspectorFrontend.h"
#include "InspectorInstrumentation.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include <inspector/InspectorValues.h>
#include <wtf/text/WTFString.h>
diff --git a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
index a3daaff..d8e6942 100644
--- a/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMDebuggerAgent.h
@@ -33,9 +33,9 @@
#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
#include "InspectorDebuggerAgent.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/RefCounted.h>
@@ -56,7 +56,7 @@
typedef String ErrorString;
-class InspectorDOMDebuggerAgent : public InspectorAgentBase, public InspectorDebuggerAgent::Listener, public InspectorDOMDebuggerBackendDispatcherHandler {
+class InspectorDOMDebuggerAgent : public InspectorAgentBase, public InspectorDebuggerAgent::Listener, public Inspector::InspectorDOMDebuggerBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorDOMDebuggerAgent);
public:
static PassOwnPtr<InspectorDOMDebuggerAgent> create(InstrumentingAgents*, InspectorDOMAgent*, InspectorDebuggerAgent*, InspectorAgent*);
@@ -108,7 +108,7 @@
InspectorDOMAgent* m_domAgent;
InspectorDebuggerAgent* m_debuggerAgent;
- RefPtr<InspectorDOMDebuggerBackendDispatcher> m_backendDispatcher;
+ RefPtr<Inspector::InspectorDOMDebuggerBackendDispatcher> m_backendDispatcher;
HashMap<Node*, uint32_t> m_domBreakpoints;
HashSet<String> m_eventListenerBreakpoints;
HashSet<String> m_xhrBreakpoints;
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
index 9c59b1a6..1d66d12 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.cpp
@@ -33,14 +33,14 @@
#include "InspectorDOMStorageAgent.h"
-#include "Database.h"
#include "DOMWindow.h"
+#include "Database.h"
#include "Document.h"
#include "ExceptionCode.h"
#include "ExceptionCodeDescription.h"
#include "Frame.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "Page.h"
#include "PageGroup.h"
diff --git a/Source/WebCore/inspector/InspectorDOMStorageAgent.h b/Source/WebCore/inspector/InspectorDOMStorageAgent.h
index 97441b1..fbea01d 100644
--- a/Source/WebCore/inspector/InspectorDOMStorageAgent.h
+++ b/Source/WebCore/inspector/InspectorDOMStorageAgent.h
@@ -29,8 +29,8 @@
#ifndef InspectorDOMStorageAgent_h
#define InspectorDOMStorageAgent_h
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include "StorageArea.h"
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
@@ -38,12 +38,12 @@
namespace Inspector {
class InspectorArray;
+class InspectorDOMStorageFrontendDispatcher;
}
namespace WebCore {
class Frame;
-class InspectorDOMStorageFrontendDispatcher;
class InspectorPageAgent;
class InstrumentingAgents;
class Page;
@@ -52,7 +52,7 @@
typedef String ErrorString;
-class InspectorDOMStorageAgent : public InspectorAgentBase, public InspectorDOMStorageBackendDispatcherHandler {
+class InspectorDOMStorageAgent : public InspectorAgentBase, public Inspector::InspectorDOMStorageBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorDOMStorageAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent)
{
@@ -84,8 +84,8 @@
PassRefPtr<StorageArea> findStorageArea(ErrorString*, const RefPtr<Inspector::InspectorObject>&, Frame*&);
InspectorPageAgent* m_pageAgent;
- std::unique_ptr<InspectorDOMStorageFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorDOMStorageBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorDOMStorageFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorDOMStorageBackendDispatcher> m_backendDispatcher;
bool m_enabled;
};
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
index 9b855cb..491c849 100644
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.cpp
@@ -36,7 +36,7 @@
#include "ExceptionCode.h"
#include "ExceptionCodePlaceholder.h"
#include "InspectorDatabaseResource.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "SQLError.h"
#include "SQLResultSet.h"
@@ -51,7 +51,7 @@
#include <inspector/InspectorValues.h>
#include <wtf/Vector.h>
-typedef WebCore::InspectorDatabaseBackendDispatcherHandler::ExecuteSQLCallback ExecuteSQLCallback;
+typedef Inspector::InspectorDatabaseBackendDispatcherHandler::ExecuteSQLCallback ExecuteSQLCallback;
using namespace Inspector;
diff --git a/Source/WebCore/inspector/InspectorDatabaseAgent.h b/Source/WebCore/inspector/InspectorDatabaseAgent.h
index 539a3ac..4412be2 100644
--- a/Source/WebCore/inspector/InspectorDatabaseAgent.h
+++ b/Source/WebCore/inspector/InspectorDatabaseAgent.h
@@ -31,9 +31,9 @@
#if ENABLE(INSPECTOR) && ENABLE(SQL_DATABASE)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/HashMap.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
@@ -50,7 +50,7 @@
typedef String ErrorString;
-class InspectorDatabaseAgent : public InspectorAgentBase, public InspectorDatabaseBackendDispatcherHandler {
+class InspectorDatabaseAgent : public InspectorAgentBase, public Inspector::InspectorDatabaseBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorDatabaseAgent> create(InstrumentingAgents* instrumentingAgents)
{
@@ -79,8 +79,8 @@
Database* databaseForId(const String& databaseId);
InspectorDatabaseResource* findByFileName(const String& fileName);
- std::unique_ptr<InspectorDatabaseFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorDatabaseBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorDatabaseFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorDatabaseBackendDispatcher> m_backendDispatcher;
typedef HashMap<String, RefPtr<InspectorDatabaseResource>> DatabaseResourcesMap;
DatabaseResourcesMap m_resources;
bool m_enabled;
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.cpp b/Source/WebCore/inspector/InspectorDatabaseResource.cpp
index 25a3146..1badbdf 100644
--- a/Source/WebCore/inspector/InspectorDatabaseResource.cpp
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.cpp
@@ -35,7 +35,7 @@
#include "InspectorDatabaseResource.h"
#include "Database.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <inspector/InspectorValues.h>
using namespace Inspector;
diff --git a/Source/WebCore/inspector/InspectorDatabaseResource.h b/Source/WebCore/inspector/InspectorDatabaseResource.h
index 80c2ae4..ccd09c8 100644
--- a/Source/WebCore/inspector/InspectorDatabaseResource.h
+++ b/Source/WebCore/inspector/InspectorDatabaseResource.h
@@ -32,7 +32,7 @@
#define InspectorDatabaseResource_h
#if ENABLE(SQL_DATABASE) && ENABLE(INSPECTOR)
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/PassRefPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/RefPtr.h>
@@ -46,7 +46,7 @@
public:
static PassRefPtr<InspectorDatabaseResource> create(PassRefPtr<Database> database, const String& domain, const String& name, const String& version);
- void bind(InspectorDatabaseFrontendDispatcher*);
+ void bind(Inspector::InspectorDatabaseFrontendDispatcher*);
Database* database() { return m_database.get(); }
void setDatabase(PassRefPtr<Database> database) { m_database = database; }
String id() const { return m_id; }
diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.cpp b/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
index 85de246..03ee6c6 100644
--- a/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorDebuggerAgent.cpp
@@ -36,8 +36,8 @@
#include "ContentSearchUtils.h"
#include "InjectedScript.h"
#include "InjectedScriptManager.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "RegularExpression.h"
#include "ScriptDebugServer.h"
diff --git a/Source/WebCore/inspector/InspectorDebuggerAgent.h b/Source/WebCore/inspector/InspectorDebuggerAgent.h
index 95eda06..6ce5c59 100644
--- a/Source/WebCore/inspector/InspectorDebuggerAgent.h
+++ b/Source/WebCore/inspector/InspectorDebuggerAgent.h
@@ -36,9 +36,9 @@
#include "ConsoleAPITypes.h"
#include "ConsoleTypes.h"
#include "InjectedScript.h"
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "ScriptBreakpoint.h"
#include "ScriptDebugListener.h"
#include "ScriptState.h"
@@ -68,7 +68,7 @@
typedef String ErrorString;
-class InspectorDebuggerAgent : public InspectorAgentBase, public ScriptDebugListener, public InspectorDebuggerBackendDispatcherHandler {
+class InspectorDebuggerAgent : public InspectorAgentBase, public ScriptDebugListener, public Inspector::InspectorDebuggerBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorDebuggerAgent); WTF_MAKE_FAST_ALLOCATED;
public:
static const char* backtraceObjectGroup;
@@ -120,9 +120,9 @@
void runScript(ErrorString*, const Inspector::TypeBuilder::Debugger::ScriptId&, const int* executionContextId, const String* objectGroup, const bool* doNotPauseOnExceptionsAndMuteConsole, RefPtr<Inspector::TypeBuilder::Runtime::RemoteObject>& result, Inspector::TypeBuilder::OptOutput<bool>* wasThrown);
virtual void setOverlayMessage(ErrorString*, const String*);
- void schedulePauseOnNextStatement(InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
+ void schedulePauseOnNextStatement(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
void cancelPauseOnNextStatement();
- void breakProgram(InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
+ void breakProgram(Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum breakReason, PassRefPtr<Inspector::InspectorObject> data);
virtual void scriptExecutionBlockedByCSP(const String& directiveText);
class Listener {
@@ -175,15 +175,15 @@
typedef HashMap<String, RefPtr<Inspector::InspectorObject>> BreakpointIdentifierToBreakpointMap;
InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<InspectorDebuggerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorDebuggerBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorDebuggerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorDebuggerBackendDispatcher> m_backendDispatcher;
JSC::ExecState* m_pausedScriptState;
Deprecated::ScriptValue m_currentCallStack;
ScriptsMap m_scripts;
BreakpointIdentifierToDebugServerBreakpointIDsMap m_breakpointIdentifierToDebugServerBreakpointIDs;
BreakpointIdentifierToBreakpointMap m_javaScriptBreakpoints;
BreakpointID m_continueToLocationBreakpointID;
- InspectorDebuggerFrontendDispatcher::Reason::Enum m_breakReason;
+ Inspector::InspectorDebuggerFrontendDispatcher::Reason::Enum m_breakReason;
RefPtr<Inspector::InspectorObject> m_breakAuxData;
bool m_enabled;
bool m_javaScriptPauseScheduled;
diff --git a/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp b/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
index aa8ca0f..2373e82 100644
--- a/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
+++ b/Source/WebCore/inspector/InspectorFrontendClientLocal.cpp
@@ -41,10 +41,10 @@
#include "FrameLoadRequest.h"
#include "FrameLoader.h"
#include "FrameView.h"
-#include "InspectorBackendDispatchers.h"
#include "InspectorController.h"
#include "InspectorFrontendHost.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebBackendDispatchers.h"
#include "MainFrame.h"
#include "Page.h"
#include "ScriptController.h"
diff --git a/Source/WebCore/inspector/InspectorHeapProfilerAgent.h b/Source/WebCore/inspector/InspectorHeapProfilerAgent.h
index 62c13e4..4a67612 100644
--- a/Source/WebCore/inspector/InspectorHeapProfilerAgent.h
+++ b/Source/WebCore/inspector/InspectorHeapProfilerAgent.h
@@ -33,9 +33,9 @@
#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
@@ -50,7 +50,7 @@
typedef String ErrorString;
-class InspectorHeapProfilerAgent : public InspectorAgentBase, public InspectorHeapProfilerBackendDispatcherHandler {
+class InspectorHeapProfilerAgent : public InspectorAgentBase, public Inspector::InspectorHeapProfilerBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorHeapProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<InspectorHeapProfilerAgent> create(InstrumentingAgents*, InjectedScriptManager*);
@@ -84,8 +84,8 @@
PassRefPtr<Inspector::TypeBuilder::HeapProfiler::ProfileHeader> createSnapshotHeader(const ScriptHeapSnapshot&);
InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<InspectorHeapProfilerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorHeapProfilerBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorHeapProfilerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorHeapProfilerBackendDispatcher> m_backendDispatcher;
unsigned m_nextUserInitiatedHeapSnapshotNumber;
IdToHeapSnapshotMap m_snapshots;
bool m_profileHeadersRequested;
diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
index fb42f87..77eb794 100644
--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.cpp
@@ -59,8 +59,8 @@
#include "IDBRequest.h"
#include "IDBTransaction.h"
#include "InjectedScript.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "SecurityOrigin.h"
#include <inspector/InspectorValues.h>
@@ -76,10 +76,10 @@
using Inspector::TypeBuilder::IndexedDB::ObjectStoreIndex;
typedef Inspector::InspectorBackendDispatcher::CallbackBase RequestCallback;
-typedef WebCore::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseNamesCallback RequestDatabaseNamesCallback;
-typedef WebCore::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseCallback RequestDatabaseCallback;
-typedef WebCore::InspectorIndexedDBBackendDispatcherHandler::RequestDataCallback RequestDataCallback;
-typedef WebCore::InspectorIndexedDBBackendDispatcherHandler::ClearObjectStoreCallback ClearObjectStoreCallback;
+typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseNamesCallback RequestDatabaseNamesCallback;
+typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDatabaseCallback RequestDatabaseCallback;
+typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::RequestDataCallback RequestDataCallback;
+typedef Inspector::InspectorIndexedDBBackendDispatcherHandler::ClearObjectStoreCallback ClearObjectStoreCallback;
using namespace Inspector;
diff --git a/Source/WebCore/inspector/InspectorIndexedDBAgent.h b/Source/WebCore/inspector/InspectorIndexedDBAgent.h
index b955210..8cdc5c5 100644
--- a/Source/WebCore/inspector/InspectorIndexedDBAgent.h
+++ b/Source/WebCore/inspector/InspectorIndexedDBAgent.h
@@ -33,8 +33,8 @@
#if ENABLE(INSPECTOR) && ENABLE(INDEXED_DATABASE)
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
@@ -45,7 +45,7 @@
typedef String ErrorString;
-class InspectorIndexedDBAgent : public InspectorAgentBase, public InspectorIndexedDBBackendDispatcherHandler {
+class InspectorIndexedDBAgent : public InspectorAgentBase, public Inspector::InspectorIndexedDBBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorIndexedDBAgent> create(InstrumentingAgents* instrumentingAgents, InjectedScriptManager* injectedScriptManager, InspectorPageAgent* pageAgent)
{
@@ -69,7 +69,7 @@
InjectedScriptManager* m_injectedScriptManager;
InspectorPageAgent* m_pageAgent;
- RefPtr<InspectorIndexedDBBackendDispatcher> m_backendDispatcher;
+ RefPtr<Inspector::InspectorIndexedDBBackendDispatcher> m_backendDispatcher;
};
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorInputAgent.h b/Source/WebCore/inspector/InspectorInputAgent.h
index 4e062aa..a209113 100644
--- a/Source/WebCore/inspector/InspectorInputAgent.h
+++ b/Source/WebCore/inspector/InspectorInputAgent.h
@@ -33,8 +33,8 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/Noncopyable.h>
#include <wtf/PassOwnPtr.h>
#include <wtf/text/WTFString.h>
@@ -44,7 +44,7 @@
typedef String ErrorString;
-class InspectorInputAgent : public InspectorAgentBase, public InspectorInputBackendDispatcherHandler {
+class InspectorInputAgent : public InspectorAgentBase, public Inspector::InspectorInputBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorInputAgent);
public:
static PassOwnPtr<InspectorInputAgent> create(InstrumentingAgents* instrumentingAgents, Page* page)
@@ -65,7 +65,7 @@
InspectorInputAgent(InstrumentingAgents*, Page*);
Page* m_page;
- RefPtr<InspectorInputBackendDispatcher> m_backendDispatcher;
+ RefPtr<Inspector::InspectorInputBackendDispatcher> m_backendDispatcher;
};
#endif // ENABLE(INSPECTOR)
diff --git a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
index c415bfa..c96830e 100644
--- a/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
+++ b/Source/WebCore/inspector/InspectorLayerTreeAgent.cpp
@@ -37,7 +37,7 @@
#include "IdentifiersFactory.h"
#include "InspectorDOMAgent.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "IntRect.h"
#include "PseudoElement.h"
diff --git a/Source/WebCore/inspector/InspectorLayerTreeAgent.h b/Source/WebCore/inspector/InspectorLayerTreeAgent.h
index 174560d..364e9ff 100644
--- a/Source/WebCore/inspector/InspectorLayerTreeAgent.h
+++ b/Source/WebCore/inspector/InspectorLayerTreeAgent.h
@@ -31,9 +31,9 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InspectorWebTypeBuilders.h"
#include "RenderLayer.h"
#include <wtf/PassOwnPtr.h>
@@ -47,7 +47,7 @@
typedef String ErrorString;
-class InspectorLayerTreeAgent : public InspectorAgentBase, public InspectorLayerTreeBackendDispatcherHandler {
+class InspectorLayerTreeAgent : public InspectorAgentBase, public Inspector::InspectorLayerTreeBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorLayerTreeAgent> create(InstrumentingAgents* instrumentingAgents)
{
@@ -87,8 +87,8 @@
String bindPseudoElement(PseudoElement*);
void unbindPseudoElement(PseudoElement*);
- std::unique_ptr<InspectorLayerTreeFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorLayerTreeBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorLayerTreeFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorLayerTreeBackendDispatcher> m_backendDispatcher;
HashMap<const RenderLayer*, String> m_documentLayerToIdMap;
HashMap<String, const RenderLayer*> m_idToLayer;
diff --git a/Source/WebCore/inspector/InspectorMemoryAgent.cpp b/Source/WebCore/inspector/InspectorMemoryAgent.cpp
index 32d01ff..48ba7b8 100644
--- a/Source/WebCore/inspector/InspectorMemoryAgent.cpp
+++ b/Source/WebCore/inspector/InspectorMemoryAgent.cpp
@@ -40,7 +40,7 @@
#include "EventListenerMap.h"
#include "Frame.h"
#include "InspectorDOMStorageAgent.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "MemoryCache.h"
#include "Node.h"
diff --git a/Source/WebCore/inspector/InspectorMemoryAgent.h b/Source/WebCore/inspector/InspectorMemoryAgent.h
index 8f15654..2a2fa6b 100644
--- a/Source/WebCore/inspector/InspectorMemoryAgent.h
+++ b/Source/WebCore/inspector/InspectorMemoryAgent.h
@@ -33,8 +33,8 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/RefPtr.h>
@@ -45,7 +45,7 @@
typedef String ErrorString;
-class InspectorMemoryAgent : public InspectorAgentBase, public InspectorMemoryBackendDispatcherHandler {
+class InspectorMemoryAgent : public InspectorAgentBase, public Inspector::InspectorMemoryBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorMemoryAgent);
public:
static PassOwnPtr<InspectorMemoryAgent> create(InstrumentingAgents* instrumentingAgents);
@@ -59,7 +59,7 @@
private:
InspectorMemoryAgent(InstrumentingAgents*);
- RefPtr<InspectorMemoryBackendDispatcher> m_backendDispatcher;
+ RefPtr<Inspector::InspectorMemoryBackendDispatcher> m_backendDispatcher;
};
} // namespace WebCore
diff --git a/Source/WebCore/inspector/InspectorPageAgent.cpp b/Source/WebCore/inspector/InspectorPageAgent.cpp
index f4dbfd5..ada90df 100644
--- a/Source/WebCore/inspector/InspectorPageAgent.cpp
+++ b/Source/WebCore/inspector/InspectorPageAgent.cpp
@@ -63,9 +63,9 @@
#include "InspectorAgent.h"
#include "InspectorClient.h"
#include "InspectorDOMAgent.h"
-#include "InspectorFrontend.h"
#include "InspectorInstrumentation.h"
#include "InspectorOverlay.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "MainFrame.h"
#include "MemoryCache.h"
diff --git a/Source/WebCore/inspector/InspectorPageAgent.h b/Source/WebCore/inspector/InspectorPageAgent.h
index 5d65699..2cc0ad4 100644
--- a/Source/WebCore/inspector/InspectorPageAgent.h
+++ b/Source/WebCore/inspector/InspectorPageAgent.h
@@ -35,9 +35,9 @@
#include "DeviceOrientationData.h"
#include "GeolocationPosition.h"
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "IntSize.h"
#include "LayoutRect.h"
#include <wtf/HashMap.h>
@@ -71,7 +71,7 @@
typedef String ErrorString;
-class InspectorPageAgent : public InspectorAgentBase, public InspectorPageBackendDispatcherHandler {
+class InspectorPageAgent : public InspectorAgentBase, public Inspector::InspectorPageBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorPageAgent);
public:
enum ResourceType {
@@ -121,7 +121,7 @@
virtual void setShowFPSCounter(ErrorString*, bool show);
virtual void canContinuouslyPaint(ErrorString*, bool*);
virtual void setContinuousPaintingEnabled(ErrorString*, bool enabled);
- virtual void getScriptExecutionStatus(ErrorString*, InspectorPageBackendDispatcherHandler::Result::Enum*);
+ virtual void getScriptExecutionStatus(ErrorString*, Inspector::InspectorPageBackendDispatcherHandler::Result::Enum*);
virtual void setScriptExecutionDisabled(ErrorString*, bool);
virtual void setGeolocationOverride(ErrorString*, const double*, const double*, const double*);
virtual void clearGeolocationOverride(ErrorString*);
@@ -200,8 +200,8 @@
InspectorAgent* m_inspectorAgent;
InjectedScriptManager* m_injectedScriptManager;
InspectorClient* m_client;
- std::unique_ptr<InspectorPageFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorPageBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorPageFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorPageBackendDispatcher> m_backendDispatcher;
InspectorOverlay* m_overlay;
long m_lastScriptIdentifier;
String m_pendingScriptToEvaluateOnLoadOnce;
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.cpp b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
index 27dd5d2..f77e014 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.cpp
@@ -39,7 +39,7 @@
#include "InjectedScript.h"
#include "InjectedScriptHost.h"
#include "InspectorConsoleAgent.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "URL.h"
#include "Page.h"
diff --git a/Source/WebCore/inspector/InspectorProfilerAgent.h b/Source/WebCore/inspector/InspectorProfilerAgent.h
index 3f7836d..bace5c9 100644
--- a/Source/WebCore/inspector/InspectorProfilerAgent.h
+++ b/Source/WebCore/inspector/InspectorProfilerAgent.h
@@ -32,9 +32,9 @@
#if ENABLE(JAVASCRIPT_DEBUGGER) && ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
#include <wtf/Noncopyable.h>
@@ -58,7 +58,7 @@
typedef String ErrorString;
-class InspectorProfilerAgent : public InspectorAgentBase, public InspectorProfilerBackendDispatcherHandler {
+class InspectorProfilerAgent : public InspectorAgentBase, public Inspector::InspectorProfilerBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorProfilerAgent); WTF_MAKE_FAST_ALLOCATED;
public:
static PassOwnPtr<InspectorProfilerAgent> create(InstrumentingAgents*, InspectorConsoleAgent*, Page*, InjectedScriptManager*);
@@ -118,8 +118,8 @@
InspectorConsoleAgent* m_consoleAgent;
InjectedScriptManager* m_injectedScriptManager;
- std::unique_ptr<InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorProfilerBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorProfilerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorProfilerBackendDispatcher> m_backendDispatcher;
bool m_enabled;
bool m_profileHeadersRequested;
bool m_recordingCPUProfile;
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.cpp b/Source/WebCore/inspector/InspectorResourceAgent.cpp
index 44f49c5..7f82f5f 100644
--- a/Source/WebCore/inspector/InspectorResourceAgent.cpp
+++ b/Source/WebCore/inspector/InspectorResourceAgent.cpp
@@ -46,10 +46,9 @@
#include "IconController.h"
#include "IdentifiersFactory.h"
#include "InspectorClient.h"
-#include "InspectorFrontend.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
-#include "URL.h"
#include "MemoryCache.h"
#include "NetworkResourcesData.h"
#include "Page.h"
@@ -64,6 +63,7 @@
#include "ScriptableDocumentParser.h"
#include "Settings.h"
#include "SubresourceLoader.h"
+#include "URL.h"
#include "WebSocketFrame.h"
#include "XMLHttpRequest.h"
#include <inspector/InspectorValues.h>
diff --git a/Source/WebCore/inspector/InspectorResourceAgent.h b/Source/WebCore/inspector/InspectorResourceAgent.h
index 9f2e72a..dc50917 100644
--- a/Source/WebCore/inspector/InspectorResourceAgent.h
+++ b/Source/WebCore/inspector/InspectorResourceAgent.h
@@ -31,9 +31,9 @@
#ifndef InspectorResourceAgent_h
#define InspectorResourceAgent_h
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <wtf/PassOwnPtr.h>
#include <wtf/RefCounted.h>
#include <wtf/Vector.h>
@@ -75,7 +75,7 @@
typedef String ErrorString;
-class InspectorResourceAgent : public InspectorAgentBase, public InspectorNetworkBackendDispatcherHandler {
+class InspectorResourceAgent : public InspectorAgentBase, public Inspector::InspectorNetworkBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorResourceAgent> create(InstrumentingAgents* instrumentingAgents, InspectorPageAgent* pageAgent, InspectorClient* client)
{
@@ -152,8 +152,8 @@
InspectorPageAgent* m_pageAgent;
InspectorClient* m_client;
- std::unique_ptr<InspectorNetworkFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorNetworkBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorNetworkFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorNetworkBackendDispatcher> m_backendDispatcher;
String m_userAgentOverride;
OwnPtr<NetworkResourcesData> m_resourcesData;
bool m_enabled;
diff --git a/Source/WebCore/inspector/InspectorRuntimeAgent.h b/Source/WebCore/inspector/InspectorRuntimeAgent.h
index 8b444d9..53e836c 100644
--- a/Source/WebCore/inspector/InspectorRuntimeAgent.h
+++ b/Source/WebCore/inspector/InspectorRuntimeAgent.h
@@ -33,9 +33,11 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include "ScriptState.h"
+#include <inspector/InspectorJSBackendDispatchers.h>
+#include <inspector/InspectorJSFrontendDispatchers.h>
#include <wtf/Forward.h>
#include <wtf/Noncopyable.h>
@@ -55,7 +57,7 @@
typedef String ErrorString;
-class InspectorRuntimeAgent : public InspectorAgentBase, public InspectorRuntimeBackendDispatcherHandler {
+class InspectorRuntimeAgent : public InspectorAgentBase, public Inspector::InspectorRuntimeBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorRuntimeAgent);
public:
virtual ~InspectorRuntimeAgent();
diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.cpp b/Source/WebCore/inspector/InspectorTimelineAgent.cpp
index 2472ed8..dd6174f 100644
--- a/Source/WebCore/inspector/InspectorTimelineAgent.cpp
+++ b/Source/WebCore/inspector/InspectorTimelineAgent.cpp
@@ -40,10 +40,10 @@
#include "IdentifiersFactory.h"
#include "InspectorClient.h"
#include "InspectorCounters.h"
-#include "InspectorFrontend.h"
#include "InspectorInstrumentation.h"
#include "InspectorMemoryAgent.h"
#include "InspectorPageAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "IntRect.h"
#include "JSDOMWindow.h"
diff --git a/Source/WebCore/inspector/InspectorTimelineAgent.h b/Source/WebCore/inspector/InspectorTimelineAgent.h
index 05b8e02..469743a 100644
--- a/Source/WebCore/inspector/InspectorTimelineAgent.h
+++ b/Source/WebCore/inspector/InspectorTimelineAgent.h
@@ -33,9 +33,9 @@
#if ENABLE(INSPECTOR)
-#include "InspectorBackendDispatchers.h"
-#include "InspectorFrontend.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "LayoutRect.h"
#include <inspector/InspectorValues.h>
#include <wtf/PassOwnPtr.h>
@@ -123,7 +123,7 @@
class InspectorTimelineAgent
: public InspectorAgentBase
- , public InspectorTimelineBackendDispatcherHandler {
+ , public Inspector::InspectorTimelineBackendDispatcherHandler {
WTF_MAKE_NONCOPYABLE(InspectorTimelineAgent);
public:
enum InspectorType { PageInspector, WorkerInspector };
@@ -259,8 +259,8 @@
InspectorMemoryAgent* m_memoryAgent;
TimelineTimeConverter m_timeConverter;
- std::unique_ptr<InspectorTimelineFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorTimelineBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorTimelineFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorTimelineBackendDispatcher> m_backendDispatcher;
double m_timestampOffset;
Vector<TimelineRecordEntry> m_recordStack;
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.cpp b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
index 88456c5..e6cefd4 100644
--- a/Source/WebCore/inspector/InspectorWorkerAgent.cpp
+++ b/Source/WebCore/inspector/InspectorWorkerAgent.cpp
@@ -35,7 +35,7 @@
#include "InspectorWorkerAgent.h"
#include "InspectorForwarding.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "URL.h"
#include "WorkerGlobalScopeProxy.h"
diff --git a/Source/WebCore/inspector/InspectorWorkerAgent.h b/Source/WebCore/inspector/InspectorWorkerAgent.h
index ea475ed..9196224 100644
--- a/Source/WebCore/inspector/InspectorWorkerAgent.h
+++ b/Source/WebCore/inspector/InspectorWorkerAgent.h
@@ -31,24 +31,24 @@
#ifndef InspectorWorkerAgent_h
#define InspectorWorkerAgent_h
-#include "InspectorBackendDispatchers.h"
#include "InspectorWebAgentBase.h"
+#include "InspectorWebBackendDispatchers.h"
#include <wtf/Forward.h>
#include <wtf/HashMap.h>
namespace Inspector {
class InspectorObject;
+class InspectorWorkerFrontendDispatcher;
}
namespace WebCore {
-class InspectorWorkerFrontendDispatcher;
class InstrumentingAgents;
class URL;
class WorkerGlobalScopeProxy;
typedef String ErrorString;
-class InspectorWorkerAgent : public InspectorAgentBase, public InspectorWorkerBackendDispatcherHandler {
+class InspectorWorkerAgent : public InspectorAgentBase, public Inspector::InspectorWorkerBackendDispatcherHandler {
public:
static PassOwnPtr<InspectorWorkerAgent> create(InstrumentingAgents*);
~InspectorWorkerAgent();
@@ -76,8 +76,8 @@
void createWorkerFrontendChannel(WorkerGlobalScopeProxy*, const String& url);
void destroyWorkerFrontendChannels();
- std::unique_ptr<InspectorWorkerFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorWorkerBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorWorkerFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorWorkerBackendDispatcher> m_backendDispatcher;
bool m_enabled;
bool m_shouldPauseDedicatedWorkerOnStart;
diff --git a/Source/WebCore/inspector/PageRuntimeAgent.h b/Source/WebCore/inspector/PageRuntimeAgent.h
index cd04d94..94b6543 100644
--- a/Source/WebCore/inspector/PageRuntimeAgent.h
+++ b/Source/WebCore/inspector/PageRuntimeAgent.h
@@ -33,8 +33,8 @@
#if ENABLE(INSPECTOR)
-#include "InspectorFrontend.h"
#include "InspectorRuntimeAgent.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "ScriptState.h"
#include <wtf/PassOwnPtr.h>
@@ -70,8 +70,8 @@
Page* m_inspectedPage;
InspectorPageAgent* m_pageAgent;
- std::unique_ptr<InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
- RefPtr<InspectorRuntimeBackendDispatcher> m_backendDispatcher;
+ std::unique_ptr<Inspector::InspectorRuntimeFrontendDispatcher> m_frontendDispatcher;
+ RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
bool m_mainWorldContextCreated;
};
diff --git a/Source/WebCore/inspector/ScriptCallFrame.cpp b/Source/WebCore/inspector/ScriptCallFrame.cpp
index abe9e12..69c28f9 100644
--- a/Source/WebCore/inspector/ScriptCallFrame.cpp
+++ b/Source/WebCore/inspector/ScriptCallFrame.cpp
@@ -31,7 +31,7 @@
#include "config.h"
#include "ScriptCallFrame.h"
-#include "InspectorFrontend.h"
+#include "InspectorWebFrontendDispatchers.h"
#include <inspector/InspectorValues.h>
#include <wtf/RefPtr.h>
diff --git a/Source/WebCore/inspector/WorkerInspectorController.cpp b/Source/WebCore/inspector/WorkerInspectorController.cpp
index 7f5e70f..55a4245 100644
--- a/Source/WebCore/inspector/WorkerInspectorController.cpp
+++ b/Source/WebCore/inspector/WorkerInspectorController.cpp
@@ -36,14 +36,14 @@
#include "InjectedScriptHost.h"
#include "InjectedScriptManager.h"
-#include "InspectorBackendDispatchers.h"
#include "InspectorClient.h"
#include "InspectorConsoleAgent.h"
#include "InspectorForwarding.h"
-#include "InspectorFrontend.h"
#include "InspectorHeapProfilerAgent.h"
#include "InspectorProfilerAgent.h"
#include "InspectorTimelineAgent.h"
+#include "InspectorWebBackendDispatchers.h"
+#include "InspectorWebFrontendDispatchers.h"
#include "InstrumentingAgents.h"
#include "WorkerConsoleAgent.h"
#include "WorkerDebuggerAgent.h"
diff --git a/Source/WebCore/inspector/WorkerRuntimeAgent.h b/Source/WebCore/inspector/WorkerRuntimeAgent.h
index 5b629c1..99cf7e4 100644
--- a/Source/WebCore/inspector/WorkerRuntimeAgent.h
+++ b/Source/WebCore/inspector/WorkerRuntimeAgent.h
@@ -64,7 +64,7 @@
virtual void muteConsole();
virtual void unmuteConsole();
WorkerGlobalScope* m_workerGlobalScope;
- RefPtr<InspectorRuntimeBackendDispatcher> m_backendDispatcher;
+ RefPtr<Inspector::InspectorRuntimeBackendDispatcher> m_backendDispatcher;
bool m_paused;
};
diff --git a/Source/WebCore/make-generated-sources.sh b/Source/WebCore/make-generated-sources.sh
index 96b2112..fe2a727 100755
--- a/Source/WebCore/make-generated-sources.sh
+++ b/Source/WebCore/make-generated-sources.sh
@@ -2,6 +2,7 @@
export SOURCE_ROOT=$PWD
export SRCROOT=$PWD
export WebCore=$PWD
+export InspectorScripts=$PWD/../JavaScriptCore/inspector/scripts
mkdir -p DerivedSources/WebCore &&
make -C DerivedSources/WebCore -f ../../DerivedSources.make $@
diff --git a/Source/WebInspectorUI/ChangeLog b/Source/WebInspectorUI/ChangeLog
index 9041a9d..074ec37 100644
--- a/Source/WebInspectorUI/ChangeLog
+++ b/Source/WebInspectorUI/ChangeLog
@@ -1,3 +1,28 @@
+2013-12-13 Joseph Pecoraro <pecoraro@apple.com>
+
+ Web Inspector: Add Inspector Code Generation to JavaScriptCore for Runtime Domain
+ https://bugs.webkit.org/show_bug.cgi?id=125595
+
+ Reviewed by Timothy Hatcher.
+
+ * Scripts/copy-user-interface-resources.sh:
+ Copy all the different backend commands files.
+
+ * Scripts/update-InspectorBackendCommands.rb:
+ Update with respect to new script location and new file names.
+
+ * WebInspectorUI.xcodeproj/project.pbxproj:
+ Remove Inputs and Outputs of build phase, which were wrong.
+ Now this build phase always runs, and not by accident.
+
+ * UserInterface/InspectorJSBackendCommands.js: Added.
+ * UserInterface/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js.
+ * UserInterface/Legacy/6.0/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorBackendCommands.js.
+ * UserInterface/Legacy/7.0/InspectorWebBackendCommands.js: Renamed from Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorBackendCommands.js.
+ * UserInterface/LoadInspectorBackendCommands.js:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj:
+ * WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters:
+
2013-12-13 Antoine Quint <graouts@apple.com>
Web Inspector: provide an abstraction for CodeMirror's TextMarker
diff --git a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh
index a6ee89e..070c342 100755
--- a/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh
+++ b/Source/WebInspectorUI/Scripts/copy-user-interface-resources.sh
@@ -70,8 +70,9 @@
ditto "${DERIVED_SOURCES_DIR}/Main.html" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Main.html"
ditto "${SRCROOT}/UserInterface/Images" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Images"
- # Copy over files that are dynamically loaded. The default InspectorBackendCommands.js and the Legacy directory.
- ditto "${SRCROOT}/UserInterface/InspectorBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/InspectorBackendCommands.js"
+ # Copy over files that are dynamically loaded. The default Inspector*BackendCommands.js and the Legacy directory.
+ ditto "${SRCROOT}/UserInterface/InspectorJSBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/InspectorJSBackendCommands.js"
+ ditto "${SRCROOT}/UserInterface/InspectorWebBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/InspectorWebBackendCommands.js"
ditto "${SRCROOT}/UserInterface/Legacy" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/Legacy"
else
# Keep the files separate for engineering builds.
diff --git a/Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb b/Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb
index b8dfae6..a0700bf 100755
--- a/Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb
+++ b/Source/WebInspectorUI/Scripts/update-InspectorBackendCommands.rb
@@ -10,30 +10,38 @@
end
WEB_INSPECTOR_PATH = File.expand_path File.join(File.dirname(__FILE__), "..")
+JAVASCRIPTCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "JavaScriptCore")
WEBCORE_PATH = File.expand_path File.join(File.dirname(__FILE__), "..", "..", "WebCore")
-WEBCORE_INSPECTOR_PROTOCOLS_PATH = File.join WEBCORE_PATH, "inspector", "protocol"
-$code_generator_path = File.join WEBCORE_PATH, "inspector", "CodeGeneratorInspector.py"
-$inspector_json_generator_path = File.join WEBCORE_PATH, "inspector", "Scripts", "generate-combined-inspector-json.py"
-$inspector_json_path = Tempfile.new("generated-Inspector.json").path
+JAVASCRIPT_INSPECTOR_PROTOCOLS_PATH = File.join JAVASCRIPTCORE_PATH, "inspector", "protocol"
+WEB_INSPECTOR_PROTOCOLS_PATH = File.join WEBCORE_PATH, "inspector", "protocol"
+
+$code_generator_path = File.join JAVASCRIPTCORE_PATH, "inspector", "scripts", "CodeGeneratorInspector.py"
+$inspector_json_generator_path = File.join JAVASCRIPTCORE_PATH, "inspector", "scripts", "generate-combined-inspector-json.py"
+$inspector_js_json_path = Tempfile.new("generated-InspectorJS.json").path
+$inspector_web_json_path = Tempfile.new("generated-InspectorWeb.json").path
$versions_directory_path = File.join WEB_INSPECTOR_PATH, "Versions"
$web_inspector_user_interface_path = File.join WEB_INSPECTOR_PATH, "UserInterface"
-$backend_commands_filename = "InspectorBackendCommands.js"
class Task
- def initialize(input_json_path, output_directory_path, verification)
+ def initialize(input_json_path, dependency_json_path, type, output_directory_path, verification)
+ @type = type
@input_json_path = input_json_path
+ @dependency_json_path = dependency_json_path
@output_directory_path = output_directory_path
@verification = verification
end
def run
+ output_filename_prefix = {"JavaScript" => "JS", "Web" => "Web"}[@type]
+ output_filename = "Inspector#{output_filename_prefix}BackendCommands.js"
display_input = File.basename @input_json_path
- display_output = File.join @output_directory_path.gsub(/^.*?\/UserInterface/, "UserInterface"), $backend_commands_filename
+ display_output = File.join @output_directory_path.gsub(/^.*?\/UserInterface/, "UserInterface"), output_filename
puts "#{display_input} -> #{display_output}"
Dir.mktmpdir do |tmpdir|
- cmd = "#{$code_generator_path} '#{@input_json_path}' --output_h_dir '#{tmpdir}' --output_cpp_dir '#{tmpdir}' --output_js_dir '#{tmpdir}' --write_always"
+ dependency = @dependency_json_path ? "'#{@dependency_json_path}'" : ""
+ cmd = "#{$code_generator_path} '#{@input_json_path}' #{dependency} --output_h_dir '#{tmpdir}' --output_cpp_dir '#{tmpdir}' --output_js_dir '#{tmpdir}' --write_always --output_type '#{@type}'"
cmd += " --no_verification" if !@verification
%x{ #{cmd} }
if $?.exitstatus != 0
@@ -41,7 +49,7 @@
exit 1
end
- generated_path = File.join tmpdir, $backend_commands_filename
+ generated_path = File.join tmpdir, output_filename
if !File.exists?(generated_path)
puts "ERROR: Generated file does not exist at expected path."
exit 1
@@ -54,27 +62,35 @@
end
def generate_combined_inspector_json
- output = %x{ #{$inspector_json_generator_path} "#{WEBCORE_INSPECTOR_PROTOCOLS_PATH}" > "#{$inspector_json_path}" }
+ # InspectorJS.json
+ output = %x{ #{$inspector_json_generator_path} "#{JAVASCRIPT_INSPECTOR_PROTOCOLS_PATH}" > "#{$inspector_js_json_path}" }
if $?.exitstatus != 0
- puts "ERROR: Could not generate combined Inspector.json file"
+ puts "ERROR: Could not generate combined InspectorJS.json file"
exit 1
end
- puts output
- # File.open($inspector_json_path, 'w') { |file| file.write(output) }
+
+ # InspectorWeb.json
+ output = %x{ #{$inspector_json_generator_path} "#{WEB_INSPECTOR_PROTOCOLS_PATH}" > "#{$inspector_web_json_path}" }
+ if $?.exitstatus != 0
+ puts "ERROR: Could not generate combined InspectorWeb.json file"
+ exit 1
+ end
end
def all_tasks
tasks = []
+ # ToT Inspector json files.
generate_combined_inspector_json
- tasks << Task.new($inspector_json_path, $web_inspector_user_interface_path, true)
+ tasks << Task.new($inspector_js_json_path, nil, "JavaScript", $web_inspector_user_interface_path, true)
+ tasks << Task.new($inspector_web_json_path, $inspector_js_json_path, "Web", $web_inspector_user_interface_path, true)
had_error = false
Dir.glob(File.join($versions_directory_path, "*.json")).each do |version_path|
match = File.basename(version_path).match(/^Inspector(.*?)\-([^-]+?)\.json$/)
if match
output_path = File.join $web_inspector_user_interface_path, "Legacy", match[2]
- tasks << Task.new(version_path, output_path, false)
+ tasks << Task.new(version_path, nil, "Web", output_path, false)
else
puts "ERROR: Version file (#{version_path}) did not match the template Inspector<ANYTHING>-<VERSION>.js"
had_error = true
diff --git a/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js b/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js
new file mode 100644
index 0000000..1225321
--- /dev/null
+++ b/Source/WebInspectorUI/UserInterface/InspectorJSBackendCommands.js
@@ -0,0 +1,25 @@
+// File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
+
+// Copyright (c) 2013 Apple Inc. All Rights Reserved.
+// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+
+// Runtime.
+InspectorBackend.registerRuntimeDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Runtime");
+InspectorBackend.registerEnum("Runtime.RemoteObjectType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
+InspectorBackend.registerEnum("Runtime.RemoteObjectSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
+InspectorBackend.registerEnum("Runtime.PropertyPreviewType", {Object: "object", Function: "function", Undefined: "undefined", String: "string", Number: "number", Boolean: "boolean"});
+InspectorBackend.registerEnum("Runtime.PropertyPreviewSubtype", {Array: "array", Null: "null", Node: "node", Regexp: "regexp", Date: "date"});
+InspectorBackend.registerEnum("Runtime.SyntaxErrorType", {None: "none", Irrecoverable: "irrecoverable", UnterminatedLiteral: "unterminated-literal", Recoverable: "recoverable"});
+InspectorBackend.registerEvent("Runtime.executionContextCreated", ["context"]);
+InspectorBackend.registerCommand("Runtime.parse", [{"name": "source", "type": "string", "optional": false}], ["result", "message", "range"]);
+InspectorBackend.registerCommand("Runtime.evaluate", [{"name": "expression", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "includeCommandLineAPI", "type": "boolean", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "contextId", "type": "number", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Runtime.callFunctionOn", [{"name": "objectId", "type": "string", "optional": false}, {"name": "functionDeclaration", "type": "string", "optional": false}, {"name": "arguments", "type": "object", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}, {"name": "returnByValue", "type": "boolean", "optional": true}, {"name": "generatePreview", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Runtime.getProperties", [{"name": "objectId", "type": "string", "optional": false}, {"name": "ownProperties", "type": "boolean", "optional": true}], ["result", "internalProperties"]);
+InspectorBackend.registerCommand("Runtime.releaseObject", [{"name": "objectId", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Runtime.releaseObjectGroup", [{"name": "objectGroup", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Runtime.run", [], []);
+InspectorBackend.registerCommand("Runtime.enable", [], []);
+InspectorBackend.registerCommand("Runtime.disable", [], []);
diff --git a/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js b/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js
similarity index 93%
rename from Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js
rename to Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js
index 1b7860b..4a33c25 100644
--- a/Source/WebInspectorUI/UserInterface/InspectorBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/InspectorWebBackendCommands.js
@@ -1,4 +1,4 @@
-// File is generated by Source/WebCore/inspector/CodeGeneratorInspector.py
+// File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
// Copyright (c) 2013 Apple Inc. All Rights Reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
@@ -15,37 +15,6 @@
InspectorBackend.registerCommand("ApplicationCache.getManifestForFrame", [{"name": "frameId", "type": "string", "optional": false}], ["manifestURL"]);
InspectorBackend.registerCommand("ApplicationCache.getApplicationCacheForFrame", [{"name": "frameId", "type": "string", "optional": false}], ["applicationCache"]);
-// Canvas.
-InspectorBackend.registerCanvasDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Canvas");
-InspectorBackend.registerEvent("Canvas.contextCreated", ["frameId"]);
-InspectorBackend.registerEvent("Canvas.traceLogsRemoved", ["frameId", "traceLogId"]);
-InspectorBackend.registerCommand("Canvas.enable", [], []);
-InspectorBackend.registerCommand("Canvas.disable", [], []);
-InspectorBackend.registerCommand("Canvas.dropTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Canvas.hasUninstrumentedCanvases", [], ["result"]);
-InspectorBackend.registerCommand("Canvas.captureFrame", [{"name": "frameId", "type": "string", "optional": true}], ["traceLogId"]);
-InspectorBackend.registerCommand("Canvas.startCapturing", [{"name": "frameId", "type": "string", "optional": true}], ["traceLogId"]);
-InspectorBackend.registerCommand("Canvas.stopCapturing", [{"name": "traceLogId", "type": "string", "optional": false}], []);
-InspectorBackend.registerCommand("Canvas.getTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "startOffset", "type": "number", "optional": true}, {"name": "maxLength", "type": "number", "optional": true}], ["traceLog"]);
-InspectorBackend.registerCommand("Canvas.replayTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "stepNo", "type": "number", "optional": false}], ["resourceState"]);
-InspectorBackend.registerCommand("Canvas.getResourceInfo", [{"name": "resourceId", "type": "string", "optional": false}], ["resourceInfo"]);
-InspectorBackend.registerCommand("Canvas.getResourceState", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "resourceId", "type": "string", "optional": false}], ["resourceState"]);
-
-// 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}], []);
-InspectorBackend.registerCommand("Console.addInspectedHeapObject", [{"name": "heapObjectId", "type": "number", "optional": false}], []);
-
// CSS.
InspectorBackend.registerCSSDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "CSS");
InspectorBackend.registerEnum("CSS.StyleSheetOrigin", {User: "user", UserAgent: "user-agent", Inspector: "inspector", Regular: "regular"});
@@ -80,48 +49,36 @@
InspectorBackend.registerCommand("CSS.stopSelectorProfiler", [], ["profile"]);
InspectorBackend.registerCommand("CSS.getNamedFlowCollection", [{"name": "documentNodeId", "type": "number", "optional": false}], ["namedFlows"]);
-// Database.
-InspectorBackend.registerDatabaseDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Database");
-InspectorBackend.registerEvent("Database.addDatabase", ["database"]);
-InspectorBackend.registerCommand("Database.enable", [], []);
-InspectorBackend.registerCommand("Database.disable", [], []);
-InspectorBackend.registerCommand("Database.getDatabaseTableNames", [{"name": "databaseId", "type": "string", "optional": false}], ["tableNames"]);
-InspectorBackend.registerCommand("Database.executeSQL", [{"name": "databaseId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}], ["columnNames", "values", "sqlError"]);
+// Canvas.
+InspectorBackend.registerCanvasDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Canvas");
+InspectorBackend.registerEvent("Canvas.contextCreated", ["frameId"]);
+InspectorBackend.registerEvent("Canvas.traceLogsRemoved", ["frameId", "traceLogId"]);
+InspectorBackend.registerCommand("Canvas.enable", [], []);
+InspectorBackend.registerCommand("Canvas.disable", [], []);
+InspectorBackend.registerCommand("Canvas.dropTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Canvas.hasUninstrumentedCanvases", [], ["result"]);
+InspectorBackend.registerCommand("Canvas.captureFrame", [{"name": "frameId", "type": "string", "optional": true}], ["traceLogId"]);
+InspectorBackend.registerCommand("Canvas.startCapturing", [{"name": "frameId", "type": "string", "optional": true}], ["traceLogId"]);
+InspectorBackend.registerCommand("Canvas.stopCapturing", [{"name": "traceLogId", "type": "string", "optional": false}], []);
+InspectorBackend.registerCommand("Canvas.getTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "startOffset", "type": "number", "optional": true}, {"name": "maxLength", "type": "number", "optional": true}], ["traceLog"]);
+InspectorBackend.registerCommand("Canvas.replayTraceLog", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "stepNo", "type": "number", "optional": false}], ["resourceState"]);
+InspectorBackend.registerCommand("Canvas.getResourceInfo", [{"name": "resourceId", "type": "string", "optional": false}], ["resourceInfo"]);
+InspectorBackend.registerCommand("Canvas.getResourceState", [{"name": "traceLogId", "type": "string", "optional": false}, {"name": "resourceId", "type": "string", "optional": false}], ["resourceState"]);
-// Debugger.
-InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
-InspectorBackend.registerEnum("Debugger.BreakpointActionType", {Log: "log", Evaluate: "evaluate", Sound: "sound"});
-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.registerCommand("Debugger.causesRecompilation", [], ["result"]);
-InspectorBackend.registerCommand("Debugger.supportsSeparateScriptCompilationAndExecution", [], ["result"]);
-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.canSetScriptSource", [], ["result"]);
-InspectorBackend.registerCommand("Debugger.setScriptSource", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "scriptSource", "type": "string", "optional": false}, {"name": "preview", "type": "boolean", "optional": true}], ["callFrames", "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.compileScript", [{"name": "expression", "type": "string", "optional": false}, {"name": "sourceURL", "type": "string", "optional": false}], ["scriptId", "syntaxErrorMessage"]);
-InspectorBackend.registerCommand("Debugger.runScript", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "contextId", "type": "number", "optional": true}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
-InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
+// 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}], []);
+InspectorBackend.registerCommand("Console.addInspectedHeapObject", [{"name": "heapObjectId", "type": "number", "optional": false}], []);
// DOM.
InspectorBackend.registerDOMDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "DOM");
@@ -194,6 +151,49 @@
InspectorBackend.registerCommand("DOMStorage.setDOMStorageItem", [{"name": "storageId", "type": "object", "optional": false}, {"name": "key", "type": "string", "optional": false}, {"name": "value", "type": "string", "optional": false}], []);
InspectorBackend.registerCommand("DOMStorage.removeDOMStorageItem", [{"name": "storageId", "type": "object", "optional": false}, {"name": "key", "type": "string", "optional": false}], []);
+// Database.
+InspectorBackend.registerDatabaseDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Database");
+InspectorBackend.registerEvent("Database.addDatabase", ["database"]);
+InspectorBackend.registerCommand("Database.enable", [], []);
+InspectorBackend.registerCommand("Database.disable", [], []);
+InspectorBackend.registerCommand("Database.getDatabaseTableNames", [{"name": "databaseId", "type": "string", "optional": false}], ["tableNames"]);
+InspectorBackend.registerCommand("Database.executeSQL", [{"name": "databaseId", "type": "string", "optional": false}, {"name": "query", "type": "string", "optional": false}], ["columnNames", "values", "sqlError"]);
+
+// Debugger.
+InspectorBackend.registerDebuggerDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Debugger");
+InspectorBackend.registerEnum("Debugger.BreakpointActionType", {Log: "log", Evaluate: "evaluate", Sound: "sound"});
+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.registerCommand("Debugger.causesRecompilation", [], ["result"]);
+InspectorBackend.registerCommand("Debugger.supportsSeparateScriptCompilationAndExecution", [], ["result"]);
+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.canSetScriptSource", [], ["result"]);
+InspectorBackend.registerCommand("Debugger.setScriptSource", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "scriptSource", "type": "string", "optional": false}, {"name": "preview", "type": "boolean", "optional": true}], ["callFrames", "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.compileScript", [{"name": "expression", "type": "string", "optional": false}, {"name": "sourceURL", "type": "string", "optional": false}], ["scriptId", "syntaxErrorMessage"]);
+InspectorBackend.registerCommand("Debugger.runScript", [{"name": "scriptId", "type": "string", "optional": false}, {"name": "contextId", "type": "number", "optional": true}, {"name": "objectGroup", "type": "string", "optional": true}, {"name": "doNotPauseOnExceptionsAndMuteConsole", "type": "boolean", "optional": true}], ["result", "wasThrown"]);
+InspectorBackend.registerCommand("Debugger.setOverlayMessage", [{"name": "message", "type": "string", "optional": true}], []);
+
// FileSystem.
InspectorBackend.registerFileSystemDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "FileSystem");
InspectorBackend.registerCommand("FileSystem.enable", [], []);
@@ -367,24 +367,6 @@
InspectorBackend.registerCommand("Profiler.getObjectByHeapObjectId", [{"name": "objectId", "type": "string", "optional": false}, {"name": "objectGroup", "type": "string", "optional": true}], ["result"]);
InspectorBackend.registerCommand("Profiler.getHeapObjectId", [{"name": "objectId", "type": "string", "optional": false}], ["heapSnapshotObjectId"]);
-// 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", [], []);
-
// Timeline.
InspectorBackend.registerTimelineDispatcher = InspectorBackend.registerDomainDispatcher.bind(InspectorBackend, "Timeline");
InspectorBackend.registerEnum("Timeline.EventType", {EventDispatch: "EventDispatch", BeginFrame: "BeginFrame", ScheduleStyleRecalculation: "ScheduleStyleRecalculation", RecalculateStyles: "RecalculateStyles", InvalidateLayout: "InvalidateLayout", Layout: "Layout", Paint: "Paint", ScrollLayer: "ScrollLayer", ResizeImage: "ResizeImage", CompositeLayers: "CompositeLayers", ParseHTML: "ParseHTML", TimerInstall: "TimerInstall", TimerRemove: "TimerRemove", TimerFire: "TimerFire", EvaluateScript: "EvaluateScript", MarkLoad: "MarkLoad", MarkDOMContent: "MarkDOMContent", TimeStamp: "TimeStamp", Time: "Time", TimeEnd: "TimeEnd", ScheduleResourceRequest: "ScheduleResourceRequest", ResourceSendRequest: "ResourceSendRequest", ResourceReceiveResponse: "ResourceReceiveResponse", ResourceReceivedData: "ResourceReceivedData", ResourceFinish: "ResourceFinish", XHRReadyStateChange: "XHRReadyStateChange", XHRLoad: "XHRLoad", FunctionCall: "FunctionCall", GCEvent: "GCEvent", RequestAnimationFrame: "RequestAnimationFrame", CancelAnimationFrame: "CancelAnimationFrame", FireAnimationFrame: "FireAnimationFrame", WebSocketCreate: "WebSocketCreate", WebSocketSendHandshakeRequest: "WebSocketSendHandshakeRequest", WebSocketReceiveHandshakeResponse: "WebSocketReceiveHandshakeResponse", WebSocketDestroy: "WebSocketDestroy"});
diff --git a/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorBackendCommands.js b/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js
similarity index 99%
rename from Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorBackendCommands.js
rename to Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js
index 386b355..7662941 100644
--- a/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/Legacy/6.0/InspectorWebBackendCommands.js
@@ -1,5 +1,6 @@
-// File is generated by Source/WebCore/inspector/CodeGeneratorInspector.py
+// File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
+// Copyright (c) 2013 Apple Inc. All Rights Reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
diff --git a/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorBackendCommands.js b/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js
similarity index 99%
rename from Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorBackendCommands.js
rename to Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js
index edd947c..248b42e 100644
--- a/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/Legacy/7.0/InspectorWebBackendCommands.js
@@ -1,4 +1,4 @@
-// File is generated by Source/WebCore/inspector/CodeGeneratorInspector.py
+// File is generated by JavaScriptCore/inspector/scripts/CodeGeneratorInspector.py
// Copyright (c) 2013 Apple Inc. All Rights Reserved.
// Copyright (c) 2011 The Chromium Authors. All rights reserved.
diff --git a/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js b/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js
index 501b398..476a317 100644
--- a/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js
+++ b/Source/WebInspectorUI/UserInterface/LoadInspectorBackendCommands.js
@@ -24,12 +24,21 @@
*/
(function() {
- var backendCommandsURL = "InspectorBackendCommands.js";
- if (InspectorFrontendHost.inspectorBackendCommandsURL) {
- var suggestedBackendCommandsURL = InspectorFrontendHost.inspectorBackendCommandsURL();
- if (suggestedBackendCommandsURL)
- backendCommandsURL = suggestedBackendCommandsURL;
+ var backendURLs;
+ if (InspectorFrontendHost.inspectorBackendCommandsURLs) {
+ var suggestedBackendCommandsURLs = InspectorFrontendHost.inspectorBackendCommandsURLs();
+ if (suggestedBackendCommandsURLs)
+ backendURLs = suggestedBackendCommandsURLs;
}
- document.write("<script src=\"" + backendCommandsURL + "\"></script>");
+ if (!backendURLs) {
+ // FIXME: When we can inspect just a JSContext, we should not load InspectorWebBackendCommands.js.
+ backendURLs = [];
+ backendURLs.push("InspectorJSBackendCommands.js");
+ backendURLs.push("InspectorWebBackendCommands.js");
+ }
+
+ console.assert(backendURLs.length);
+ for (var backendCommandsURL of backendURLs)
+ document.write("<script src=\"" + backendCommandsURL + "\"></script>");
})();
diff --git a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
index bb4da46..40d8682 100644
--- a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
+++ b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj
@@ -548,7 +548,8 @@
<None Include="..\UserInterface\IndeterminateProgressSpinner.css" />
<None Include="..\UserInterface\IndeterminateProgressSpinner.js" />
<None Include="..\UserInterface\InspectorBackend.js" />
- <None Include="..\UserInterface\InspectorBackendCommands.js" />
+ <None Include="..\UserInterface\InspectorJSBackendCommands.js" />
+ <None Include="..\UserInterface\InspectorWebBackendCommands.js" />
<None Include="..\UserInterface\InspectorFrontendAPI.js" />
<None Include="..\UserInterface\InspectorFrontendHostStub.js" />
<None Include="..\UserInterface\InspectorObserver.js" />
@@ -572,7 +573,8 @@
<None Include="..\UserInterface\LayoutTimelineDataGrid.js" />
<None Include="..\UserInterface\LayoutTimelineDataGridNode.js" />
<None Include="..\UserInterface\LayoutTimelineRecord.js" />
- <None Include="..\UserInterface\Legacy\6.0\InspectorBackendCommands.js" />
+ <None Include="..\UserInterface\Legacy\6.0\InspectorWebBackendCommands.js" />
+ <None Include="..\UserInterface\Legacy\7.0\InspectorWebBackendCommands.js" />
<None Include="..\UserInterface\LoadInspectorBackendCommands.js" />
<None Include="..\UserInterface\LoadLocalizedStrings.js" />
<None Include="..\UserInterface\LogContentView.css" />
diff --git a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters
index d660078..f2a260a 100644
--- a/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters
+++ b/Source/WebInspectorUI/WebInspectorUI.vcxproj/WebInspectorUI.vcxproj.filters
@@ -21,6 +21,9 @@
<Filter Include="UserInterface\Legacy\6.0">
<UniqueIdentifier>{f3a0840d-35a0-41f6-8642-5f87f6f19b07}</UniqueIdentifier>
</Filter>
+ <Filter Include="UserInterface\Legacy\7.0">
+ <UniqueIdentifier>{f3a0840d-35a0-41f6-8642-162354612341}</UniqueIdentifier>
+ </Filter>
<Filter Include="Images">
<UniqueIdentifier>{af041f00-ecbb-405c-a2e0-02bbd07bfc7c}</UniqueIdentifier>
</Filter>
@@ -585,7 +588,10 @@
<None Include="..\UserInterface\InspectorBackend.js">
<Filter>UserInterface</Filter>
</None>
- <None Include="..\UserInterface\InspectorBackendCommands.js">
+ <None Include="..\UserInterface\InspectorJSBackendCommands.js">
+ <Filter>UserInterface</Filter>
+ </None>
+ <None Include="..\UserInterface\InspectorWebBackendCommands.js">
<Filter>UserInterface</Filter>
</None>
<None Include="..\UserInterface\InspectorFrontendAPI.js">
@@ -1107,9 +1113,12 @@
<None Include="..\UserInterface\External\CodeMirror\xml.js">
<Filter>UserInterface\External\CodeMirror</Filter>
</None>
- <None Include="..\UserInterface\Legacy\6.0\InspectorBackendCommands.js">
+ <None Include="..\UserInterface\Legacy\6.0\InspectorWebBackendCommands.js">
<Filter>UserInterface\Legacy\6.0</Filter>
</None>
+ <None Include="..\UserInterface\Legacy\7.0\InspectorWebBackendCommands.js">
+ <Filter>UserInterface\Legacy\7.0</Filter>
+ </None>
<None Include="..\UserInterface\Images\Weight.svg">
<Filter>Images</Filter>
</None>
diff --git a/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj b/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
index 07ab447..e07ec67 100644
--- a/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
+++ b/Source/WebInspectorUI/WebInspectorUI.xcodeproj/project.pbxproj
@@ -142,18 +142,7 @@
1C60FF1214E6D9AF006CD77D /* Copy User Interface Resources */ = {
isa = PBXShellScriptBuildPhase;
buildActionMask = 2147483647;
- files = (
- );
- inputPaths = (
- "${SRCROOT}/UserInterface",
- "${SRCROOT}/Scripts/copy-user-interface-resources.sh",
- "${DERIVED_SOURCES_DIR}/InspectorBackend.js",
- "${DERIVED_SOURCES_DIR}/InspectorBackendCommands.js",
- );
name = "Copy User Interface Resources";
- outputPaths = (
- "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}",
- );
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
shellScript = "sh \"${SRCROOT}/Scripts/copy-user-interface-resources.sh\"";
