Diff
Modified: trunk/LayoutTests/ChangeLog (123451 => 123452)
--- trunk/LayoutTests/ChangeLog 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/ChangeLog 2012-07-24 10:33:10 UTC (rev 123452)
@@ -1,3 +1,27 @@
+2012-07-24 Anthony Scian <asc...@rim.com>
+
+ Web Inspector [JSC]: Enable initiator column in network panel.
+ https://bugs.webkit.org/show_bug.cgi?id=65533
+
+ Reviewed by Vsevolod Vlasov.
+
+ Bug https://bugs.webkit.org/show_bug.cgi?id=65105 caused
+ network-initiator.html to be disabled due to caching CSS information.
+ Tweaked the test so that reloads could be forced to avoid the cache
+ copy (thanks to Vsevolod Vlasov for help on this); test works now and
+ is updated for availability of stack traces fixed in 40118. Consolidated
+ results into common expected results output.
+
+ * http/tests/inspector/inspector-test.js:
+ (initialize_InspectorTest.InspectorTest.hardReloadPage):
+ (initialize_InspectorTest.InspectorTest.reloadPage):
+ (initialize_InspectorTest.InspectorTest._innerReloadPage):
+ * http/tests/inspector/network/network-initiator-expected.txt:
+ * http/tests/inspector/network/network-initiator.html:
+ * platform/chromium/TestExpectations:
+ * platform/chromium/http/tests/inspector/network/network-initiated-expected.txt: Removed.
+ * platform/mac/TestExpectations:
+
2012-07-24 Yoshifumi Inoue <yo...@chromium.org>
[Tests] Copy fast/forms/number/number-change-type-on-focus.html and number-losing-renderer-on-click.html to fast/forms/resources
Modified: trunk/LayoutTests/http/tests/inspector/inspector-test.js (123451 => 123452)
--- trunk/LayoutTests/http/tests/inspector/inspector-test.js 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/http/tests/inspector/inspector-test.js 2012-07-24 10:33:10 UTC (rev 123452)
@@ -188,13 +188,23 @@
InspectorTest.evaluateInConsole("window.location = '" + url + "'");
}
+InspectorTest.hardReloadPage = function(callback)
+{
+ InspectorTest._innerReloadPage(true, callback);
+}
+
InspectorTest.reloadPage = function(callback)
{
+ InspectorTest._innerReloadPage(false, callback);
+}
+
+InspectorTest._innerReloadPage = function(hardReload, callback)
+{
InspectorTest._pageLoadedCallback = InspectorTest.safeWrap(callback);
if (WebInspector.panels.network)
WebInspector.panels.network._reset();
- PageAgent.reload(false);
+ PageAgent.reload(hardReload);
}
InspectorTest.pageLoaded = function()
Modified: trunk/LayoutTests/http/tests/inspector/network/network-initiator-expected.txt (123451 => 123452)
--- trunk/LayoutTests/http/tests/inspector/network/network-initiator-expected.txt 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/http/tests/inspector/network/network-initiator-expected.txt 2012-07-24 10:33:10 UTC (rev 123452)
@@ -8,9 +8,11 @@
http://127.0.0.1:8000/inspector/network/resources/initiator.css: parser
http://127.0.0.1:8000/inspector/network/network-initiator.html 3
http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=100: parser
- http://127.0.0.1:8000/inspector/network/network-initiator.html 99
+ http://127.0.0.1:8000/inspector/network/network-initiator.html 107
http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=200: parser
- http://127.0.0.1:8000/inspector/network/network-initiator.html 100
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: other
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: other
+ http://127.0.0.1:8000/inspector/network/network-initiator.html 108
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: script
+ addClassToDivStep2 http://127.0.0.1:8000/inspector/network/network-initiator.html 17
+http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: script
+ loadData http://127.0.0.1:8000/inspector/network/network-initiator.html 29
Modified: trunk/LayoutTests/http/tests/inspector/network/network-initiator.html (123451 => 123452)
--- trunk/LayoutTests/http/tests/inspector/network/network-initiator.html 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/http/tests/inspector/network/network-initiator.html 2012-07-24 10:33:10 UTC (rev 123452)
@@ -36,7 +36,7 @@
var test = function()
{
- InspectorTest.reloadPage(step1);
+ InspectorTest.hardReloadPage(step1);
function findRequestByURL(url)
{
@@ -77,8 +77,16 @@
InspectorTest.addResult(request.url + ": " + initiator.type);
if (initiator.url)
InspectorTest.addResult(" " + initiator.url + " " + initiator.lineNumber);
- if (initiator.stackTrace)
- InspectorTest.addResult(" " + initiator.stackTrace[0].url + " " + initiator.stackTrace[0].lineNumber);
+ if (initiator.stackTrace) {
+ var stackTrace = initiator.stackTrace;
+ for (var i = 0; i < stackTrace.length; ++i) {
+ var frame = stackTrace[i];
+ if (frame.lineNumber) {
+ InspectorTest.addResult(" " + frame.functionName + " " + frame.url + " " + frame.lineNumber);
+ break;
+ }
+ }
+ }
}
dumpInitiator(findRequestByURL(/initiator\.css/));
Modified: trunk/LayoutTests/platform/chromium/TestExpectations (123451 => 123452)
--- trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/platform/chromium/TestExpectations 2012-07-24 10:33:10 UTC (rev 123452)
@@ -3347,8 +3347,6 @@
BUGWK78664 : platform/chromium/compositing/overflow/overflow-scrolling-touch-stacking-context.html = IMAGE+TEXT
-BUGWK85038 : http/tests/inspector/network/network-initiator.html = TEXT TIMEOUT
-
BUGWK85090 DEBUG SLOW : fast/js/dfg-float64array.html = PASS
BUGWK85090 DEBUG SLOW : fast/js/dfg-uint32array.html = PASS
BUGWK85090 DEBUG SLOW : fast/js/dfg-uint16array.html = PASS
Deleted: trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt (123451 => 123452)
--- trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/platform/chromium/http/tests/inspector/network/network-initiator-expected.txt 2012-07-24 10:33:10 UTC (rev 123452)
@@ -1,18 +0,0 @@
-CONSOLE MESSAGE: line 34: Done.
-Tests resources initiator for images initiated by IMG tag, static CSS, CSS class added from _javascript_ and XHR.
-
-Bug 65105
-This div has background image set from CSS.
-This div will have background image set from _javascript_.
-Page reloaded.
-http://127.0.0.1:8000/inspector/network/resources/initiator.css: parser
- http://127.0.0.1:8000/inspector/network/network-initiator.html 3
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=100: parser
- http://127.0.0.1:8000/inspector/network/network-initiator.html 99
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=200: parser
- http://127.0.0.1:8000/inspector/network/network-initiator.html 100
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=300: script
- http://127.0.0.1:8000/inspector/network/network-initiator.html 17
-http://127.0.0.1:8000/inspector/network/resources/resource.php?type=image&random=1&size=400: script
- http://127.0.0.1:8000/inspector/network/network-initiator.html 29
-
Modified: trunk/LayoutTests/platform/mac/TestExpectations (123451 => 123452)
--- trunk/LayoutTests/platform/mac/TestExpectations 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2012-07-24 10:33:10 UTC (rev 123452)
@@ -207,9 +207,6 @@
BUGWK60731 : ietestcenter/css3/grid/grid-items-002.htm = IMAGE
BUGWK60731 : ietestcenter/css3/grid/grid-items-003.htm = IMAGE
-// Fails after r115379
-BUGWK85038 : http/tests/inspector/network/network-initiator.html = TEXT TIMEOUT
-
BUGWK85401 : media/video-colorspace-yuv420.html = TEXT
BUGWK85401 : media/video-colorspace-yuv422.html = TEXT
Modified: trunk/Source/WebCore/ChangeLog (123451 => 123452)
--- trunk/Source/WebCore/ChangeLog 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/Source/WebCore/ChangeLog 2012-07-24 10:33:10 UTC (rev 123452)
@@ -1,3 +1,23 @@
+2012-07-24 Anthony Scian <asc...@rim.com>
+
+ Web Inspector [JSC]: Enable initiator column in network panel.
+ https://bugs.webkit.org/show_bug.cgi?id=65533
+
+ Reviewed by Vsevolod Vlasov.
+
+ With 40118 fixed for webkit, Preferences.displayInitiator should be set to true.
+ Removed references to it since the optionality is no longer required.
+
+ Test: http/tests/inspector/network/network-initiator.html
+
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkLogView.prototype._createTable):
+ (WebInspector.NetworkLogView.prototype.switchToDetailedView):
+ (WebInspector.NetworkLogView.prototype.switchToBriefView):
+ (WebInspector.NetworkDataGridNode.prototype.createCells):
+ (WebInspector.NetworkDataGridNode.prototype.refreshRequest):
+ * inspector/front-end/Settings.js:
+
2012-07-24 Gyuyoung Kim <gyuyoung....@samsung.com>
Missing *explicit* keyword in dom and page.
Modified: trunk/Source/WebCore/inspector/front-end/NetworkPanel.js (123451 => 123452)
--- trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/Source/WebCore/inspector/front-end/NetworkPanel.js 2012-07-24 10:33:10 UTC (rev 123452)
@@ -137,11 +137,8 @@
_createTable: function()
{
- var columns;
- if (Preferences.displayInitiator)
- columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
- else
- columns = {name: {}, method: {}, status: {}, type: {}, size: {}, time: {}, timeline: {}};
+ var columns = {name: {}, method: {}, status: {}, type: {}, initiator: {}, size: {}, time: {}, timeline: {}};
+
columns.name.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Name"), WebInspector.UIString("Path"));
columns.name.sortable = true;
columns.name.width = "20%";
@@ -159,11 +156,9 @@
columns.type.sortable = true;
columns.type.width = "6%";
- if (Preferences.displayInitiator) {
- columns.initiator.title = WebInspector.UIString("Initiator");
- columns.initiator.sortable = true;
- columns.initiator.width = "10%";
- }
+ columns.initiator.title = WebInspector.UIString("Initiator");
+ columns.initiator.sortable = true;
+ columns.initiator.width = "10%";
columns.size.titleDOMFragment = this._makeHeaderFragment(WebInspector.UIString("Size"), WebInspector.UIString("Content"));
columns.size.sortable = true;
@@ -177,10 +172,7 @@
columns.timeline.title = "";
columns.timeline.sortable = false;
- if (Preferences.displayInitiator)
- columns.timeline.width = "40%";
- else
- columns.timeline.width = "50%";
+ columns.timeline.width = "40%";
columns.timeline.sort = "ascending";
this._dataGrid = new WebInspector.DataGrid(columns);
@@ -841,8 +833,7 @@
this._dataGrid.showColumn("method");
this._dataGrid.showColumn("status");
this._dataGrid.showColumn("type");
- if (Preferences.displayInitiator)
- this._dataGrid.showColumn("initiator");
+ this._dataGrid.showColumn("initiator");
this._dataGrid.showColumn("size");
this._dataGrid.showColumn("time");
this._dataGrid.showColumn("timeline");
@@ -852,14 +843,10 @@
widths.method = 6;
widths.status = 6;
widths.type = 6;
- if (Preferences.displayInitiator)
- widths.initiator = 10;
+ widths.initiator = 10;
widths.size = 6;
widths.time = 6;
- if (Preferences.displayInitiator)
- widths.timeline = 40;
- else
- widths.timeline = 50;
+ widths.timeline = 40;
this._dataGrid.applyColumnWidthsMap(widths);
},
@@ -872,8 +859,7 @@
this._dataGrid.hideColumn("method");
this._dataGrid.hideColumn("status");
this._dataGrid.hideColumn("type");
- if (Preferences.displayInitiator)
- this._dataGrid.hideColumn("initiator");
+ this._dataGrid.hideColumn("initiator");
this._dataGrid.hideColumn("size");
this._dataGrid.hideColumn("time");
this._dataGrid.hideColumn("timeline");
@@ -1726,8 +1712,7 @@
this._methodCell = this._createDivInTD("method");
this._statusCell = this._createDivInTD("status");
this._typeCell = this._createDivInTD("type");
- if (Preferences.displayInitiator)
- this._initiatorCell = this._createDivInTD("initiator");
+ this._initiatorCell = this._createDivInTD("initiator");
this._sizeCell = this._createDivInTD("size");
this._timeCell = this._createDivInTD("time");
this._createTimelineCell();
@@ -1820,8 +1805,7 @@
this._refreshStatusCell();
this._refreshTypeCell();
- if (Preferences.displayInitiator)
- this._refreshInitiatorCell();
+ this._refreshInitiatorCell();
this._refreshSizeCell();
this._refreshTimeCell();
Modified: trunk/Source/WebCore/inspector/front-end/Settings.js (123451 => 123452)
--- trunk/Source/WebCore/inspector/front-end/Settings.js 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/Source/WebCore/inspector/front-end/Settings.js 2012-07-24 10:33:10 UTC (rev 123452)
@@ -45,8 +45,7 @@
applicationTitle: "Web Inspector - %s",
showHeapSnapshotObjectsHiddenProperties: false,
showDockToRight: false,
- exposeFileSystemInspection: false,
- displayInitiator: false
+ exposeFileSystemInspection: false
}
var Capabilities = {
Modified: trunk/Source/WebKit/chromium/ChangeLog (123451 => 123452)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-07-24 10:33:10 UTC (rev 123452)
@@ -1,3 +1,17 @@
+2012-07-24 Anthony Scian <asc...@rim.com>
+
+ Web Inspector [JSC]: Enable initiator column in network panel.
+ https://bugs.webkit.org/show_bug.cgi?id=65533
+
+ Reviewed by Vsevolod Vlasov.
+
+ With 40118 fixed for webkit, Preferences.displayInitiator should be set to true.
+ Removed references to it since the optionality is no longer required.
+
+ Test: http/tests/inspector/network/network-initiator.html
+
+ * src/js/DevTools.js:
+
2012-07-24 Peter Beverloo <pe...@chromium.org>
Unreviewed. Rolled DEPS.
Modified: trunk/Source/WebKit/chromium/src/js/DevTools.js (123451 => 123452)
--- trunk/Source/WebKit/chromium/src/js/DevTools.js 2012-07-24 10:27:51 UTC (rev 123451)
+++ trunk/Source/WebKit/chromium/src/js/DevTools.js 2012-07-24 10:33:10 UTC (rev 123452)
@@ -42,7 +42,6 @@
Preferences.exposeWorkersInspection = true;
Preferences.showDockToRight = true;
Preferences.exposeFileSystemInspection = true;
- Preferences.displayInitiator = true;
})();}
function buildPlatformExtensionAPI(extensionInfo)
