Title: [92194] trunk
- Revision
- 92194
- Author
- [email protected]
- Date
- 2011-08-02 08:54:35 -0700 (Tue, 02 Aug 2011)
Log Message
Web Inspector: [REGRESSION] Console evaluations leading to resource loading cause errors.
https://bugs.webkit.org/show_bug.cgi?id=65466
Reviewed by Pavel Feldman.
Source/WebCore:
Test: http/tests/inspector/network/network-initiator-from-console.html
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkDataGridNode.prototype._refreshInitiatorCell):
LayoutTests:
* http/tests/inspector/network/network-initiator-from-console-expected.txt: Added.
* http/tests/inspector/network/network-initiator-from-console.html: Added.
Modified Paths
Added Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (92193 => 92194)
--- trunk/LayoutTests/ChangeLog 2011-08-02 15:52:42 UTC (rev 92193)
+++ trunk/LayoutTests/ChangeLog 2011-08-02 15:54:35 UTC (rev 92194)
@@ -1,3 +1,13 @@
+2011-08-01 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [REGRESSION] Console evaluations leading to resource loading cause errors.
+ https://bugs.webkit.org/show_bug.cgi?id=65466
+
+ Reviewed by Pavel Feldman.
+
+ * http/tests/inspector/network/network-initiator-from-console-expected.txt: Added.
+ * http/tests/inspector/network/network-initiator-from-console.html: Added.
+
2011-08-02 Csaba Osztrogonác <[email protected]>
Web Inspector: REGRESSION(r92105): It made 2 tests fail
Added: trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console-expected.txt (0 => 92194)
--- trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console-expected.txt (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console-expected.txt 2011-08-02 15:54:35 UTC (rev 92194)
@@ -0,0 +1,6 @@
+CONSOLE MESSAGE: line 1: Done.
+Tests that there is no _javascript_ error when console evaluation causes resource loading.
+
+Bug 65466
+Page reloaded.
+
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console-expected.txt
___________________________________________________________________
Added: svn:eol-style
Added: trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console.html (0 => 92194)
--- trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console.html (rev 0)
+++ trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console.html 2011-08-02 15:54:35 UTC (rev 92194)
@@ -0,0 +1,53 @@
+<html>
+<head>
+<script src=""
+<script src=""
+<script>
+var test = function()
+{
+ InspectorTest.reloadPage(step1);
+
+ function findResourceByURL(url)
+ {
+ var resources = WebInspector.networkLog.resources;
+ for (var i = 0; i < resources.length; ++i) {
+ if (url.test(resources[i].url))
+ return resources[i];
+ }
+ }
+
+ function step1()
+ {
+ InspectorTest.addSniffer(WebInspector.ConsoleView.prototype, "addMessage", step2);
+ WebInspector.networkManager.addEventListener(WebInspector.NetworkManager.EventTypes.ResourceStarted, onResource);
+ var str = "";
+ str += "var s = document.createElement(\"script\");";
+ str += "s.src = ""
+ str += "document.head.appendChild(s);";
+ WebInspector.console.evalInInspectedWindow(str, "console", true, undefined, undefined, function(){})
+ }
+
+ function onResource(event)
+ {
+ var resource = event.data;
+ if (/script.js/.test(resource.url))
+ step2();
+ }
+
+ function step2()
+ {
+ if (!findResourceByURL(/script.js/))
+ return;
+
+ WebInspector.panels.network.show();
+ InspectorTest.completeTest();
+ }
+}
+
+</script>
+</head>
+<body _onload_="runTest()">
+<p>Tests that there is no _javascript_ error when console evaluation causes resource loading.</p>
+<a href="" 65466</a>
+</body>
+</html>
Property changes on: trunk/LayoutTests/http/tests/inspector/network/network-initiator-from-console.html
___________________________________________________________________
Added: svn:eol-style
Modified: trunk/Source/WebCore/ChangeLog (92193 => 92194)
--- trunk/Source/WebCore/ChangeLog 2011-08-02 15:52:42 UTC (rev 92193)
+++ trunk/Source/WebCore/ChangeLog 2011-08-02 15:54:35 UTC (rev 92194)
@@ -1,3 +1,15 @@
+2011-08-01 Vsevolod Vlasov <[email protected]>
+
+ Web Inspector: [REGRESSION] Console evaluations leading to resource loading cause errors.
+ https://bugs.webkit.org/show_bug.cgi?id=65466
+
+ Reviewed by Pavel Feldman.
+
+ Test: http/tests/inspector/network/network-initiator-from-console.html
+
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkDataGridNode.prototype._refreshInitiatorCell):
+
2011-08-02 Alexander Pavlov <[email protected]>
Web Inspector: img[width=90] or align attributes shouldnt be shown above element.style block (as they have lower specificity)
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (92193 => 92194)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-02 15:52:42 UTC (rev 92193)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2011-08-02 15:54:35 UTC (rev 92194)
@@ -1947,6 +1947,12 @@
this._initiatorCell.removeChildren();
if (initiator.type === "script") {
var topFrame = initiator.stackTrace[0];
+ // This could happen when resource loading was triggered by console.
+ if (!topFrame.url) {
+ this._initiatorCell.addStyleClass("network-dim-cell");
+ this._initiatorCell.setTextAndTitle(WebInspector.UIString("Other"));
+ return;
+ }
this._initiatorCell.title = topFrame.url + ":" + topFrame.lineNumber;
this._initiatorCell.appendChild(WebInspector.linkifyResourceAsNode(topFrame.url, "scripts", topFrame.lineNumber));
this._appendSubtitle(this._initiatorCell, WebInspector.UIString("Script"));
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
