Changeset 83284 in webkit
- Timestamp:
- Apr 8, 2011 4:20:29 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 2 added
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r83283 r83284 1 2011-04-07 Pavel Podivilov <podivilov@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: add test for script formatter worker. 6 https://bugs.webkit.org/show_bug.cgi?id=57447 7 8 * inspector/debugger/script-formatter-expected.txt: Added. 9 * inspector/debugger/script-formatter.html: Added. 10 * platform/chromium/test_expectations.txt: 11 1 12 2011-04-08 Kent Tamura <tkent@chromium.org> 2 13 -
trunk/LayoutTests/platform/chromium/test_expectations.txt
r83283 r83284 162 162 WONTFIX SKIP : http/tests/eventsource/workers = PASS TIMEOUT FAIL 163 163 WONTFIX SKIP : http/tests/websocket/tests/workers/ = PASS TIMEOUT FAIL 164 WONTFIX SKIP : inspector/debugger/script-formatter.html = PASS TIMEOUT FAIL 164 165 165 166 // Page Cache - based tests. Chromium disables page cache because the WebKit page cache keeps previously -
trunk/Source/WebCore/ChangeLog
r83276 r83284 1 2011-04-07 Pavel Podivilov <podivilov@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: add test for script formatter worker. 6 https://bugs.webkit.org/show_bug.cgi?id=57447 7 8 Test: inspector/debugger/script-formatter.html 9 10 * GNUmakefile.am: 11 * WebCore.xcodeproj/project.pbxproj: 12 * gyp/streamline-inspector-source.sh: 13 * inspector/front-end/DebuggerPresentationModel.js: 14 (WebInspector.DebuggerPresentationModel.prototype._addScript): 15 (WebInspector.DebuggerPresentationModel.prototype.toggleFormatSourceFiles): 16 (WebInspector.DebuggerPresentationModel.prototype._formatter): 17 * inspector/front-end/ScriptFormatterWorker.js: 18 1 19 2011-04-08 Andrey Adaikin <aandrey@google.com> 2 20 -
trunk/Source/WebCore/GNUmakefile.am
r83263 r83284 822 822 $(shell ls $(WebCore)/inspector/front-end/*.css) 823 823 824 webinspectoruglifyjsdir = ${datadir}/webkitgtk-@WEBKITGTK_API_VERSION@/webinspector/UglifyJS 825 dist_webinspectoruglifyjs_DATA = \ 826 $(shell ls $(WebCore)/inspector/front-end/UglifyJS/*.js) 827 824 828 webinspectorimagesdir = ${datadir}/webkitgtk-@WEBKITGTK_API_VERSION@/webinspector/Images 825 829 dist_webinspectorimages_DATA = \ … … 832 836 ${GENSOURCES_INSPECTOR}/inspector.html: $(WebCore)/inspector/front-end/*.html \ 833 837 $(WebCore)/inspector/front-end/*.js \ 838 $(WebCore)/inspector/front-end/UglifyJS/*.js \ 834 839 $(WebCore)/inspector/front-end/*.css \ 835 840 $(WebCore)/inspector/front-end/Images/* \ 836 841 DerivedSources/WebCore/InspectorBackendStub.js \ 837 842 $(WebCore)/English.lproj/localizedStrings.js 843 $(AM_V_GEN)mkdir -p ${GENSOURCES_INSPECTOR}/UglifyJS 838 844 $(AM_V_GEN)mkdir -p ${GENSOURCES_INSPECTOR}/images 839 845 $(AM_V_at)cp ${dist_webinspector_DATA} ${GENSOURCES_INSPECTOR} 846 $(AM_V_at)cp ${dist_webinspectoruglifyjs_DATA} ${GENSOURCES_INSPECTOR}/UglifyJS 840 847 $(AM_V_at)cp ${dist_webinspectorimages_DATA} ${GENSOURCES_INSPECTOR}/images 841 848 -
trunk/Source/WebCore/WebCore.xcodeproj/project.pbxproj
r83256 r83284 23000 23000 runOnlyForDeploymentPostprocessing = 0; 23001 23001 shellPath = /bin/sh; 23002 shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/inspector/combine-javascript-resources.pl\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --generated-scripts-dir ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\n# Inline script imports in ScriptFormatterWorker.js file.\n\"$SRCROOT/inspector/inline-javascript-imports.py\" \"${SRCROOT}/inspector/front-end/ScriptFormatterWorker.js\" \"${SRCROOT}/inspector/front-end /UglifyJS\" \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\"\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n # Remove any JavaScript files, since they will be replaced with the combined file.\n cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n rm *.js\n\n # Copy the modified HTML file and the combined scripts.\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\n cp \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\" scriptFormatterWorker.js\nfi\n";23002 shellScript = "# Don't do anything for Debug builds, so the Inspector is easier to debug.\nif [[ ${CONFIGURATION:=Debug} == \"Debug\" ]]; then\n exit\nfi\n\n# Combine all script resources in the inspector.html file.\n\"$SRCROOT/inspector/combine-javascript-resources.pl\" --input-html \"${SRCROOT}/inspector/front-end/inspector.html\" --generated-scripts-dir ${BUILT_PRODUCTS_DIR}/DerivedSources/WebCore --output-dir \"${DERIVED_FILE_DIR}/WebCore\" --output-script-name inspector.js\n\n# Inline script imports in ScriptFormatterWorker.js file.\n\"$SRCROOT/inspector/inline-javascript-imports.py\" \"${SRCROOT}/inspector/front-end/ScriptFormatterWorker.js\" \"${SRCROOT}/inspector/front-end\" \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\"\n\nif [ -d \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\" ]; then\n # Remove any JavaScript files, since they will be replaced with the combined file.\n cd \"${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector\"\n rm *.js\n\n # Copy the modified HTML file and the combined scripts.\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.html\" inspector.html\n cp \"${DERIVED_FILE_DIR}/WebCore/inspector.js\" inspector.js\n cp \"${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js\" scriptFormatterWorker.js\nfi\n"; 23003 23003 }; 23004 23004 1C81BA330E97357C00266E07 /* Copy Inspector Resources */ = { -
trunk/Source/WebCore/gyp/streamline-inspector-source.sh
r83040 r83284 10 10 11 11 # Inline script imports in ScriptFormatterWorker.js file. 12 "$SRCROOT/../inspector/inline-javascript-imports.py" "${SRCROOT}/../inspector/front-end/ScriptFormatterWorker.js" "${SRCROOT}/../inspector/front-end /UglifyJS" "${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js"12 "$SRCROOT/../inspector/inline-javascript-imports.py" "${SRCROOT}/../inspector/front-end/ScriptFormatterWorker.js" "${SRCROOT}/../inspector/front-end" "${DERIVED_FILE_DIR}/WebCore/scriptFormatterWorker.js" 13 13 14 14 if [ -d "${TARGET_BUILD_DIR}/${UNLOCALIZED_RESOURCES_FOLDER_PATH}/inspector" ]; then -
trunk/Source/WebCore/inspector/front-end/DebuggerPresentationModel.js
r83190 r83284 106 106 sourceFile = new WebInspector.SourceFile(sourceFileId, script, contentChanged.bind(this)); 107 107 else 108 sourceFile = new WebInspector.FormattedSourceFile(sourceFileId, script, contentChanged.bind(this), this._formatter );108 sourceFile = new WebInspector.FormattedSourceFile(sourceFileId, script, contentChanged.bind(this), this._formatter()); 109 109 this._sourceFiles[sourceFileId] = sourceFile; 110 110 … … 196 196 { 197 197 this._formatSourceFiles = !this._formatSourceFiles; 198 if (this._formatSourceFiles && !this._formatter)199 this._formatter = new WebInspector.ScriptFormatter();200 198 201 199 var messages = this._messages; … … 211 209 if (WebInspector.debuggerModel.callFrames) 212 210 this._debuggerPaused(); 211 }, 212 213 _formatter: function() 214 { 215 if (!this._scriptFormatter) 216 this._scriptFormatter = new WebInspector.ScriptFormatter(); 217 return this._scriptFormatter; 213 218 }, 214 219 -
trunk/Source/WebCore/inspector/front-end/ScriptFormatterWorker.js
r83151 r83284 71 71 72 72 var exports = {}; 73 importScripts(" parse-js.js");73 importScripts("UglifyJS/parse-js.js"); 74 74 var parse = exports; 75 75 76 76 var exports = {}; 77 importScripts(" process.js");77 importScripts("UglifyJS/process.js"); 78 78 var process = exports; -
trunk/Source/WebKit/chromium/ChangeLog
r83282 r83284 1 2011-04-07 Pavel Podivilov <podivilov@chromium.org> 2 3 Reviewed by Pavel Feldman. 4 5 Web Inspector: add test for script formatter worker. 6 https://bugs.webkit.org/show_bug.cgi?id=57447 7 8 * WebKit.gyp: 9 1 10 2011-04-08 Kent Tamura <tkent@chromium.org> 2 11 -
trunk/Source/WebKit/chromium/WebKit.gyp
r83282 r83284 1190 1190 '<@(webinspector_files)' 1191 1191 ], 1192 'search_path': '../../WebCore/inspector/front-end /UglifyJS',1192 'search_path': '../../WebCore/inspector/front-end', 1193 1193 'outputs': ['<(PRODUCT_DIR)/resources/inspector/ScriptFormatterWorker.js'], 1194 1194 'action': ['python', '<@(_script_name)', '<@(_input_file)', '<@(_search_path)', '<@(_outputs)'],
Note: See TracChangeset
for help on using the changeset viewer.