Backed out changeset 754ea885a0f8, bug 605621. Crash. a=tree

This commit is contained in:
Rob Campbell 2011-01-19 16:41:50 -04:00
parent 724bb75d17
commit 3fe6268ef2
4 changed files with 138 additions and 302 deletions

View File

@ -4892,6 +4892,10 @@ ConsoleUtils = {
"without any clipboard text");
}
// Make the marker (the colored part of the timeline).
let markerNode = aDocument.createElementNS(XUL_NS, "xul:vbox");
markerNode.classList.add("webconsole-marker");
// Make the icon container, which is a vertical box. Its purpose is to
// ensure that the icon stays anchored at the top of the message even for
// long multi-line messages.
@ -4948,6 +4952,7 @@ ConsoleUtils = {
ConsoleUtils.setMessageType(node, aCategory, aSeverity);
node.appendChild(timestampNode);
node.appendChild(markerNode);
node.appendChild(iconContainer);
node.appendChild(bodyNode);
if (locationNode) {

View File

@ -60,23 +60,10 @@
overflow: auto;
}
/* General output styles */
.webconsole-timestamp {
color: GrayText;
margin-top: 0;
margin-bottom: 0;
}
.webconsole-msg-icon {
list-style-image: url(chrome://global/skin/icons/webconsole.png);
margin: 2px 3px;
width: 10px;
height: 10px;
}
.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
visibility: hidden;
.hud-main-label {
font-size: 1em;
padding-top: 0.33em;
font-weight: bold;
}
.hud-clickable {
@ -84,38 +71,49 @@
text-decoration: underline;
}
.webconsole-msg-body {
margin-top: 0;
margin-bottom: 3px;
-moz-margin-start: 3px;
-moz-margin-end: 6px;
.hud-network {
color: blue;
}
.webconsole-location {
margin-top: 0;
margin-bottom: 0;
-moz-margin-start: 0;
-moz-margin-end: 6px;
width: 10em;
text-align: end;
.hud-error {
color: red;
}
.hud-msg-node[selected="true"] > .webconsole-timestamp,
.hud-msg-node[selected="true"] > .webconsole-location {
color: inherit;
.hud-log {
color: black;
}
.hud-output-node,
.jsterm-input-node,
.jsterm-complete-node {
font: 12px "DejaVu Sans Mono", monospace;
.hud-warn {
color: orange;
}
.hud-info {
color: green;
}
.hud-exception {
color: red;
font-weight: bold;
}
.hud-msg-node {
width: 100%;
margin-top: 0.3em;
margin-bottom: 0.3em;
padding-left: 1em;
-moz-user-select: text;
white-space: pre-wrap;
-moz-user-focus: normal;
}
.hud-output-node {
-moz-appearance: none;
border-bottom: 1px solid ThreeDShadow;
border-top: 1px solid ThreeDShadow;
margin: 0;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
overflow-x: auto;
overflow: auto;
font: 1em monospace;
background-color: white;
width: 100%;
}
.hud-filtered-by-type,
@ -133,81 +131,26 @@
list-style-image: url("chrome://global/skin/icons/webconsole.png");
}
/* Network styles */
/* Network button */
.webconsole-filter-button[category="net"] {
-moz-image-region: rect(0, 40px, 10px, 30px);
-moz-image-region: rect(0px, 40px, 10px, 30px);
}
.webconsole-msg-network > .webconsole-msg-icon-container {
-moz-border-start: solid #000 6px;
}
.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(0, 10px, 10px, 0);
}
/* CSS styles */
/* CSS button */
.webconsole-filter-button[category="css"] {
-moz-image-region: rect(10px, 40px, 20px, 30px);
}
.webconsole-msg-cssparser > .webconsole-msg-icon-container {
-moz-border-start: solid #00b6f0 6px;
}
.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 10px, 20px, 0);
}
.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 20px, 20px, 10px);
}
/* JS styles */
/* JS button */
.webconsole-filter-button[category="js"] {
-moz-image-region: rect(20px, 40px, 30px, 30px);
}
.webconsole-msg-exception > .webconsole-msg-icon-container {
-moz-border-start: solid #fb9500 6px;
}
.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 10px, 30px, 0);
}
.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 20px, 30px, 10px);
}
/* Web Developer styles */
/* Web Developer button */
.webconsole-filter-button[category="webdev"] {
-moz-image-region: rect(30px, 40px, 40px, 30px);
}
.webconsole-msg-console > .webconsole-msg-icon-container {
-moz-border-start: solid #cbcbcb 6px;
}
.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 10px, 40px, 0);
}
.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 20px, 40px, 10px);
}
.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 30px, 40px, 20px);
}
/* Input and output styles */
.webconsole-msg-input > .webconsole-msg-icon-container,
.webconsole-msg-output > .webconsole-msg-icon-container {
border-left: solid #808080 6px;
}
.webconsole-close-button {
list-style-image: url("moz-icon://stock/gtk-close?size=menu");
}
@ -245,6 +188,8 @@
.jsterm-input-node,
.jsterm-complete-node {
font-family: monospace;
font-size: 9pt;
border: none;
padding: 0 0 0 16px;
-moz-appearance: none;

View File

@ -63,23 +63,10 @@
overflow: auto;
}
/* General output styles */
.webconsole-timestamp {
color: GrayText;
margin-top: 0;
margin-bottom: 0;
}
.webconsole-msg-icon {
list-style-image: url(chrome://global/skin/icons/webconsole.png);
margin: 2px 3px;
width: 10px;
height: 10px;
}
.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
visibility: hidden;
.hud-main-label {
font-size: 1em;
padding-top: 0.33em;
font-weight: bold;
}
.hud-clickable {
@ -87,38 +74,49 @@
text-decoration: underline;
}
.webconsole-msg-body {
margin-top: 0;
margin-bottom: 3px;
-moz-margin-start: 3px;
-moz-margin-end: 6px;
.hud-network {
color: blue;
}
.webconsole-location {
margin-top: 0;
margin-bottom: 0;
-moz-margin-start: 0;
-moz-margin-end: 6px;
width: 10em;
text-align: end;
.hud-error {
color: red;
}
.hud-msg-node[selected="true"] > .webconsole-timestamp,
.hud-msg-node[selected="true"] > .webconsole-location {
color: inherit;
.hud-log {
color: black;
}
.hud-output-node,
.jsterm-input-node,
.jsterm-complete-node {
font: 11px Menlo, Monaco, monospace;
.hud-warn {
color: orange;
}
.hud-info {
color: green;
}
.hud-exception {
color: red;
font-weight: bold;
}
.hud-msg-node {
width: 100%;
margin-top: 0.3em;
margin-bottom: 0.3em;
padding-left: 1em;
-moz-user-select: text;
white-space: pre-wrap;
-moz-user-focus: normal;
}
.hud-output-node {
-moz-appearance: none;
border-bottom: 1px solid ThreeDShadow;
border-top: 1px solid ThreeDShadow;
margin: 0;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
overflow-x: auto;
overflow: auto;
font: 1em monospace;
background-color: white;
width: 100%;
}
.hud-filtered-by-type,
@ -187,85 +185,26 @@
-moz-border-start: dotted #aaaaaa 1px;
}
.webconsole-new-group {
margin-top: 6px;
}
/* Network styles */
/* Network button */
.webconsole-filter-button[category="net"] {
-moz-image-region: rect(0, 40px, 10px, 30px);
}
.webconsole-msg-network > .webconsole-msg-icon-container {
-moz-border-start: solid #000 6px;
}
.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(0, 10px, 10px, 0);
}
/* CSS styles */
/* CSS button */
.webconsole-filter-button[category="css"] {
-moz-image-region: rect(10px, 40px, 20px, 30px);
}
.webconsole-msg-cssparser > .webconsole-msg-icon-container {
-moz-border-start: solid #00b6f0 6px;
}
.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 10px, 20px, 0);
}
.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 20px, 20px, 10px);
}
/* JS styles */
/* JS button */
.webconsole-filter-button[category="js"] {
-moz-image-region: rect(20px, 40px, 30px, 30px);
}
.webconsole-msg-exception > .webconsole-msg-icon-container {
-moz-border-start: solid #fb9500 6px;
}
.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 10px, 30px, 0);
}
.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 20px, 30px, 10px);
}
/* Web Developer styles */
/* Web Developer button */
.webconsole-filter-button[category="webdev"] {
-moz-image-region: rect(30px, 40px, 40px, 30px);
}
.webconsole-msg-console > .webconsole-msg-icon-container {
-moz-border-start: solid #cbcbcb 6px;
}
.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 10px, 40px, 0);
}
.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 20px, 40px, 10px);
}
.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 30px, 40px, 20px);
}
/* Input and output styles */
.webconsole-msg-input > .webconsole-msg-icon-container,
.webconsole-msg-output > .webconsole-msg-icon-container {
border-left: solid #808080 6px;
}
.webconsole-close-button {
list-style-image: url("chrome://global/skin/icons/closetab.png");
margin-top: 0;
@ -317,6 +256,8 @@
.jsterm-input-node,
.jsterm-complete-node {
font-family: monospace;
font-size: 9pt;
border: none;
padding: 0 0 0 16px;
-moz-appearance: none;

View File

@ -59,23 +59,10 @@
overflow: auto;
}
/* General output styles */
.webconsole-timestamp {
color: GrayText;
margin-top: 0;
margin-bottom: 0;
}
.webconsole-msg-icon {
list-style-image: url(chrome://global/skin/icons/webconsole.png);
margin: 2px 3px;
width: 10px;
height: 10px;
}
.webconsole-msg-log > .webconsole-msg-icon-container > .webconsole-msg-icon {
visibility: hidden;
.hud-main-label {
font-size: 1em;
padding-top: 0.33em;
font-weight: bold;
}
.hud-clickable {
@ -83,38 +70,49 @@
text-decoration: underline;
}
.webconsole-msg-body {
margin-top: 0;
margin-bottom: 3px;
-moz-margin-start: 3px;
-moz-margin-end: 6px;
.hud-network {
color: blue;
}
.webconsole-location {
margin-top: 0;
margin-bottom: 0;
-moz-margin-start: 0;
-moz-margin-end: 6px;
width: 10em;
text-align: end;
.hud-error {
color: red;
}
.hud-msg-node[selected="true"] > .webconsole-timestamp,
.hud-msg-node[selected="true"] > .webconsole-location {
color: inherit;
.hud-log {
color: black;
}
.hud-output-node,
.jsterm-input-node,
.jsterm-complete-node {
font: 12px Consolas, Lucida Console, monospace;
.hud-warn {
color: orange;
}
.hud-info {
color: green;
}
.hud-exception {
color: red;
font-weight: bold;
}
.hud-msg-node {
width: 100%;
margin-top: 0.3em;
margin-bottom: 0.3em;
padding-left: 1em;
-moz-user-select: text;
white-space: pre-wrap;
-moz-user-focus: normal;
}
.hud-output-node {
-moz-appearance: none;
border-bottom: 1px solid ThreeDShadow;
border-top: 1px solid ThreeDShadow;
margin: 0;
border-bottom: 1px solid #ddd;
border-top: 1px solid #ddd;
overflow-x: auto;
overflow: auto;
font: 1em monospace;
background-color: white;
width: 100%;
}
.hud-filtered-by-type,
@ -131,81 +129,26 @@
list-style-image: url("chrome://global/skin/icons/webconsole.png");
}
/* Network styles */
/* Network button */
.webconsole-filter-button[category="net"] {
-moz-image-region: rect(0, 40px, 10px, 30px);
}
.webconsole-msg-network > .webconsole-msg-icon-container {
-moz-border-start: solid #000 6px;
}
.webconsole-msg-network.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(0, 10px, 10px, 0);
}
/* CSS styles */
/* CSS button */
.webconsole-filter-button[category="css"] {
-moz-image-region: rect(10px, 40px, 20px, 30px);
}
.webconsole-msg-cssparser > .webconsole-msg-icon-container {
-moz-border-start: solid #00b6f0 6px;
}
.webconsole-msg-cssparser.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 10px, 20px, 0);
}
.webconsole-msg-cssparser.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(10px, 20px, 20px, 10px);
}
/* JS styles */
/* JS button */
.webconsole-filter-button[category="js"] {
-moz-image-region: rect(20px, 40px, 30px, 30px);
}
.webconsole-msg-exception > .webconsole-msg-icon-container {
-moz-border-start: solid #fb9500 6px;
}
.webconsole-msg-exception.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 10px, 30px, 0);
}
.webconsole-msg-exception.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(20px, 20px, 30px, 10px);
}
/* Web Developer styles */
/* Web Developer button */
.webconsole-filter-button[category="webdev"] {
-moz-image-region: rect(30px, 40px, 40px, 30px);
}
.webconsole-msg-console > .webconsole-msg-icon-container {
-moz-border-start: solid #cbcbcb 6px;
}
.webconsole-msg-console.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon,
.webconsole-msg-output.webconsole-msg-error > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 10px, 40px, 0);
}
.webconsole-msg-console.webconsole-msg-warn > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 20px, 40px, 10px);
}
.webconsole-msg-console.webconsole-msg-info > .webconsole-msg-icon-container > .webconsole-msg-icon {
-moz-image-region: rect(30px, 30px, 40px, 20px);
}
/* Input and output styles */
.webconsole-msg-input > .webconsole-msg-icon-container,
.webconsole-msg-output > .webconsole-msg-icon-container {
border-left: solid #808080 6px;
}
.webconsole-close-button {
border: none;
padding: 3px;
@ -255,6 +198,8 @@
.jsterm-input-node,
.jsterm-complete-node {
font-family: monospace;
font-size: 9pt;
border: none;
padding: 0 0 0 16px;
-moz-appearance: none;