DO NOT COMMIT DevTools: minor cleanup for ConsoleViewMessage

third_party/WebKit/Source/devtools/front_end/console/ConsoleViewMessage.js

 /*
  * Copyright (C) 2011 Google Inc.  All rights reserved.
  * Copyright (C) 2007, 2008 Apple Inc.  All rights reserved.
  * Copyright (C) 2009 Joseph Pecoraro
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1.  Redistributions of source code must retain the above copyright
@@ skipping 103 matching lines @@
 
     /**
      * @return {!WebInspector.ConsoleMessage}
      */
     consoleMessage: function()
     {
         return this._message;
     },
 
     /**
-     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {!Element}
      */
-    _buildTableMessage: function(consoleMessage)
+    _buildTableMessage: function()
     {
         var formattedMessage = createElement("span");
         WebInspector.appendStyle(formattedMessage, "components/objectValue.css");
         formattedMessage.className = "console-message-text source-code";
-        var anchorElement = this._buildMessageAnchor(consoleMessage);
+        var anchorElement = this._buildMessageAnchor();
         if (anchorElement)
             formattedMessage.appendChild(anchorElement);
 
-        var table = consoleMessage.parameters && consoleMessage.parameters.length ? consoleMessage.parameters[0] : null;
+        var table = this._message.parameters && this._message.parameters.length ? this._message.parameters[0] : null;
         if (table)
             table = this._parameterToRemoteObject(table, this._target());
         if (!table || !table.preview)
             return formattedMessage;
 
         var columnNames = [];
         var preview = table.preview;
         var rows = [];
         for (var i = 0; i < preview.properties.length; ++i) {
             var rowProperty = preview.properties[i];
@@ skipping 31 matching lines @@
                 flatValues.push(rowValue[columnNames[j]]);
         }
         columnNames.unshift(WebInspector.UIString("(index)"));
 
         if (flatValues.length) {
             this._dataGrid = WebInspector.SortableDataGrid.create(columnNames, flatValues);
 
             var formattedResult = createElement("span");
             var tableElement = formattedResult.createChild("div", "console-message-formatted-table");
             var dataGridContainer = tableElement.createChild("span");
-            tableElement.appendChild(this._formatParameter(table, true, false));
+            tableElement.appendChild(this._formatParameter(table, true));
             dataGridContainer.appendChild(this._dataGrid.element);
             formattedMessage.appendChild(formattedResult);
             this._dataGrid.renderInline();
         }
         return formattedMessage;
     },
 
     /**
-     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {!Element}
      */
-    _buildMessage: function(consoleMessage)
+    _buildMessage: function()
     {
         var messageElement;
+        var consoleMessage = this._message;
         if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI) {
             switch (consoleMessage.type) {
             case WebInspector.ConsoleMessage.MessageType.Trace:
                 messageElement = this._format(consoleMessage.parameters || ["console.trace"]);
                 break;
             case WebInspector.ConsoleMessage.MessageType.Clear:
                 messageElement = createElementWithClass("span", "console-info");
                 messageElement.textContent = WebInspector.UIString("Console was cleared");
                 break;
             case WebInspector.ConsoleMessage.MessageType.Assert:
@@ skipping 36 matching lines @@
             }
         } else {
             var args = consoleMessage.parameters || [consoleMessage.messageText];
             messageElement = this._format(args);
         }
 
         var formattedMessage = createElement("span");
         WebInspector.appendStyle(formattedMessage, "components/objectValue.css");
         formattedMessage.className = "console-message-text source-code";
 
-        var anchorElement = this._buildMessageAnchor(consoleMessage);
+        var anchorElement = this._buildMessageAnchor();
         if (anchorElement)
             formattedMessage.appendChild(anchorElement);
         formattedMessage.appendChild(messageElement);
         return formattedMessage;
 
         /**
          * @param {string} title
          * @return {!Element}
          * @this {WebInspector.ConsoleMessage}
          */
         function linkifyRequest(title)
         {
             return WebInspector.Linkifier.linkifyUsingRevealer(/** @type {!WebInspector.NetworkRequest} */ (this.request), title, this.request.url);
         }
     },
 
     /**
-     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {?Element}
      */
