[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
pfeldman at chromium.org
pfeldman at chromium.org
Thu Apr 8 00:38:17 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 66168b2b0024265d38315ad9e3dfc1e68ac3f3ee
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 16 10:05:29 2009 +0000
2009-12-15 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: beautify HTTP info section.
https://bugs.webkit.org/show_bug.cgi?id=32583
* English.lproj/localizedStrings.js:
* inspector/front-end/ResourceView.js:
(WebInspector.ResourceView):
(WebInspector.ResourceView.prototype._refreshURL):
(WebInspector.ResourceView.prototype._refreshHTTPInformation):
* inspector/front-end/inspector.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52193 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 2526805..3b36c11 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,18 @@
+2009-12-15 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: beautify HTTP info section.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32583
+
+ * English.lproj/localizedStrings.js:
+ * inspector/front-end/ResourceView.js:
+ (WebInspector.ResourceView):
+ (WebInspector.ResourceView.prototype._refreshURL):
+ (WebInspector.ResourceView.prototype._refreshHTTPInformation):
+ * inspector/front-end/inspector.css:
+
2009-12-13 Roland Steiner <rolandsteiner at chromium.org>
Reviewed by Adam Barth.
diff --git a/WebCore/English.lproj/localizedStrings.js b/WebCore/English.lproj/localizedStrings.js
index b05af87..743a031 100644
Binary files a/WebCore/English.lproj/localizedStrings.js and b/WebCore/English.lproj/localizedStrings.js differ
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index 8175c2f..b26f694 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -54,10 +54,13 @@ WebInspector.ResourceView = function(resource)
this.urlTreeElement.selectable = false;
this.headersTreeOutline.appendChild(this.urlTreeElement);
- this.httpInformationTreeElement = new TreeElement("", null, true);
- this.httpInformationTreeElement.expanded = false;
- this.httpInformationTreeElement.selectable = false;
- this.headersTreeOutline.appendChild(this.httpInformationTreeElement);
+ this.requestMethodTreeElement = new TreeElement("", null, false);
+ this.requestMethodTreeElement.selectable = false;
+ this.headersTreeOutline.appendChild(this.requestMethodTreeElement);
+
+ this.statusCodeTreeElement = new TreeElement("", null, false);
+ this.statusCodeTreeElement.selectable = false;
+ this.headersTreeOutline.appendChild(this.statusCodeTreeElement);
this.requestHeadersTreeElement = new TreeElement("", null, true);
this.requestHeadersTreeElement.expanded = false;
@@ -133,23 +136,8 @@ WebInspector.ResourceView.prototype = {
_refreshURL: function()
{
- var url = this.resource.url;
- var statusCodeImage = "";
- if (this.resource.statusCode) {
- var statusImageSource = "";
-
- if (this.resource.statusCode < 300)
- statusImageSource = "Images/successGreenDot.png";
- else if (this.resource.statusCode < 400)
- statusImageSource = "Images/warningOrangeDot.png";
- else
- statusImageSource = "Images/errorRedDot.png";
-
- statusCodeImage = "<img class=\"resource-status-image\" src=\"" + statusImageSource + "\" title=\"" + WebInspector.Resource.StatusTextForCode(this.resource.statusCode) + "\">";
- }
-
- this.urlTreeElement.title = statusCodeImage + "<span class=\"resource-url\">" + url.escapeHTML() + "</span>";
- this._refreshQueryString();
+ this.urlTreeElement.title = "<div class=\"header-name\">" + WebInspector.UIString("Request URL") + ":</div>" +
+ "<div class=\"header-value\">" + this.resource.url.escapeHTML() + "</div>";
},
_refreshQueryString: function()
@@ -277,28 +265,27 @@ WebInspector.ResourceView.prototype = {
_refreshHTTPInformation: function()
{
- const listElements = 2;
-
- var headerElement = this.httpInformationTreeElement;
- headerElement.removeChildren();
- headerElement.hidden = !this.resource.statusCode;
+ var requestMethodElement = this.requestMethodTreeElement;
+ requestMethodElement.hidden = !this.resource.statusCode;
+ var statusCodeElement = this.statusCodeTreeElement;
+ statusCodeElement.hidden = !this.resource.statusCode;
+ var statusCodeImage = "";
if (this.resource.statusCode) {
- headerElement.title = WebInspector.UIString("HTTP Information") + "<span class=\"header-count\">" + WebInspector.UIString(" (%d)", listElements) + "</span>";
-
- var title = "<div class=\"header-name\">" + WebInspector.UIString("Request Method") + ":</div>";
- title += "<div class=\"header-value\">" + this.resource.requestMethod + "</div>"
-
- var headerTreeElement = new TreeElement(title, null, false);
- headerTreeElement.selectable = false;
- headerElement.appendChild(headerTreeElement);
-
- title = "<div class=\"header-name\">" + WebInspector.UIString("Status Code") + ":</div>";
- title += "<div class=\"header-value\">" + WebInspector.Resource.StatusTextForCode(this.resource.statusCode) + "</div>"
-
- headerTreeElement = new TreeElement(title, null, false);
- headerTreeElement.selectable = false;
- headerElement.appendChild(headerTreeElement);
+ var statusImageSource = "";
+ if (this.resource.statusCode < 300)
+ statusImageSource = "Images/successGreenDot.png";
+ else if (this.resource.statusCode < 400)
+ statusImageSource = "Images/warningOrangeDot.png";
+ else
+ statusImageSource = "Images/errorRedDot.png";
+ statusCodeImage = "<img class=\"resource-status-image\" src=\"" + statusImageSource + "\" title=\"" + WebInspector.Resource.StatusTextForCode(this.resource.statusCode) + "\">";
+
+ requestMethodElement.title = "<div class=\"header-name\">" + WebInspector.UIString("Request Method") + ":</div>" +
+ "<div class=\"header-value\">" + this.resource.requestMethod + "</div>";
+
+ statusCodeElement.title = "<div class=\"header-name\">" + WebInspector.UIString("Status Code") + ":</div>" +
+ statusCodeImage + "<div class=\"header-value\">" + WebInspector.Resource.StatusTextForCode(this.resource.statusCode) + "</div>";
}
},
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index c2862ae..50efe11 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -792,21 +792,17 @@ body.drawer-visible #drawer {
.resource-view-headers .outline-disclosure .header-name {
color: rgb(33%, 33%, 33%);
display: inline-block;
- width: 105px;
- text-align: right;
margin-right: 0.5em;
font-weight: bold;
vertical-align: top;
- overflow: hidden;
- text-overflow: ellipsis;
+ white-space: pre-wrap;
}
.resource-view-headers .outline-disclosure .header-value {
display: inline-block;
- white-space: normal;
+ white-space: pre-wrap;
word-break: break-word;
vertical-align: top;
- margin-right: 100px;
}
.resource-view-headers .outline-disclosure .raw-form-data {
@@ -879,6 +875,7 @@ body.drawer-visible #drawer {
}
.resource-status-image {
+ margin-top: -4px;
vertical-align: middle;
}
@@ -1072,7 +1069,11 @@ body.drawer-visible #drawer {
margin-top: 1px;
margin-bottom: 1px;
word-wrap: break-word;
- text-indent: -2px
+ text-indent: -2px;
+}
+
+.resources .outline-disclosure li {
+ text-indent: 0
}
.outline-disclosure ol:focus li.selected {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list