Changeset 58342 in webkit
- Timestamp:
- Apr 27, 2010 3:04:42 PM (14 years ago)
- Location:
- trunk
- Files:
-
- 2 deleted
- 13 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
trunk/LayoutTests/ChangeLog
r58341 r58342 1 2010-04-27 Eric Seidel <eric@webkit.org> 2 3 Unreviewed, rolling out r58318. 4 http://trac.webkit.org/changeset/58318 5 https://bugs.webkit.org/show_bug.cgi?id=37215 6 7 Broke test on Tiger. Might just need updated results, 8 unclear. 9 10 * http/tests/inspector/console-resource-errors-expected.txt: Removed. 11 * http/tests/inspector/console-resource-errors.html: Removed. 12 * http/tests/inspector/console-tests.js: Removed. 13 * inspector/console-clear.html: 14 * inspector/console-dir.html: 15 * inspector/console-dirxml.html: 16 * inspector/console-format-collections-expected.txt: 17 * inspector/console-format-collections.html: 18 * inspector/console-format.html: 19 * inspector/console-log-before-inspector-open.html: 20 * inspector/console-tests.html: 21 * inspector/console-tests.js: Added. 22 (dumpConsoleMessages.callback): 23 (dumpConsoleMessages): 24 (dumpConsoleMessagesWithClasses.callback): 25 (dumpConsoleMessagesWithClasses): 26 (frontend_dumpConsoleMessages): 27 1 28 2010-04-27 Evan Martin <evan@chromium.org> 2 29 -
trunk/LayoutTests/inspector/console-clear.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-dir.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-dirxml.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-format-collections-expected.txt
r58318 r58342 9 9 10 10 console-format-collections.html:15[<select id="sel" name="sel">…</select>] 11 console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js"></script>, <script src=" ../http/tests/inspector/console-tests.js"></script>, <script>…</script>]11 console-format-collections.html:19[<script src="../http/tests/inspector/inspector-test.js"></script>, <script src="console-tests.js"></script>, <script>…</script>] 12 12 console-format-collections.html:23[<option value="1">one</option>, <option value="2">two</option>] 13 console-format-collections.html:27[<html>…</html>, <head>…</head>, <script src="../http/tests/inspector/inspector-test.js"></script>, <script src=" ../http/tests/inspector/console-tests.js"></script>, <script>…</script>, <body onload="onload()">…</body>, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">…</div>, <form id="f">…</form>, <select id="sel" name="sel">…</select>, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output"></div>]13 console-format-collections.html:27[<html>…</html>, <head>…</head>, <script src="../http/tests/inspector/inspector-test.js"></script>, <script src="console-tests.js"></script>, <script>…</script>, <body onload="onload()">…</body>, <p> Tests that console nicely formats HTML Collections and NodeLists. </p>, <div style="display:none">…</div>, <form id="f">…</form>, <select id="sel" name="sel">…</select>, <option value="1">one</option>, <option value="2">two</option>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">, <div id="output"></div>] 14 14 console-format-collections.html:31[<select id="sel" name="sel">…</select>, <input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">] 15 15 console-format-collections.html:35[<input type="radio" name="x" value="x1">, <input type="radio" name="x" value="x2">] -
trunk/LayoutTests/inspector/console-format-collections.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-format.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-log-before-inspector-open.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-tests.html
r58318 r58342 2 2 <head> 3 3 <script src="../http/tests/inspector/inspector-test.js"></script> 4 <script src=" ../http/tests/inspector/console-tests.js"></script>4 <script src="console-tests.js"></script> 5 5 <script> 6 6 -
trunk/LayoutTests/inspector/console-tests.js
-
Property
svn:executable
set to
*
r58341 r58342 12 12 } 13 13 14 function dumpConsoleMessagesWithClasses( sortMessages) {14 function dumpConsoleMessagesWithClasses() { 15 15 function callback(result) 16 16 { 17 var messages = [];18 17 for (var i = 0; i < result.length; ++i) 19 messages.push(result[i].text + " " + result[i].clazz); 20 if (sortMessages) 21 messages.sort(); 22 for (var i = 0; i < messages.length; ++i) 23 output(messages[i]); 18 output(result[i].text + " " + result[i].clazz); 24 19 notifyDone(); 25 20 } -
Property
svn:executable
set to
-
trunk/WebCore/ChangeLog
r58341 r58342 1 2010-04-27 Eric Seidel <eric@webkit.org> 2 3 Unreviewed, rolling out r58318. 4 http://trac.webkit.org/changeset/58318 5 https://bugs.webkit.org/show_bug.cgi?id=37215 6 7 Broke test on Tiger. Might just need updated results, 8 unclear. 9 10 * inspector/InspectorController.cpp: 11 (WebCore::InspectorController::didReceiveResponse): 12 (WebCore::InspectorController::didFailLoading): 13 * inspector/front-end/Resource.js: 14 (WebInspector.Resource.prototype._mimeTypeIsConsistentWithType): 15 * inspector/front-end/ResourcesPanel.js: 16 (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded): 17 1 18 2010-04-27 Evan Martin <evan@chromium.org> 2 19 -
trunk/WebCore/inspector/InspectorController.cpp
r58318 r58342 895 895 void InspectorController::didReceiveResponse(unsigned long identifier, const ResourceResponse& response) 896 896 { 897 if (RefPtr<InspectorResource> resource = getTrackedResource(identifier)) { 898 resource->updateResponse(response); 899 resource->markResponseReceivedTime(); 900 901 if (resource != m_mainResource && m_frontend) 902 resource->updateScriptObject(m_frontend.get()); 903 } 904 if (response.httpStatusCode() >= 400) { 905 // The ugly code below is due to that String::format() is not utf8-safe at the moment. 906 String message = String::format("Failed to load resource: the server responded with a status of %u (", response.httpStatusCode()) + response.httpStatusText() + ")"; 907 908 addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, response.url().string()); 909 } 897 RefPtr<InspectorResource> resource = getTrackedResource(identifier); 898 if (!resource) 899 return; 900 901 resource->updateResponse(response); 902 resource->markResponseReceivedTime(); 903 904 if (resource != m_mainResource && m_frontend) 905 resource->updateScriptObject(m_frontend.get()); 910 906 } 911 907 … … 938 934 } 939 935 940 void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& error)936 void InspectorController::didFailLoading(unsigned long identifier, const ResourceError& /*error*/) 941 937 { 942 938 if (m_timelineAgent) 943 939 m_timelineAgent->didFinishLoadingResource(identifier, true); 944 945 String message = "Failed to load resource";946 if (!error.localizedDescription().isEmpty())947 message += ": " + error.localizedDescription();948 addMessageToConsole(OtherMessageSource, LogMessageType, ErrorMessageLevel, message, 0, error.failingURL());949 940 950 941 RefPtr<InspectorResource> resource = getTrackedResource(identifier); -
trunk/WebCore/inspector/front-end/Resource.js
r58318 r58342 537 537 _mimeTypeIsConsistentWithType: function() 538 538 { 539 // If status is an error, content is likely to be of an inconsistent type,540 // as it's going to be an error message. We do not want to emit a warning541 // for this, though, as this will already be reported as resource loading failure.542 if (this.statusCode >= 400)543 return true;544 545 539 if (typeof this.type === "undefined" 546 540 || this.type === WebInspector.Resource.Type.Other -
trunk/WebCore/inspector/front-end/ResourcesPanel.js
r58318 r58342 444 444 return; 445 445 446 resource.warnings = 0; 447 resource.errors = 0; 448 446 449 if (!this.currentQuery && resource._itemsTreeElement) 447 450 resource._itemsTreeElement.updateErrorsAndWarnings();
Note: See TracChangeset
for help on using the changeset viewer.