-    _buildMessageAnchor: function(consoleMessage)
+    _buildMessageAnchor: function()
     {
         var anchorElement = null;
+        var consoleMessage = this._message;
         if (consoleMessage.source !== WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.request) {
-            if (consoleMessage.scriptId)
-                anchorElement = this._linkifyScriptId(consoleMessage.scriptId, consoleMessage.url || "", consoleMessage.line, consoleMessage.column);
-            else if (consoleMessage.stackTrace && consoleMessage.stackTrace.callFrames.length)
-                anchorElement = this._linkifyStackTraceTopFrame(consoleMessage.stackTrace);
-            else if (consoleMessage.url && consoleMessage.url !== "undefined")
-                anchorElement = this._linkifyLocation(consoleMessage.url, consoleMessage.line, consoleMessage.column);
+            var target = consoleMessage.target();
+            if (target) {
+                if (consoleMessage.scriptId)
+                    anchorElement = this._linkifier.linkifyScriptLocation(target, consoleMessage.scriptId, consoleMessage.url || "", consoleMessage.line, consoleMessage.column, "console-message-url");
+                else if (consoleMessage.stackTrace && consoleMessage.stackTrace.callFrames.length)
+                    anchorElement = this._linkifier.linkifyStackTraceTopFrame(target, consoleMessage.stackTrace, "console-message-url");
+                else if (consoleMessage.url && consoleMessage.url !== "undefined")
+                    anchorElement = this._linkifier.linkifyScriptLocation(target, null, consoleMessage.url, consoleMessage.line, consoleMessage.column, "console-message-url");
+            }
         } else if (consoleMessage.url) {
             var url = consoleMessage.url;
             var isExternal = !WebInspector.resourceForURL(url) && !WebInspector.networkMapping.uiSourceCodeForURLForAnyTarget(url);
             anchorElement = WebInspector.linkifyURLAsNode(url, url, "console-message-url", isExternal);
         }
 
         // Append a space to prevent the anchor text from being glued to the console message when the user selects and copies the console messages.
         if (anchorElement)
             anchorElement.appendChild(createTextNode(" "));
         return anchorElement;
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @param {!WebInspector.Target} target
      * @param {!WebInspector.Linkifier} linkifier
      * @return {!Element}
      */
     _buildMessageWithStackTrace: function(consoleMessage, target, linkifier)
     {
         var toggleElement = createElementWithClass("div", "console-message-stack-trace-toggle");
         var triangleElement = toggleElement.createChild("div", "console-message-stack-trace-triangle");
         var contentElement = toggleElement.createChild("div", "console-message-stack-trace-wrapper");
 
-        var messageElement = this._buildMessage(consoleMessage);
+        var messageElement = this._buildMessage();
         var clickableElement = contentElement.createChild("div");
         clickableElement.appendChild(messageElement);
         var stackTraceElement = contentElement.createChild("div");
         var stackTracePreview = WebInspector.DOMPresentationUtils.buildStackTracePreviewContents(target, linkifier, consoleMessage.stackTrace);
         stackTraceElement.appendChild(stackTracePreview);
         stackTraceElement.classList.add("hidden");
 
         /**
          * @param {boolean} expand
          */
@@ skipping 17 matching lines @@
         clickableElement.addEventListener("click", toggleStackTrace, false);
         triangleElement.addEventListener("click", toggleStackTrace, false);
         if (consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace)
             expandStackTrace(true);
 
         toggleElement._expandStackTraceForTest = expandStackTrace.bind(null, true);
         return toggleElement;
     },
 
     /**
-     * @param {string} url
-     * @param {number} lineNumber
-     * @param {number} columnNumber
-     * @return {?Element}
-     */
-    _linkifyLocation: function(url, lineNumber, columnNumber)
-    {
-        var target = this._target();
-        if (!target)
-            return null;
-        return this._linkifier.linkifyScriptLocation(target, null, url, lineNumber, columnNumber, "console-message-url");
-    },
-
-    /**
-     * @param {!RuntimeAgent.StackTrace} stackTrace
-     * @return {?Element}
-     */
-    _linkifyStackTraceTopFrame: function(stackTrace)
-    {
-        var target = this._target();
-        if (!target)
-            return null;
-        return this._linkifier.linkifyStackTraceTopFrame(target, stackTrace, "console-message-url");
-    },
-
-    /**
-     * @param {string} scriptId
-     * @param {string} url
-     * @param {number} lineNumber
-     * @param {number} columnNumber
-     * @return {?Element}
-     */
-    _linkifyScriptId: function(scriptId, url, lineNumber, columnNumber)
-    {
-        var target = this._target();
-        if (!target)
-            return null;
-        return this._linkifier.linkifyScriptLocation(target, scriptId, url, lineNumber, columnNumber, "console-message-url");
-    },
-
-    /**
      * @param {!WebInspector.RemoteObject|!Object|string} parameter
      * @param {?WebInspector.Target} target
      * @return {!WebInspector.RemoteObject}
      */
     _parameterToRemoteObject: function(parameter, target)
     {
         if (parameter instanceof WebInspector.RemoteObject)
             return parameter;
         if (!target)
             return WebInspector.RemoteObject.fromLocalObject(parameter);
@@ skipping 14 matching lines @@
             return formattedResult;
 
         // Formatting code below assumes that parameters are all wrappers whereas frontend console
         // API allows passing arbitrary values as messages (strings, numbers, etc.). Wrap them here.
         // FIXME: Only pass runtime wrappers here.
         for (var i = 0; i < parameters.length; ++i)
             parameters[i] = this._parameterToRemoteObject(parameters[i], this._target());
 
         // There can be string log and string eval result. We distinguish between them based on message type.
         var shouldFormatMessage = WebInspector.RemoteObject.type((/** @type {!Array.<!WebInspector.RemoteObject>} **/ (parameters))[0]) === "string" && (this._message.type !== WebInspector.ConsoleMessage.MessageType.Result || this._message.level === WebInspector.ConsoleMessage.MessageLevel.Error || this._message.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError);
+        var showUndefinedsInArrays = this._message.type === WebInspector.ConsoleMessage.MessageType.DirXML || this._message.type === WebInspector.ConsoleMessage.MessageType.Result;
 
         // Multiple parameters with the first being a format string. Save unused substitutions.
         if (shouldFormatMessage) {
-            var result = this._formatWithSubstitutionString(/** @type {string} **/ (parameters[0].description), parameters.slice(1), formattedResult);
+            var result = this._formatWithSubstitutionString(/** @type {string} **/ (parameters[0].description), parameters.slice(1), formattedResult, showUndefinedsInArrays);
             parameters = result.unusedSubstitutions;
             if (parameters.length)
                 formattedResult.createTextChild(" ");
         }
 
         // Single parameter, or unused substitutions from above.
         for (var i = 0; i < parameters.length; ++i) {
             // Inline strings when formatting.
             if (shouldFormatMessage && parameters[i].type === "string")
                 formattedResult.appendChild(WebInspector.linkifyStringAsFragment(parameters[i].description));
             else
-                formattedResult.appendChild(this._formatParameter(parameters[i], false, true));
+                formattedResult.appendChild(this._formatParameter(parameters[i], false, true, showUndefinedsInArrays));
             if (i < parameters.length - 1)
                 formattedResult.createTextChild(" ");
         }
         return formattedResult;
     },
 
     /**
      * @param {!WebInspector.RemoteObject} output
      * @param {boolean=} forceObjectFormat
      * @param {boolean=} includePreview
+     * @param {boolean=} showUndefinedsInArrays
      * @return {!Element}
      */
-    _formatParameter: function(output, forceObjectFormat, includePreview)
+    _formatParameter: function(output, forceObjectFormat, includePreview, showUndefinedsInArrays)
     {
         if (output.customPreview())
             return (new WebInspector.CustomPreviewComponent(output)).element;
 
         var type = forceObjectFormat ? "object" : (output.subtype || output.type);
         var element;
         switch (type) {
         case "array":
         case "typedarray":
-            element = this._formatParameterAsArray(output);
+            element = this._formatParameterAsArray(output, showUndefinedsInArrays);
             break;
         case "error":
             element = this._formatParameterAsError(output);
             break;
         case "function":
         case "generator":
             element = this._formatParameterAsFunction(output, includePreview);
             break;
         case "iterator":
         case "map":
@@ skipping 144 matching lines @@
             result.appendChild(this._formatParameterAsObject(object, false));
         }
     },
 
     _formattedParameterAsNodeForTest: function()
     {
     },
 
     /**
      * @param {!WebInspector.RemoteObject} array
+     * @param {boolean=} showUndefinedsInArrays
      * @return {!Element}
      */
-    _formatParameterAsArray: function(array)
+    _formatParameterAsArray: function(array, showUndefinedsInArrays)
     {
-        var usePrintedArrayFormat = this._message.type !== WebInspector.ConsoleMessage.MessageType.DirXML && this._message.type !== WebInspector.ConsoleMessage.MessageType.Result;
         var isLongArray = array.arrayLength() > 100;
-        if (usePrintedArrayFormat || isLongArray)
-            return this._formatParameterAsObject(array, usePrintedArrayFormat || !isLongArray);
+        if (!showUndefinedsInArrays || isLongArray)
+            return this._formatParameterAsObject(array, !showUndefinedsInArrays || !isLongArray);
         var result = createElement("span");
         array.getAllProperties(false, printArrayResult.bind(this));
         return result;
 
         /**
          * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties
          * @this {!WebInspector.ConsoleViewMessage}
          */
         function printArrayResult(properties)
         {
@@ skipping 132 matching lines @@
             }
         }
 
         return rootElement;
     },
 
     /**
      * @param {string} format
      * @param {!Array.<!WebInspector.RemoteObject>} parameters
      * @param {!Element} formattedResult
+     * @param {boolean} showUndefinedsInArrays
      */
