Changeset 95797 in webkit
- Timestamp:
- Sep 23, 2011 6:17:49 AM (13 years ago)
- Location:
- trunk
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r95796 r95797 1 2011-09-15 Pavel Podivilov <podivilov@chromium.org> 2 3 Web Inspector: skip overlapping scripts when displaying concatenated content. 4 https://bugs.webkit.org/show_bug.cgi?id=68144 5 6 Reviewed by Pavel Feldman. 7 8 * inspector/debugger/content-providers-expected.txt: 9 * inspector/debugger/content-providers.html: 10 1 11 2011-09-23 Xan Lopez <xlopez@igalia.com> 2 12 -
trunk/LayoutTests/inspector/debugger/content-providers-expected.txt
r94571 r95797 3 3 4 4 Running: testScriptContentProvider 5 Request foo.js source.6 5 7 6 Running: testConcatenatedScriptsContentProvider 8 Request foo.js source. 9 Request bar.js source. 10 Request baz.js source. 11 12 <script>function foo() { return 0; }</script> <script>function bar() { return 0; }</script> 7 <script>function foo() { return 0; }</script> 8 <script>function bar() { return 0; }</script> 13 9 14 10 <script> -
trunk/LayoutTests/inspector/debugger/content-providers.html
r94571 r95797 13 13 requestSource: function(callback) 14 14 { 15 InspectorTest.addResult("Request " + id + " source.");16 15 callback(source); 17 16 }, … … 39 38 { 40 39 var scripts = []; 41 scripts.push(createMockScript("baz.js", "\nfunction baz()\n{\n return 0;\n}\n", [3, 20])); 42 scripts.push(createMockScript("foo.js", "function foo() { return 0; }", [1, 10])); 43 scripts.push(createMockScript("bar.js", "function bar() { return 0; }", [1, 70])); 40 scripts.push(createMockScript("1", "\nfunction baz()\n{\n return 0;\n}\n", [3, 20])); 41 scripts.push(createMockScript("2", "function foo() { return 0; }", [0, 10])); 42 scripts.push(createMockScript("3", "function bar() { return 0; }", [1, 70])); 43 scripts.push(createMockScript("4", "this should not appear in displayed content", [0, 20])); 44 44 var contentProvider = new WebInspector.ConcatenatedScriptsContentProvider(scripts); 45 45 function didRequestContent(mimeType, content) -
trunk/Source/WebCore/ChangeLog
r95794 r95797 1 2011-09-15 Pavel Podivilov <podivilov@chromium.org> 2 3 Web Inspector: skip overlapping scripts when displaying concatenated content. 4 https://bugs.webkit.org/show_bug.cgi?id=68144 5 6 Dynamically appended script tags have wrong offsets and cause troubles building concatenated content. 7 8 Reviewed by Pavel Feldman. 9 10 * inspector/front-end/SourceFile.js: 11 (WebInspector.ConcatenatedScriptsContentProvider.prototype._concatenateScriptsContent.appendChunk): 12 (WebInspector.ConcatenatedScriptsContentProvider.prototype._concatenateScriptsContent): 13 1 14 2011-09-23 Ilya Tikhonovsky <loislo@chromium.org> 2 15 -
trunk/Source/WebCore/inspector/front-end/SourceFile.js
r95522 r95797 319 319 function appendChunk(chunk) 320 320 { 321 var start = { lineNumber: lineNumber, columnNumber: columnNumber };322 321 content += chunk; 323 322 var lineEndings = chunk.lineEndings(); … … 329 328 columnNumber = lineEndings[lineCount - 1] - lineEndings[lineCount - 2] - 1; 330 329 } 331 var end = { lineNumber: lineNumber, columnNumber: columnNumber };332 330 } 333 331 … … 335 333 var scriptCloseTag = "</script>"; 336 334 for (var i = 0; i < scripts.length; ++i) { 335 if (lineNumber > scripts[i].lineOffset || (lineNumber === scripts[i].lineOffset && columnNumber > scripts[i].columnOffset - scriptOpenTag.length)) 336 continue; 337 337 338 // Fill the gap with whitespace characters. 338 339 while (lineNumber < scripts[i].lineOffset)
Note: See TracChangeset
for help on using the changeset viewer.