Index: third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js |
diff --git a/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js b/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js |
index 59fc285185ac8b5a1196594187ce87e4288130cb..917f62a9436efff481cddb68f89c1e67d33d9ae1 100644 |
--- a/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js |
+++ b/third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js |
@@ -503,7 +503,6 @@ WebInspector.ConsoleViewMessage.prototype = { |
element = this._formatParameterAsValue(output); |
console.error("Tried to format remote object of unknown type."); |
} |
- element.className = "object-value-" + type + " source-code"; |
return element; |
}, |
@@ -513,7 +512,20 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsValue: function(obj) |
{ |
- var element = createElement("span"); |
+ var element = createElementWithClass("span", "source-code"); |
+ var type = obj.subtype || obj.type; |
+ if (type === "boolean") |
+ element.classList.add("object-value-boolean"); |
+ else if (type === "null") |
+ element.classList.add("object-value-null"); |
+ else if (type === "undefined") |
+ element.classList.add("object-value-undefined"); |
+ else if (type === "number") |
+ element.classList.add("object-value-number"); |
+ else if (type === "regexp" || type === "symbol") |
+ element.classList.add("object-value-regexp"); |
lushnikov
2016/10/18 23:15:19
object-value-string?
|
+ else if (type === "set") |
+ element.classList.add("object-value-set"); |
element.createTextChild(obj.description || ""); |
if (obj.objectId) |
element.addEventListener("contextmenu", this._contextMenuEventFired.bind(this, obj), false); |
@@ -528,7 +540,18 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsObject: function(obj, linkifier, includePreview) |
{ |
- var element = createElement("span"); |
+ var element = createElementWithClass("span", "source-code"); |
+ var type = obj.subtype || obj.type; |
+ if (type === "iterator") |
+ element.classList.add("object-value-iterator"); |
+ else if (type === "map") |
+ element.classList.add("object-value-map"); |
+ else if (type === "object" || type === "promise") |
+ element.classList.add("object-value-object"); |
+ else if (type === "proxy") |
+ element.classList.add("object-value-proxy"); |
+ else if (type === "set") |
+ element.classList.add("object-value-set"); |
var expandableObject = this._formatAsExpandableObject(obj, linkifier, includePreview); |
element.appendChild(expandableObject); |
return element; |
@@ -566,7 +589,12 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsFunction: function(func, includePreview) |
{ |
- var element = createElement("span"); |
+ var element = createElementWithClass("span", "source-code"); |
+ var type = func.subtype || func.type; |
+ if (type === "function") |
+ element.classList.add("object-value-function"); |
+ else if (type === "generator") |
+ element.classList.add("object-value-generator"); |
WebInspector.RemoteFunction.objectAsFunction(func).targetFunction().then(formatTargetFunction.bind(this)); |
return element; |
@@ -618,7 +646,7 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsNode: function(object, linkifier) |
{ |
- var element = createElement("span"); |
+ var element = createElementWithClass("span", "object-value-node source-code"); |
WebInspector.Renderer.renderPromise(object).then(appendRenderer.bind(this), failedToRender.bind(this)); |
return element; |
@@ -654,11 +682,14 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsArray: function(array, linkifier, messageType) |
{ |
- var element = createElement("span"); |
+ var element = createElementWithClass("span", "object-value-array source-code"); |
var usePrintedArrayFormat = messageType !== WebInspector.ConsoleMessage.MessageType.DirXML && messageType !== WebInspector.ConsoleMessage.MessageType.Result; |
var isLongArray = array.arrayLength() > 100; |
- if (usePrintedArrayFormat || isLongArray) |
- return this._formatParameterAsObject(array, linkifier, usePrintedArrayFormat || !isLongArray); |
+ if (usePrintedArrayFormat || isLongArray) { |
+ element = this._formatParameterAsObject(array, linkifier, usePrintedArrayFormat || !isLongArray); |
+ element.classList.add("object-value-array"); |
+ return element; |
+ } |
array.getAllProperties(false, printArrayResult.bind(this)); |
return element; |
@@ -731,8 +762,7 @@ WebInspector.ConsoleViewMessage.prototype = { |
*/ |
_formatParameterAsString: function(output) |
{ |
- var span = createElement("span"); |
- span.className = "object-value-string-inner source-code"; |
+ var span = createElementWithClass("span", "object-value-string source-code"); |
span.appendChild(WebInspector.linkifyStringAsFragment(output.description || "")); |
// Make black quotes. |
@@ -751,7 +781,7 @@ WebInspector.ConsoleViewMessage.prototype = { |
_formatParameterAsError: function(output, linkifier) |
{ |
var element = createElement("span"); |
- var span = element.createChild("span", "object-value-error source-code"); |
+ var span = element.createChild("span", "source-code"); |
var errorSpan = this._tryFormatAsError(output.target(), linkifier, output.description || ""); |
span.appendChild(errorSpan ? errorSpan : WebInspector.linkifyStringAsFragment(output.description || "")); |
return element; |