[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:33 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit 2bee562106003159905a975ed7528e42b9b03421
Author: pfeldman at chromium.org <pfeldman at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 16 18:24:59 2009 +0000
2009-12-16 Pavel Feldman <pfeldman at chromium.org>
Reviewed by Timothy Hatcher.
Web Inspector: Make Elements tree, properties section and resources
view monospace.
https://bugs.webkit.org/show_bug.cgi?id=32609
* inspector/front-end/ElementsPanel.js:
* inspector/front-end/PropertiesSection.js:
(WebInspector.PropertiesSection):
* inspector/front-end/ResourceView.js:
(WebInspector.ResourceView):
* inspector/front-end/inspector.css:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52203 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 74909d0..28acfd2 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,19 @@
+2009-12-16 Pavel Feldman <pfeldman at chromium.org>
+
+ Reviewed by Timothy Hatcher.
+
+ Web Inspector: Make Elements tree, properties section and resources
+ view monospace.
+
+ https://bugs.webkit.org/show_bug.cgi?id=32609
+
+ * inspector/front-end/ElementsPanel.js:
+ * inspector/front-end/PropertiesSection.js:
+ (WebInspector.PropertiesSection):
+ * inspector/front-end/ResourceView.js:
+ (WebInspector.ResourceView):
+ * inspector/front-end/inspector.css:
+
2009-12-16 Dirk Schulze <krit at webkit.org>
Reviewed by Darin Adler.
diff --git a/WebCore/inspector/front-end/ConsoleView.js b/WebCore/inspector/front-end/ConsoleView.js
index 21299f7..501b9ac 100644
--- a/WebCore/inspector/front-end/ConsoleView.js
+++ b/WebCore/inspector/front-end/ConsoleView.js
@@ -45,6 +45,7 @@ WebInspector.ConsoleView = function(drawer)
this.messagesElement.addEventListener("click", this._messagesClicked.bind(this), true);
this.promptElement = document.getElementById("console-prompt");
+ this.promptElement.className = "source-code";
this.promptElement.addEventListener("keydown", this._promptKeyDown.bind(this), true);
this.prompt = new WebInspector.TextPrompt(this.promptElement, this.completions.bind(this), ExpressionStopCharacters + ".");
@@ -482,7 +483,7 @@ WebInspector.ConsoleView.prototype = {
}
var span = document.createElement("span");
- span.addStyleClass("console-formatted-" + type);
+ span.className = "console-formatted-" + type + " source-code";
formatter.call(this, output, span);
return span;
},
@@ -570,7 +571,7 @@ WebInspector.ConsoleMessage.prototype = {
switch (this.type) {
case WebInspector.ConsoleMessage.MessageType.Trace:
var span = document.createElement("span");
- span.addStyleClass("console-formatted-trace");
+ span.className = "console-formatted-trace source-code";
var stack = Array.prototype.slice.call(args);
var funcNames = stack.map(function(f) {
return f || WebInspector.UIString("(anonymous function)");
@@ -748,7 +749,7 @@ WebInspector.ConsoleMessage.prototype = {
}
var messageTextElement = document.createElement("span");
- messageTextElement.className = "console-message-text";
+ messageTextElement.className = "console-message-text source-code";
if (this.type === WebInspector.ConsoleMessage.MessageType.Assert)
messageTextElement.appendChild(document.createTextNode(WebInspector.UIString("Assertion failed: ")));
messageTextElement.appendChild(this.formattedMessage);
@@ -895,7 +896,7 @@ WebInspector.ConsoleCommand.prototype = {
element.className = "console-user-command";
var commandTextElement = document.createElement("span");
- commandTextElement.className = "console-message-text";
+ commandTextElement.className = "console-message-text source-code";
commandTextElement.textContent = this.command;
element.appendChild(commandTextElement);
diff --git a/WebCore/inspector/front-end/ElementsPanel.js b/WebCore/inspector/front-end/ElementsPanel.js
index 7c78902..03d024c 100644
--- a/WebCore/inspector/front-end/ElementsPanel.js
+++ b/WebCore/inspector/front-end/ElementsPanel.js
@@ -36,7 +36,7 @@ WebInspector.ElementsPanel = function()
this.contentElement = document.createElement("div");
this.contentElement.id = "elements-content";
- this.contentElement.className = "outline-disclosure";
+ this.contentElement.className = "outline-disclosure source-code";
this.treeOutline = new WebInspector.ElementsTreeOutline();
this.treeOutline.panel = this;
diff --git a/WebCore/inspector/front-end/PropertiesSection.js b/WebCore/inspector/front-end/PropertiesSection.js
index bc2eb4c..5ced9ef 100644
--- a/WebCore/inspector/front-end/PropertiesSection.js
+++ b/WebCore/inspector/front-end/PropertiesSection.js
@@ -32,7 +32,7 @@ WebInspector.PropertiesSection = function(title, subtitle)
WebInspector.Section.call(this, title, subtitle);
this.propertiesElement = document.createElement("ol");
- this.propertiesElement.className = "properties";
+ this.propertiesElement.className = "properties source-code";
this.propertiesElement.tabIndex = 0;
this.propertiesTreeOutline = new TreeOutline(this.propertiesElement);
this.propertiesTreeOutline.section = this;
diff --git a/WebCore/inspector/front-end/ResourceView.js b/WebCore/inspector/front-end/ResourceView.js
index b26f694..180f232 100644
--- a/WebCore/inspector/front-end/ResourceView.js
+++ b/WebCore/inspector/front-end/ResourceView.js
@@ -137,7 +137,7 @@ WebInspector.ResourceView.prototype = {
_refreshURL: function()
{
this.urlTreeElement.title = "<div class=\"header-name\">" + WebInspector.UIString("Request URL") + ":</div>" +
- "<div class=\"header-value\">" + this.resource.url.escapeHTML() + "</div>";
+ "<div class=\"header-value source-code\">" + this.resource.url.escapeHTML() + "</div>";
},
_refreshQueryString: function()
@@ -183,7 +183,7 @@ WebInspector.ResourceView.prototype = {
this.requestPayloadTreeElement.removeChildren();
var title = "<div class=\"header-name\"> </div>";
- title += "<div class=\"raw-form-data header-value\">" + formData.escapeHTML() + "</div>";
+ title += "<div class=\"raw-form-data header-value source-code\">" + formData.escapeHTML() + "</div>";
var parmTreeElement = new TreeElement(title, null, false);
parmTreeElement.selectable = false;
this.requestPayloadTreeElement.appendChild(parmTreeElement);
@@ -226,7 +226,7 @@ WebInspector.ResourceView.prototype = {
valueEscaped += " <span class=\"error-message\">" + WebInspector.UIString("(unable to decode value)").escapeHTML() + "</span>";
var title = "<div class=\"header-name\">" + key.escapeHTML() + ":</div>";
- title += "<div class=\"header-value\">" + valueEscaped + "</div>";
+ title += "<div class=\"header-value source-code\">" + valueEscaped + "</div>";
var parmTreeElement = new TreeElement(title, null, false);
parmTreeElement.selectable = false;
@@ -282,10 +282,10 @@ WebInspector.ResourceView.prototype = {
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>";
+ "<div class=\"header-value source-code\">" + 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>";
+ statusCodeImage + "<div class=\"header-value source-code\">" + WebInspector.Resource.StatusTextForCode(this.resource.statusCode) + "</div>";
}
},
@@ -300,7 +300,7 @@ WebInspector.ResourceView.prototype = {
var length = headers.length;
for (var i = 0; i < length; ++i) {
var title = "<div class=\"header-name\">" + headers[i].header.escapeHTML() + ":</div>";
- title += "<div class=\"header-value\">" + headers[i].value.escapeHTML() + "</div>"
+ title += "<div class=\"header-value source-code\">" + headers[i].value.escapeHTML() + "</div>"
var headerTreeElement = new TreeElement(title, null, false);
headerTreeElement.selectable = false;
diff --git a/WebCore/inspector/front-end/inspector.css b/WebCore/inspector/front-end/inspector.css
index 50efe11..8d603a2 100644
--- a/WebCore/inspector/front-end/inspector.css
+++ b/WebCore/inspector/front-end/inspector.css
@@ -690,7 +690,7 @@ body.drawer-visible #drawer {
.console-group-messages .outline-disclosure, .console-group-messages .outline-disclosure ol {
font-size: inherit;
- line-height: 1em;
+ line-height: 12px;
}
.console-group-messages .outline-disclosure.single-node li {
@@ -799,10 +799,11 @@ body.drawer-visible #drawer {
}
.resource-view-headers .outline-disclosure .header-value {
- display: inline-block;
+ display: inline;
+ margin-right: 100px;
white-space: pre-wrap;
- word-break: break-word;
- vertical-align: top;
+ word-break: break-all;
+ margin-top: 1px;
}
.resource-view-headers .outline-disclosure .raw-form-data {
@@ -875,7 +876,7 @@ body.drawer-visible #drawer {
}
.resource-status-image {
- margin-top: -4px;
+ margin-top: -3px;
vertical-align: middle;
}
@@ -1048,6 +1049,10 @@ body.drawer-visible #drawer {
background-color: rgb(56, 121, 217);
}
+.outline-disclosure {
+ font-size: 11px;
+}
+
.outline-disclosure > ol {
position: relative;
padding: 2px 6px !important;
@@ -1059,13 +1064,31 @@ body.drawer-visible #drawer {
.outline-disclosure, .outline-disclosure ol {
list-style-type: none;
- font-size: 11px;
-webkit-padding-start: 12px;
margin: 0;
}
+.source-code {
+ font-family: monospace;
+ font-size: 10px;
+ white-space: pre-wrap;
+}
+
+body.platform-mac-tiger .source-code {
+ font-family: Monaco, monospace;
+}
+
+body.platform-mac-leopard .source-code {
+ font-family: Monaco, monospace;
+}
+
+body.platform-windows .source-code {
+ font-family: Consolas, Lucida Console, monospace;
+ font-size: 12px;
+}
+
.outline-disclosure li {
- padding: 0 0 2px 14px;
+ padding: 0 0 0 14px;
margin-top: 1px;
margin-bottom: 1px;
word-wrap: break-word;
@@ -1073,7 +1096,7 @@ body.drawer-visible #drawer {
}
.resources .outline-disclosure li {
- text-indent: 0
+ text-indent: -1px;
}
.outline-disclosure ol:focus li.selected {
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list