[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9
pfeldman at chromium.org
pfeldman at chromium.org
Thu Feb 4 21:27:24 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit 2a8b522e2804233bc541d3d3d5103d61e8092245
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Jan 25 16:06:45 2010 +0000
2010-01-25 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: don't show headers/content tabs in scripts view.
https://bugs.webkit.org/show_bug.cgi?id=34083
* inspector/front-end/ResourceView.js:
(WebInspector.ResourceView):
(WebInspector.ResourceView.prototype.set headersVisible):
(WebInspector.ResourceView.prototype._selectContentTab):
(WebInspector.ResourceView.prototype._innerSelectContentTab):
* inspector/front-end/ResourcesPanel.js:
(WebInspector.ResourcesPanel.prototype.show):
(WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
(WebInspector.ResourcesPanel.prototype.showResource):
* inspector/front-end/ScriptsPanel.js:
(WebInspector.ScriptsPanel.prototype.show):
(WebInspector.ScriptsPanel.prototype._showScriptOrResource):
* inspector/front-end/inspector.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53806 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 3b37acf..bef6c3b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,25 @@
+2010-01-25 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: don't show headers/content tabs in scripts view.
+
+ https://bugs.webkit.org/show_bug.cgi?id=34083
+
+ * inspector/front-end/ResourceView.js:
+ (WebInspector.ResourceView):
+ (WebInspector.ResourceView.prototype.set headersVisible):
+ (WebInspector.ResourceView.prototype._selectContentTab):
+ (WebInspector.ResourceView.prototype._innerSelectContentTab):
+ * inspector/front-end/ResourcesPanel.js:
+ (WebInspector.ResourcesPanel.prototype.show):
+ (WebInspector.ResourcesPanel.prototype.recreateViewForResourceIfNeeded):
+ (WebInspector.ResourcesPanel.prototype.showResource):
+ * inspector/front-end/ScriptsPanel.js:
+ (WebInspector.ScriptsPanel.prototype.show):
+ (WebInspector.ScriptsPanel.prototype._showScriptOrResource):
+ * inspector/front-end/inspector.css:
+
2010-01-25 Simon Hausmann <hausmann at webkit.org>
Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index 58b058d..baf5d79 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -107,6 +107,8 @@ WebInspector.ResourceView = function(resource)
this.responseHeadersTreeElement.selectable = false;
this.headersTreeOutline.appendChild(this.responseHeadersTreeElement);
+ this.headersVisible = true;
+
resource.addEventListener("url changed", this._refreshURL, this);
resource.addEventListener("requestHeaders changed", this._refreshRequestHeaders, this);
resource.addEventListener("responseHeaders changed", this._refreshResponseHeaders, this);
@@ -129,10 +131,18 @@ WebInspector.ResourceView.prototype = {
}
},
- show: function(parentElement)
+ set headersVisible(x)
{
- WebInspector.View.prototype.show.call(this, parentElement);
- this._selectTab();
+ if (x === this._headersVisible)
+ return;
+ this._headersVisible = x;
+ if (x) {
+ this.element.addStyleClass("headers-visible");
+ this._selectTab();
+ } else {
+ this.element.removeStyleClass("headers-visible");
+ this._innerSelectContentTab();
+ }
},
_selectTab: function()
@@ -155,6 +165,11 @@ WebInspector.ResourceView.prototype = {
_selectContentTab: function()
{
WebInspector.settings.resourceViewTab = "content";
+ this._innerSelectContentTab();
+ },
+
+ _innerSelectContentTab: function()
+ {
this.contentTabElement.addStyleClass("selected");
this.headersTabElement.removeStyleClass("selected");
this.contentElement.removeStyleClass("hidden");
diff --git a/WebCore/inspector/front-end/ResourcesPanel.js b/WebCore/inspector/front-end/ResourcesPanel.js
index 77c2b42..558a014 100644
--- a/WebCore/inspector/front-end/ResourcesPanel.js
+++ b/WebCore/inspector/front-end/ResourcesPanel.js
@@ -192,9 +192,10 @@ WebInspector.ResourcesPanel.prototype = {
WebInspector.AbstractTimelinePanel.prototype.show.call(this);
var visibleView = this.visibleView;
- if (this.visibleResource)
- visibleView.show(this.viewsContainerElement);
- else if (visibleView)
+ if (this.visibleResource) {
+ this.visibleView.headersVisible = true;
+ this.visibleView.show(this.viewsContainerElement);
+ } else if (visibleView)
visibleView.show();
// Hide any views that are visible that are not this panel's current visible view.
@@ -444,6 +445,8 @@ WebInspector.ResourcesPanel.prototype = {
resource._resourcesView = newView;
+ newView.headersVisible = oldView.headersVisible;
+
if (oldView.visible && oldView.element.parentNode)
newView.show(oldView.element.parentNode);
},
@@ -469,6 +472,7 @@ WebInspector.ResourcesPanel.prototype = {
this.visibleResource._resourcesView.hide();
var view = this.resourceViewForResource(resource);
+ view.headersVisible = true;
view.show(this.viewsContainerElement);
if (line) {
diff --git a/WebCore/inspector/front-end/ScriptsPanel.js b/WebCore/inspector/front-end/ScriptsPanel.js
index 8bced0b..75f5c9c 100644
--- a/WebCore/inspector/front-end/ScriptsPanel.js
+++ b/WebCore/inspector/front-end/ScriptsPanel.js
@@ -229,9 +229,11 @@ WebInspector.ScriptsPanel.prototype = {
WebInspector.Panel.prototype.show.call(this);
this.sidebarResizeElement.style.right = (this.sidebarElement.offsetWidth - 3) + "px";
- if (this.visibleView)
+ if (this.visibleView) {
+ if (this.visibleView instanceof WebInspector.ResourceView)
+ this.visibleView.headersVisible = false;
this.visibleView.show(this.viewsContainerElement);
-
+ }
// Hide any views that are visible that are not this panel's current visible view.
// This can happen when a ResourceView is visible in the Resources panel then switched
// to the this panel.
@@ -608,6 +610,7 @@ WebInspector.ScriptsPanel.prototype = {
if (!WebInspector.panels.resources)
return null;
view = WebInspector.panels.resources.resourceViewForResource(scriptOrResource);
+ view.headersVisible = false;
if (scriptOrResource.url in this._breakpointsURLMap) {
var sourceFrame = this._sourceFrameForScriptOrResource(scriptOrResource);
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index da9cdcd..e0fd2ee 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -779,6 +779,7 @@ body.drawer-visible #drawer {
}
.resource-view .scope-bar {
+ display: none;
position: absolute;
height: 20px;
top: 0;
@@ -788,6 +789,10 @@ body.drawer-visible #drawer {
border-bottom: 1px solid rgb(163, 163, 163);
}
+.resource-view.headers-visible .scope-bar {
+ display: block;
+}
+
.resource-view .scope-bar li {
border-bottom-left-radius: 0;
border-bottom-right-radius: 0;
@@ -797,13 +802,17 @@ body.drawer-visible #drawer {
padding: 6px;
-webkit-user-select: text;
position: absolute;
- top: 20px;
+ top: 0;
left: 0;
right: 0;
bottom: 0;
overflow: auto;
}
+.resource-view.headers-visible .resource-view-headers {
+ top: 20px;
+}
+
.resource-view-headers .outline-disclosure .parent {
-webkit-user-select: none;
font-weight: bold;
@@ -840,12 +849,16 @@ body.drawer-visible #drawer {
.resource-view .resource-view-content {
position: absolute;
- top: 20px;
+ top: 0;
right: 0;
left: 0;
bottom: 0;
}
+.resource-view.headers-visible .resource-view-content {
+ top: 20px;
+}
+
.webkit-line-gutter-backdrop {
/* Keep this in sync with view-source.css (.webkit-line-gutter-backdrop) */
width: 31px;
@@ -2443,7 +2456,6 @@ button.enable-toggle-status-bar-item.toggled-on .glyph {
#script-resource-views {
display: block;
- overflow: auto;
padding: 0;
position: absolute;
top: 23px;
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list