[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc
pfeldman at chromium.org
pfeldman at chromium.org
Wed Dec 22 15:29:11 UTC 2010
The following commit has been merged in the debian/experimental branch:
commit 3e1882f7d8c9de3621a241cce4b88f5de689b374
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu Nov 4 19:09:17 2010 +0000
2010-11-04 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Need better way of switching back to the Timeline view of the Network tab.
https://bugs.webkit.org/show_bug.cgi?id=48995
- Moved close button to the left, preceding tab headers;
- Auto-adjusting summary bar width when switching to the preview mode
- Auto-scrolling network log if it was scrolled to bottom.
* inspector/front-end/DataGrid.js:
(WebInspector.DataGrid):
(WebInspector.DataGrid.prototype.isScrolledToLastRow):
(WebInspector.DataGrid.prototype.scrollToLastRow):
* inspector/front-end/NetworkPanel.js:
(WebInspector.NetworkPanel):
(WebInspector.NetworkPanel.prototype.updateSidebarWidth):
(WebInspector.NetworkPanel.prototype._positionSummaryBar):
(WebInspector.NetworkPanel.prototype.refresh):
(WebInspector.NetworkPanel.prototype._reset):
(WebInspector.NetworkPanel.prototype._toggleGridMode):
* inspector/front-end/inspector.css:
(.tabbed-pane-header li):
* inspector/front-end/networkPanel.css:
(.network-summary-bar):
(#network-close-button):
(#network-views.small #network-close-button):
(#network-views .resource-view .tabbed-pane-header):
(#network-views.small .resource-view .tabbed-pane-header):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71351 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b9834f1..cbb69f5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,34 @@
+2010-11-04 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Need better way of switching back to the Timeline view of the Network tab.
+ https://bugs.webkit.org/show_bug.cgi?id=48995
+
+ - Moved close button to the left, preceding tab headers;
+ - Auto-adjusting summary bar width when switching to the preview mode
+ - Auto-scrolling network log if it was scrolled to bottom.
+
+ * inspector/front-end/DataGrid.js:
+ (WebInspector.DataGrid):
+ (WebInspector.DataGrid.prototype.isScrolledToLastRow):
+ (WebInspector.DataGrid.prototype.scrollToLastRow):
+ * inspector/front-end/NetworkPanel.js:
+ (WebInspector.NetworkPanel):
+ (WebInspector.NetworkPanel.prototype.updateSidebarWidth):
+ (WebInspector.NetworkPanel.prototype._positionSummaryBar):
+ (WebInspector.NetworkPanel.prototype.refresh):
+ (WebInspector.NetworkPanel.prototype._reset):
+ (WebInspector.NetworkPanel.prototype._toggleGridMode):
+ * inspector/front-end/inspector.css:
+ (.tabbed-pane-header li):
+ * inspector/front-end/networkPanel.css:
+ (.network-summary-bar):
+ (#network-close-button):
+ (#network-views.small #network-close-button):
+ (#network-views .resource-view .tabbed-pane-header):
+ (#network-views.small .resource-view .tabbed-pane-header):
+
2010-11-04 Erik Arvidsson <arv at chromium.org>
Reviewed by Dimitri Glazkov.
diff --git a/WebCore/inspector/InspectorController.cpp b/WebCore/inspector/InspectorController.cpp
index 0825dc6..ed4381b 100644
--- a/WebCore/inspector/InspectorController.cpp
+++ b/WebCore/inspector/InspectorController.cpp
@@ -928,9 +928,6 @@ void InspectorController::ensureSettingsLoaded()
m_settingsLoaded = true;
m_state->loadFromSettings();
-
- if (m_state->getBoolean(InspectorState::resourceTrackingAlwaysEnabled))
- m_state->setBoolean(InspectorState::resourceTrackingEnabled, true);
}
void InspectorController::startTimelineProfiler()
diff --git a/WebCore/inspector/InspectorState.cpp b/WebCore/inspector/InspectorState.cpp
index e6d3044..7c6204d 100644
--- a/WebCore/inspector/InspectorState.cpp
+++ b/WebCore/inspector/InspectorState.cpp
@@ -40,8 +40,6 @@ InspectorState::InspectorState(InspectorClient* client)
: m_client(client)
{
registerBoolean(monitoringXHR, false, "monitoringXHR", "xhrMonitor");
- registerBoolean(resourceTrackingEnabled, false, "resourceTrackingEnabled", (const char*)0);
- registerBoolean(resourceTrackingAlwaysEnabled, false, (const char*)0, "resourceTrackingEnabled");
registerBoolean(timelineProfilerEnabled, false, "timelineProfilerEnabled", (const char*)0);
registerBoolean(searchingForNode, false, "searchingForNodeEnabled", (const char*)0);
registerBoolean(profilerAlwaysEnabled, false, (const char*)0, "profilerEnabled");
diff --git a/WebCore/inspector/InspectorState.h b/WebCore/inspector/InspectorState.h
index 387f3c7..4c96be9 100644
--- a/WebCore/inspector/InspectorState.h
+++ b/WebCore/inspector/InspectorState.h
@@ -45,8 +45,6 @@ class InspectorState {
public:
enum InspectorPropertyId {
monitoringXHR = 1,
- resourceTrackingEnabled,
- resourceTrackingAlwaysEnabled,
timelineProfilerEnabled,
searchingForNode,
profilerAlwaysEnabled,
diff --git a/WebCore/inspector/front-end/AuditsPanel.js b/WebCore/inspector/front-end/AuditsPanel.js
index b4eb202..096f8ce 100644
--- a/WebCore/inspector/front-end/AuditsPanel.js
+++ b/WebCore/inspector/front-end/AuditsPanel.js
@@ -203,20 +203,15 @@ WebInspector.AuditsPanel.prototype = {
_reloadResources: function(callback)
{
- this._resourceTrackingCallback = callback;
-
- if (WebInspector.panels.resources && !WebInspector.panels.resources.resourceTrackingEnabled) {
- WebInspector.panels.resources.toggleResourceTracking(false);
- this._updateLauncherViewControls(true);
- } else
- InspectorBackend.reloadPage();
+ this._pageReloadCallback = callback;
+ InspectorBackend.reloadPage();
},
_didMainResourceLoad: function()
{
- if (this._resourceTrackingCallback) {
- var callback = this._resourceTrackingCallback;
- delete this._resourceTrackingCallback;
+ if (this._pageReloadCallback) {
+ var callback = this._pageReloadCallback;
+ delete this._pageReloadCallback;
callback();
}
},
diff --git a/WebCore/inspector/front-end/DataGrid.js b/WebCore/inspector/front-end/DataGrid.js
index bc429d9..902062c 100644
--- a/WebCore/inspector/front-end/DataGrid.js
+++ b/WebCore/inspector/front-end/DataGrid.js
@@ -53,12 +53,12 @@ WebInspector.DataGrid = function(columns, editCallback, deleteCallback)
this.aligned = {};
- var scrollContainer = document.createElement("div");
- scrollContainer.className = "data-container";
- scrollContainer.appendChild(this._dataTable);
+ this._scrollContainer = document.createElement("div");
+ this._scrollContainer.className = "data-container";
+ this._scrollContainer.appendChild(this._dataTable);
this.element.appendChild(this._headerTable);
- this.element.appendChild(scrollContainer);
+ this.element.appendChild(this._scrollContainer);
var headerRow = document.createElement("tr");
var columnGroup = document.createElement("colgroup");
@@ -485,6 +485,16 @@ WebInspector.DataGrid.prototype = {
this._columnWidthsInitialized = false;
},
+ isScrolledToLastRow: function()
+ {
+ return this._scrollContainer.scrollTop === this._scrollContainer.scrollHeight - this._scrollContainer.offsetHeight;
+ },
+
+ scrollToLastRow: function()
+ {
+ this._scrollContainer.scrollTop = this._scrollContainer.scrollHeight - this._scrollContainer.offsetHeight;
+ },
+
_positionResizers: function()
{
var headerTableColumns = this._headerTableColumnGroup.children;
diff --git a/WebCore/inspector/front-end/NetworkPanel.js b/WebCore/inspector/front-end/NetworkPanel.js
index bf04596..320f7c5 100644
--- a/WebCore/inspector/front-end/NetworkPanel.js
+++ b/WebCore/inspector/front-end/NetworkPanel.js
@@ -55,10 +55,10 @@ WebInspector.NetworkPanel = function()
this._viewsContainerElement.className = "hidden";
this.element.appendChild(this._viewsContainerElement);
- var closeButtonElement = document.createElement("button");
- closeButtonElement.id = "network-close-button";
- closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false);
- this.element.appendChild(closeButtonElement);
+ this._closeButtonElement = document.createElement("button");
+ this._closeButtonElement.id = "network-close-button";
+ this._closeButtonElement.addEventListener("click", this._toggleGridMode.bind(this), false);
+ this._viewsContainerElement.appendChild(this._closeButtonElement);
this._createSortingFunctions();
this._createTable();
@@ -106,11 +106,13 @@ WebInspector.NetworkPanel.prototype = {
this._positionSummaryBar();
},
- updateSidebarWidth: function()
+ updateSidebarWidth: function(width)
{
if (!this._viewingResourceMode)
return;
- WebInspector.Panel.prototype.updateSidebarWidth.apply(this, arguments);
+ WebInspector.Panel.prototype.updateSidebarWidth.call(this, width);
+ if (this._summaryBarElement.parentElement === this.element)
+ this._summaryBarElement.style.width = width + "px";
},
updateMainViewWidth: function(width)
@@ -138,6 +140,7 @@ WebInspector.NetworkPanel.prototype = {
delete this._summaryBarRowNode;
}
this._summaryBarElement.addStyleClass("network-summary-bar-bottom");
+ this._summaryBarElement.style.setProperty("width", this.sidebarElement.offsetWidth + "px");
this.element.appendChild(this._summaryBarElement);
this._dataGrid.element.style.bottom = "20px";
return;
@@ -147,6 +150,7 @@ WebInspector.NetworkPanel.prototype = {
// Glue status to table.
this._summaryBarRowNode = new WebInspector.NetworkTotalGridNode(this._summaryBarElement);
this._summaryBarElement.removeStyleClass("network-summary-bar-bottom");
+ this._summaryBarElement.style.removeProperty("width");
this._dataGrid.appendChild(this._summaryBarRowNode);
this._dataGrid.element.style.bottom = 0;
this._sortItems();
@@ -601,11 +605,6 @@ WebInspector.NetworkPanel.prototype = {
this._timelineGrid.addEventDivider(divider);
},
- get resourceTrackingEnabled()
- {
- return this._resourceTrackingEnabled;
- },
-
_createStatusbarButtons: function()
{
this._preserveLogToggle = new WebInspector.StatusBarButton(WebInspector.UIString("Preserve Log upon Navigation"), "record-profile-status-bar-item");
@@ -711,8 +710,8 @@ WebInspector.NetworkPanel.prototype = {
delete this._refreshTimeout;
}
+ var wasScrolledToLastRow = this._dataGrid.isScrolledToLastRow();
var staleItemsLength = this._staleResources.length;
-
var boundariesChanged = false;
for (var i = 0; i < staleItemsLength; ++i) {
@@ -743,6 +742,9 @@ WebInspector.NetworkPanel.prototype = {
this._sortItems();
this._updateSummaryBar();
this._dataGrid.updateWidths();
+
+ if (wasScrolledToLastRow)
+ this._dataGrid.scrollToLastRow();
},
_onPreserveLogClicked: function(e)
@@ -781,6 +783,7 @@ WebInspector.NetworkPanel.prototype = {
this._mainResourceDOMContentTime = -1;
this._viewsContainerElement.removeChildren();
+ this._viewsContainerElement.appendChild(this._closeButtonElement);
this._resetSummaryBar();
},
@@ -1011,6 +1014,7 @@ WebInspector.NetworkPanel.prototype = {
this._viewsContainerElement.addStyleClass("hidden");
this.sidebarElement.style.right = 0;
this.sidebarElement.style.removeProperty("width");
+ this._summaryBarElement.style.removeProperty("width");
}
if (this._briefGrid) {
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index a7a1852..b26b748 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -2671,8 +2671,8 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
background: transparent;
text-shadow: rgba(255, 255, 255, 0.5) 0 1px 0;
vertical-align: middle;
- padding: 1px 7px 2px;
- height: 18px;
+ padding: 3px 7px 2px;
+ height: 21px;
border: 1px solid transparent;
border-bottom: none;
}
diff --git a/WebCore/inspector/front-end/networkPanel.css b/WebCore/inspector/front-end/networkPanel.css
index 9c7581b..1e0e813 100644
--- a/WebCore/inspector/front-end/networkPanel.css
+++ b/WebCore/inspector/front-end/networkPanel.css
@@ -491,6 +491,8 @@
padding-left: 10px;
z-index: 2000;
white-space: pre;
+ overflow : hidden;
+ text-overflow : ellipsis;
}
.network-summary-bar-bottom {
@@ -552,12 +554,16 @@
background-position: 0 0;
background-color: transparent;
border: 0 none transparent;
- top: 4px;
- right: 5px;
+ top: 8px;
+ left: 5px;
z-index: 10;
display: none;
}
+#network-views.small #network-close-button {
+ top: 4px;
+}
+
#network-close-button:hover {
background-position: 14px 0;
}
@@ -570,6 +576,7 @@
display: block;
}
+
.network-sidebar .data-grid.full-grid-mode .viewer-column {
display: none;
}
@@ -638,12 +645,13 @@
#network-views .resource-view .tabbed-pane-header {
height: 31px;
- padding-top: 11px;
+ padding-top: 8px;
+ padding-left: 25px;
}
#network-views.small .resource-view .tabbed-pane-header {
height: 23px;
- padding-top: 3px;
+ padding-top: 0;
}
.network.panel.viewing-resource .data-grid .data-container {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list