-    _formatWithSubstitutionString: function(format, parameters, formattedResult)
+    _formatWithSubstitutionString: function(format, parameters, formattedResult, showUndefinedsInArrays)
     {
         var formatters = {};
 
         /**
          * @param {boolean} force
          * @param {!WebInspector.RemoteObject} obj
          * @return {!Element}
          * @this {WebInspector.ConsoleViewMessage}
          */
         function parameterFormatter(force, obj)
         {
-            return this._formatParameter(obj, force, false);
+            return this._formatParameter(obj, force, false, showUndefinedsInArrays);
         }
 
         function stringFormatter(obj)
         {
             return obj.description;
         }
 
         function floatFormatter(obj)
         {
             if (typeof obj.value !== "number")
@@ skipping 160 matching lines @@
         if (this._message.type === WebInspector.ConsoleMessage.MessageType.StartGroup || this._message.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
             contentElement.classList.add("console-group-title");
 
         var formattedMessage;
         var consoleMessage = this._message;
         var target = consoleMessage.target();
         var shouldIncludeTrace = !!consoleMessage.stackTrace && (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Network || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError || consoleMessage.type === WebInspector.ConsoleMessage.MessageType.Trace || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Warning);
         if (target && shouldIncludeTrace)
             formattedMessage = this._buildMessageWithStackTrace(consoleMessage, target, this._linkifier);
         else if (this._message.type === WebInspector.ConsoleMessage.MessageType.Table)
-            formattedMessage = this._buildTableMessage(this._message);
+            formattedMessage = this._buildTableMessage();
         else
-            formattedMessage = this._buildMessage(consoleMessage);
+            formattedMessage = this._buildMessage();
         contentElement.appendChild(formattedMessage);
 
         this.updateTimestamp(WebInspector.moduleSetting("consoleTimestampsEnabled").get());
         return this._contentElement;
     },
 
     /**
      * @return {!Element}
      */
     toMessageElement: function()
@@ skipping 271 matching lines @@
     {
         if (!this._element) {
             WebInspector.ConsoleViewMessage.prototype.toMessageElement.call(this);
             this._element.classList.toggle("collapsed", this._collapsed);
         }
         return this._element;
     },
 
     __proto__: WebInspector.ConsoleViewMessage.prototype
 };