Diff
Modified: trunk/Source/WebCore/ChangeLog (116640 => 116641)
--- trunk/Source/WebCore/ChangeLog 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/ChangeLog 2012-05-10 14:05:32 UTC (rev 116641)
@@ -1,3 +1,28 @@
+2012-05-10 Sam D <[email protected]>
+
+ Web Inspector: rename InspectorBackendStub.js to InspectorBackendCommands.js
+ https://bugs.webkit.org/show_bug.cgi?id=72306
+
+ Changed name for InspectorBackendStub.js to
+ InspectorBackendCommands.js
+
+ Reviewed by Yury Semikhatsky.
+
+ No new tests required. File name is changed.
+
+ * DerivedSources.pri:
+ * GNUmakefile.am:
+ * Target.pri:
+ * WebCore.gyp/WebCore.gyp:
+ * WebCore.gypi:
+ * WebCore.vcproj/copyWebCoreResourceFiles.cmd:
+ * WebCore.xcodeproj/project.pbxproj:
+ * gyp/copy-inspector-resources.sh:
+ * inspector/CodeGeneratorInspector.py:
+ * inspector/front-end/InspectorBackendCommands.qrc: Added.
+ * inspector/front-end/InspectorBackendStub.qrc: Removed.
+ * inspector/front-end/inspector.html:
+
2012-05-10 Alexis Menard <[email protected]>
[Qt] Avoid string conversions to construct a QUrl when using Qt5.
Modified: trunk/Source/WebCore/DerivedSources.pri (116640 => 116641)
--- trunk/Source/WebCore/DerivedSources.pri 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/DerivedSources.pri 2012-05-10 14:05:32 UTC (rev 116641)
@@ -57,7 +57,7 @@
INSPECTOR_JSON = $$PWD/inspector/Inspector.json
-INSPECTOR_BACKEND_STUB_QRC = $$PWD/inspector/front-end/InspectorBackendStub.qrc
+INSPECTOR_BACKEND_COMMANDS_QRC = $$PWD/inspector/front-end/InspectorBackendCommands.qrc
INJECTED_SCRIPT_SOURCE = $$PWD/inspector/InjectedScriptSource.js
@@ -755,11 +755,11 @@
inspectorJSON.depends = $$inspectorJSON.script
GENERATORS += inspectorJSON
-inspectorBackendStub.output = InspectorBackendStub.qrc
-inspectorBackendStub.input = INSPECTOR_BACKEND_STUB_QRC
-inspectorBackendStub.commands = $$QMAKE_COPY $$toSystemPath($$INSPECTOR_BACKEND_STUB_QRC) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}InspectorBackendStub.qrc
-inspectorBackendStub.add_output_to_sources = false
-GENERATORS += inspectorBackendStub
+inspectorBackendCommands.output = InspectorBackendCommands.qrc
+inspectorBackendCommands.input = INSPECTOR_BACKEND_COMMANDS_QRC
+inspectorBackendCommands.commands = $$QMAKE_COPY $$toSystemPath($$INSPECTOR_BACKEND_COMMANDS_QRC) ${QMAKE_FUNC_FILE_OUT_PATH}$${QMAKE_DIR_SEP}InspectorBackendCommands.qrc
+inspectorBackendCommands.add_output_to_sources = false
+GENERATORS += inspectorBackendCommands
# GENERATOR 2-a: inspector injected script source compiler
injectedScriptSource.output = InjectedScriptSource.h
Modified: trunk/Source/WebCore/GNUmakefile.am (116640 => 116641)
--- trunk/Source/WebCore/GNUmakefile.am 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/GNUmakefile.am 2012-05-10 14:05:32 UTC (rev 116641)
@@ -774,8 +774,8 @@
DerivedSources/WebCore/InspectorTypeBuilder.h: DerivedSources/WebCore/InspectorTypeBuilder.cpp
DerivedSources/WebCore/InspectorTypeBuilder.cpp: DerivedSources/WebCore/InspectorFrontend.h
DerivedSources/WebCore/InspectorFrontend.h: DerivedSources/WebCore/InspectorFrontend.cpp
-DerivedSources/WebCore/InspectorFrontend.cpp: DerivedSources/WebCore/InspectorBackendStub.js
-DerivedSources/WebCore/InspectorBackendStub.js: DerivedSources/WebCore/InspectorBackendDispatcher.h
+DerivedSources/WebCore/InspectorFrontend.cpp: DerivedSources/WebCore/InspectorBackendCommands.js
+DerivedSources/WebCore/InspectorBackendCommands.js: DerivedSources/WebCore/InspectorBackendDispatcher.h
DerivedSources/WebCore/InspectorBackendDispatcher.h: DerivedSources/WebCore/InspectorBackendDispatcher.cpp
DerivedSources/WebCore/InjectedScriptSource.h: $(WebCore)/inspector/InjectedScriptSource.js
$(AM_V_GEN)$(PERL) $(WebCore)/inspector/xxd.pl InjectedScriptSource_js $(WebCore)/inspector/InjectedScriptSource.js $(GENSOURCES_WEBCORE)/InjectedScriptSource.h
@@ -1056,7 +1056,7 @@
webinspectordir = ${datadir}/webkitgtk-@WEBKITGTK_API_VERSION@/webinspector
dist_webinspector_DATA = \
$(WebCore)/English.lproj/localizedStrings.js \
- DerivedSources/WebCore/InspectorBackendStub.js \
+ DerivedSources/WebCore/InspectorBackendCommands.js \
$(shell ls $(WebCore)/inspector/front-end/*.js) \
$(shell ls $(WebCore)/inspector/front-end/*.html) \
$(shell ls $(WebCore)/inspector/front-end/*.css)
@@ -1078,7 +1078,7 @@
$(WebCore)/inspector/front-end/UglifyJS/*.js \
$(WebCore)/inspector/front-end/*.css \
$(WebCore)/inspector/front-end/Images/* \
- DerivedSources/WebCore/InspectorBackendStub.js \
+ DerivedSources/WebCore/InspectorBackendCommands.js \
$(WebCore)/English.lproj/localizedStrings.js
$(AM_V_GEN)
$(AM_V_at)mkdir -p ${GENSOURCES_INSPECTOR}/UglifyJS
Modified: trunk/Source/WebCore/Target.pri (116640 => 116641)
--- trunk/Source/WebCore/Target.pri 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/Target.pri 2012-05-10 14:05:32 UTC (rev 116641)
@@ -30,7 +30,7 @@
include_webinspector {
RESOURCES += \
$$PWD/inspector/front-end/WebKit.qrc \
- $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendStub.qrc
+ $${WEBCORE_GENERATED_SOURCES_DIR}/InspectorBackendCommands.qrc
}
SOURCES += \
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (116640 => 116641)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2012-05-10 14:05:32 UTC (rev 116641)
@@ -367,7 +367,7 @@
'<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorFrontend.h',
'<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorTypeBuilder.cpp',
'<(SHARED_INTERMEDIATE_DIR)/webkit/InspectorTypeBuilder.h',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendCommands.js',
],
'variables': {
'generator_include_dirs': [
Modified: trunk/Source/WebCore/WebCore.gypi (116640 => 116641)
--- trunk/Source/WebCore/WebCore.gypi 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/WebCore.gypi 2012-05-10 14:05:32 UTC (rev 116641)
@@ -7205,7 +7205,7 @@
'<(PRODUCT_DIR)/DerivedSources/WebCore/InjectedScriptSource.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendDispatcher.h',
- '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendStub.js',
+ '<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorBackendCommands.js',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorFrontend.cpp',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorFrontend.h',
'<(PRODUCT_DIR)/DerivedSources/WebCore/InspectorTypeBuilder.cpp',
Modified: trunk/Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd (116640 => 116641)
--- trunk/Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/WebCore.vcproj/copyWebCoreResourceFiles.cmd 2012-05-10 14:05:32 UTC (rev 116641)
@@ -1,6 +1,6 @@
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\inspector"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\inspector\front-end\*" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\inspector"
-xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\InspectorBackendStub.js" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\inspector"
+xcopy /y /d /s /exclude:xcopy.excludes "%CONFIGURATIONBUILDDIR%\obj\WebCore\DerivedSources\InspectorBackendCommands.js" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\inspector"
mkdir 2>NUL "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\localizedStrings.js" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj"
xcopy /y /d /s /exclude:xcopy.excludes "%ProjectDir%..\English.lproj\Localizable.strings" "%CONFIGURATIONBUILDDIR%\bin\WebKit.resources\en.lproj"
Modified: trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj (116640 => 116641)
--- trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj 2012-05-10 14:05:32 UTC (rev 116641)
@@ -25063,7 +25063,7 @@
);
inputPaths = (
"$(SRCROOT)/inspector/front-end",
- "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendStub.js",
+ "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendCommands.js",
);
name = "Copy Inspector Resources";
outputPaths = (
@@ -25071,7 +25071,7 @@
);
runOnlyForDeploymentPostprocessing = 0;
shellPath = /bin/sh;
- shellScript = "if [[ ${CONFIGURATION:=Production} == \"Production\" ]]; then\n # Don't install the Inspector front-end in Production builds.\n # Keep InspectorBackend*.js files so they can be used by other front-ends.\n ditto \"${SRCROOT}/inspector/front-end/InspectorBackend.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n ditto \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendStub.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n exit\nfi\n\n# Copy all the Inspector front-end resources.\nditto \"${SRCROOT}/inspector/front-end\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\nditto \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendStub.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n\n# Remove any qrc files since they are not used on the Mac (they are for Qt).\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.qrc\n\n# Remove *.re2js files, they are only used to generate some .js files.\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.re2js\n\n# Remove any .svn directories that may have been copied over.\nfind \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" -name \".svn\" -type d | xargs rm -rf\n";
+ shellScript = "if [[ ${CONFIGURATION:=Production} == \"Production\" ]]; then\n # Don't install the Inspector front-end in Production builds.\n # Keep InspectorBackend*.js files so they can be used by other front-ends.\n ditto \"${SRCROOT}/inspector/front-end/InspectorBackend.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n ditto \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendCommands.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n exit\nfi\n\n# Copy all the Inspector front-end resources.\nditto \"${SRCROOT}/inspector/front-end\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\nditto \"${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendCommands.js\" \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"\n\n# Remove any qrc files since they are not used on the Mac (they are for Qt).\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.qrc\n\n# Remove *.re2js files, they are only used to generate some .js files.\nrm -f \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/\"*.re2js\n\n# Remove any .svn directories that may have been copied over.\nfind \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" -name \".svn\" -type d | xargs rm -rf\n";
};
37A1EAA3142699BC0087F425 /* Check For Inappropriate Objective-C Class Names */ = {
isa = PBXShellScriptBuildPhase;
Modified: trunk/Source/WebCore/gyp/copy-inspector-resources.sh (116640 => 116641)
--- trunk/Source/WebCore/gyp/copy-inspector-resources.sh 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/gyp/copy-inspector-resources.sh 2012-05-10 14:05:32 UTC (rev 116641)
@@ -2,7 +2,7 @@
# Copy all the Inspector front-end resources.
ditto "${SRCROOT}/../inspector/front-end" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector"
-ditto "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendStub.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector"
+ditto "${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore/InspectorBackendCommands.js" "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector"
# Remove the WebKit.qrc file since it is not used on the Mac (this file is for Qt).
rm -f "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector/WebKit.qrc"
Modified: trunk/Source/WebCore/inspector/CodeGeneratorInspector.py (116640 => 116641)
--- trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/inspector/CodeGeneratorInspector.py 2012-05-10 14:05:32 UTC (rev 116641)
@@ -2912,7 +2912,7 @@
typebuilder_h_file = open(output_header_dirname + "/InspectorTypeBuilder.h", "w")
typebuilder_cpp_file = open(output_cpp_dirname + "/InspectorTypeBuilder.cpp", "w")
-backend_js_file = open(output_cpp_dirname + "/InspectorBackendStub.js", "w")
+backend_js_file = open(output_cpp_dirname + "/InspectorBackendCommands.js", "w")
backend_h_file.write(Templates.backend_h.substitute(None,
Copied: trunk/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc (from rev 116639, trunk/Source/WebCore/inspector/front-end/InspectorBackendStub.qrc) (0 => 116641)
--- trunk/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc (rev 0)
+++ trunk/Source/WebCore/inspector/front-end/InspectorBackendCommands.qrc 2012-05-10 14:05:32 UTC (rev 116641)
@@ -0,0 +1,6 @@
+<!DOCTYPE RCC><RCC version="1.0">
+<qresource prefix="/webkit/inspector">
+ <file>InspectorBackendCommands.js</file>
+</qresource>
+</RCC>
+
Deleted: trunk/Source/WebCore/inspector/front-end/InspectorBackendStub.qrc (116640 => 116641)
--- trunk/Source/WebCore/inspector/front-end/InspectorBackendStub.qrc 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/inspector/front-end/InspectorBackendStub.qrc 2012-05-10 14:05:32 UTC (rev 116641)
@@ -1,6 +0,0 @@
-<!DOCTYPE RCC><RCC version="1.0">
-<qresource prefix="/webkit/inspector">
- <file>InspectorBackendStub.js</file>
-</qresource>
-</RCC>
-
Modified: trunk/Source/WebCore/inspector/front-end/inspector.html (116640 => 116641)
--- trunk/Source/WebCore/inspector/front-end/inspector.html 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebCore/inspector/front-end/inspector.html 2012-05-10 14:05:32 UTC (rev 116641)
@@ -41,7 +41,7 @@
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
- <script type="text/_javascript_" src=""
+ <script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
<script type="text/_javascript_" src=""
Modified: trunk/Source/WebKit/ChangeLog (116640 => 116641)
--- trunk/Source/WebKit/ChangeLog 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebKit/ChangeLog 2012-05-10 14:05:32 UTC (rev 116641)
@@ -1,3 +1,15 @@
+2012-05-10 Sam D <[email protected]>
+
+ Web Inspector: rename InspectorBackendStub.js to InspectorBackendCommands.js
+ https://bugs.webkit.org/show_bug.cgi?id=72306
+
+ Changed name for InspectorBackendStub.js to
+ InspectorBackendCommands.js
+
+ Reviewed by Yury Semikhatsky.
+
+ * PlatformBlackBerry.cmake:
+
2012-05-08 Crystal Zhang <[email protected]>
[BlackBerry] Implement a popup client for HTML controls
Modified: trunk/Source/WebKit/PlatformBlackBerry.cmake (116640 => 116641)
--- trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebKit/PlatformBlackBerry.cmake 2012-05-10 14:05:32 UTC (rev 116641)
@@ -188,9 +188,9 @@
FOREACH (_line IN LISTS SCRIPT_TAGS)
STRING (STRIP ${_line} _stripped_line)
STRING (REGEX REPLACE "<script.* src="" "\\1" _js_file ${_stripped_line})
- STRING (COMPARE EQUAL ${_js_file} "InspectorBackendStub.js" _comp_result)
+ STRING (COMPARE EQUAL ${_js_file} "InspectorBackendCommands.js" _comp_result)
IF ( ${_comp_result} )
- # InspectorBackendStub.js was generated with the build, should get it from DERIVED_SOURCES_WEBCORE_DIR.
+ # InspectorBackendCommands.js was generated with the build, should get it from DERIVED_SOURCES_WEBCORE_DIR.
SET (_js_file "${DERIVED_SOURCES_WEBCORE_DIR}/${_js_file}")
ELSE ()
SET (_js_file "${WEBCORE_DIR}/inspector/front-end/${_js_file}")
Modified: trunk/Source/WebKit/chromium/ChangeLog (116640 => 116641)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-05-10 14:05:32 UTC (rev 116641)
@@ -1,3 +1,14 @@
+2012-05-10 Sam D <[email protected]>
+
+ Web Inspector: rename InspectorBackendStub.js to InspectorBackendCommands.js
+ https://bugs.webkit.org/show_bug.cgi?id=72306
+
+ Changed name for InspectorBackendStub.js to InspectorBackendCommands.js
+
+ Reviewed by Yury Semikhatsky.
+
+ * WebKit.gyp:
+
2012-05-09 Kent Tamura <[email protected]>
[Chromium] Mark CCLayerTreeHostTestSetNeedsCommit2.runMultiThread and
Modified: trunk/Source/WebKit/chromium/WebKit.gyp (116640 => 116641)
--- trunk/Source/WebKit/chromium/WebKit.gyp 2012-05-10 14:04:55 UTC (rev 116640)
+++ trunk/Source/WebKit/chromium/WebKit.gyp 2012-05-10 14:05:32 UTC (rev 116641)
@@ -881,7 +881,7 @@
'files': [
'<@(devtools_files)',
'<@(webinspector_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendCommands.js',
],
'conditions': [
['debug_devtools==0', {
@@ -1012,7 +1012,7 @@
'<@(_inspector_html)',
'<@(devtools_files)',
'<@(webinspector_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js',
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendCommands.js',
'<@(_workers_files)',
'<@(webinspector_image_files)',
'<@(devtools_image_files)',
@@ -1075,7 +1075,7 @@
'<@(_input_page)',
'<@(webinspector_files)',
'<@(devtools_files)',
- '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendStub.js'
+ '<(SHARED_INTERMEDIATE_DIR)/webcore/InspectorBackendCommands.js'
],
'search_path': [
'../../WebCore/inspector/front-end',
