DevTools: ConsoleViewMessage rewrite signatures to isolate formatting functions

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 28 matching lines @@
 {
     this._message = consoleMessage;
     this._linkifier = linkifier;
     this._repeatCount = 1;
     this._closeGroupDecorationCount = 0;
     this._nestingLevel = nestingLevel;
 
     /** @type {?WebInspector.DataGrid} */
     this._dataGrid = null;
 
-    /** @type {!Object.<string, function(!WebInspector.RemoteObject, !Element, boolean=)>} */
+    /** @type {!Object.<string, function(!WebInspector.ConsoleViewMessage.FormatterOptions)>} */
     this._customFormatters = {
         "array": this._formatParameterAsArray,
         "typedarray": this._formatParameterAsArray,
         "error": this._formatParameterAsError,
         "function": this._formatParameterAsFunction,
         "generator": this._formatParameterAsObject,
         "iterator": this._formatParameterAsObject,
         "map": this._formatParameterAsObject,
         "node": this._formatParameterAsNode,
         "object": this._formatParameterAsObject,
@@ skipping 81 matching lines @@
      * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {!Element}
      */
     _formatMessageAsTable: function(consoleMessage)
     {
         var formattedResult = createElement("span");
         var table = consoleMessage.parameters && consoleMessage.parameters.length ? consoleMessage.parameters[0] : null;
         if (table)
             table = this._parameterToRemoteObject(table, this._target());
         if (!table || !table.preview)
-            return this._buildMessageAnchor(formattedResult, consoleMessage);
+            return this._buildMessageAnchor(formattedResult, consoleMessage, this._linkifier);
 
         var columnNames = [];
         var preview = table.preview;
         var rows = [];
         for (var i = 0; i < preview.properties.length; ++i) {
             var rowProperty = preview.properties[i];
             var rowPreview = rowProperty.valuePreview;
             if (!rowPreview)
                 continue;
 
@@ skipping 26 matching lines @@
             for (var j = 0; j < columnNames.length; ++j)
                 flatValues.push(rowValue[columnNames[j]]);
         }
         columnNames.unshift(WebInspector.UIString("(index)"));
 
         if (flatValues.length) {
             this._dataGrid = WebInspector.SortableDataGrid.create(columnNames, flatValues);
 
             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(consoleMessage, this._linkifier, table, true, false));
             this._dataGrid.renderInline();
             dataGridContainer.appendChild(this._dataGrid.element);
-            return this._buildMessageAnchor(formattedResult, consoleMessage);
+            return this._buildMessageAnchor(formattedResult, consoleMessage, this._linkifier);
         }
-        return this._buildMessageAnchor(formattedResult, consoleMessage);
+        return this._buildMessageAnchor(formattedResult, consoleMessage, this._linkifier);
     },
 
     /**
      * @param {!WebInspector.ConsoleMessage} consoleMessage
+     * @param {!WebInspector.Linkifier} linkifier
      * @return {!Element}
      */
-    _buildMessage: function(consoleMessage)
+    _buildMessage: function(consoleMessage, linkifier)
     {
         var messageElement;
         if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.ConsoleAPI) {
             switch (consoleMessage.type) {
             case WebInspector.ConsoleMessage.MessageType.Trace:
-                messageElement = this._format(consoleMessage.parameters || ["console.trace"]);
+                messageElement = this._format(consoleMessage, linkifier, 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:
                 var args = [WebInspector.UIString("Assertion failed:")];
                 if (consoleMessage.parameters)
                     args = args.concat(consoleMessage.parameters);
-                messageElement = this._format(args);
+                messageElement = this._format(consoleMessage, linkifier, args);
                 break;
             case WebInspector.ConsoleMessage.MessageType.Dir:
                 var obj = consoleMessage.parameters ? consoleMessage.parameters[0] : undefined;
                 var args = ["%O", obj];
-                messageElement = this._format(args);
+                messageElement = this._format(consoleMessage, linkifier, args);
                 break;
             case WebInspector.ConsoleMessage.MessageType.Profile:
             case WebInspector.ConsoleMessage.MessageType.ProfileEnd:
-                messageElement = this._format([consoleMessage.messageText]);
+                messageElement = this._format(consoleMessage, linkifier, [consoleMessage.messageText]);
                 break;
             default:
                 if (consoleMessage.parameters && consoleMessage.parameters.length === 1 && consoleMessage.parameters[0].type === "string")
-                    messageElement = this._tryFormatAsError(/** @type {string} */(consoleMessage.parameters[0].value));
+                    messageElement = this._tryFormatAsError(consoleMessage.target(), linkifier, /** @type {string} */(consoleMessage.parameters[0].value));
                 var args = consoleMessage.parameters || [consoleMessage.messageText];
-                messageElement = messageElement || this._format(args);
+                messageElement = messageElement || this._format(consoleMessage, linkifier, args);
             }
         } else if (consoleMessage.source === WebInspector.ConsoleMessage.MessageSource.Network) {
             if (consoleMessage.request) {
                 messageElement = createElement("span");
                 if (consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError) {
                     messageElement.createTextChildren(consoleMessage.request.requestMethod, " ");
                     messageElement.appendChild(WebInspector.Linkifier.linkifyUsingRevealer(consoleMessage.request, consoleMessage.request.url, consoleMessage.request.url));
                     if (consoleMessage.request.failed)
                         messageElement.createTextChildren(" ", consoleMessage.request.localizedFailDescription);
                     else
                         messageElement.createTextChildren(" ", String(consoleMessage.request.statusCode), " (", consoleMessage.request.statusText, ")");
                 } else {
                     var fragment = WebInspector.linkifyStringAsFragmentWithCustomLinkifier(consoleMessage.messageText, linkifyRequest.bind(consoleMessage));
                     messageElement.appendChild(fragment);
                 }
             } else {
-                messageElement = this._format([consoleMessage.messageText]);
+                messageElement = this._format(consoleMessage, linkifier, [consoleMessage.messageText]);
             }
         } else {
             var args = consoleMessage.parameters || [consoleMessage.messageText];
-            messageElement = this._format(args);
+            messageElement = this._format(consoleMessage, linkifier, args);
         }
 
-        var formattedMessage = this._buildMessageAnchor(messageElement, consoleMessage);
+        var formattedMessage = this._buildMessageAnchor(messageElement, consoleMessage, linkifier);
         if (!!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))
-            formattedMessage = this._buildMessageStackTrace(formattedMessage, consoleMessage, this._linkifier);
+            formattedMessage = this._buildMessageStackTrace(formattedMessage, consoleMessage, linkifier);
         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 {!Element} contents
      * @param {!WebInspector.ConsoleMessage} consoleMessage
+     * @param {!WebInspector.Linkifier} linkifier
      * @return {!Element}
      */
-    _buildMessageAnchor: function(contents, consoleMessage)
+    _buildMessageAnchor: function(contents, consoleMessage, linkifier)
     {
         var anchorElement = null;
         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);
-            }
+            if (consoleMessage.scriptId)
+                anchorElement = this._linkifyScriptId(linkifier, consoleMessage);
+            else if (consoleMessage.stackTrace && consoleMessage.stackTrace.callFrames.length)
+                anchorElement = this._linkifyStackTraceTopFrame(linkifier, consoleMessage);
+            else if (consoleMessage.url && consoleMessage.url !== "undefined")
+                anchorElement = this._linkifyLocation(linkifier, consoleMessage);
         } 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);
         }
 
         var formattedMessage = createElement("span");
         WebInspector.appendStyle(formattedMessage, "components/objectValue.css");
         formattedMessage.className = "console-message-text source-code";
 
@@ skipping 52 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
+     * @param {!WebInspector.Linkifier} linkifier
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {?Element}
      */
-    _linkifyLocation: function(url, lineNumber, columnNumber)
+    _linkifyLocation: function(linkifier, consoleMessage)
     {
-        var target = this._target();
+        var target = consoleMessage.target();
         if (!target)
             return null;
-        return this._linkifier.linkifyScriptLocation(target, null, url, lineNumber, columnNumber, "console-message-url");
+        return linkifier.linkifyScriptLocation(target, null, consoleMessage.url || "", consoleMessage.line, consoleMessage.column, "console-message-url");
     },
 
     /**
-     * @param {!RuntimeAgent.StackTrace} stackTrace
+     * @param {!WebInspector.Linkifier} linkifier
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {?Element}
      */
-    _linkifyStackTraceTopFrame: function(stackTrace)
+    _linkifyStackTraceTopFrame: function(linkifier, consoleMessage)
     {
-        var target = this._target();
+        var target = consoleMessage.target();
         if (!target)
             return null;
-        return this._linkifier.linkifyStackTraceTopFrame(target, stackTrace, "console-message-url");
+        return linkifier.linkifyStackTraceTopFrame(target, /** @type {!RuntimeAgent.StackTrace} **/ (consoleMessage.stackTrace), "console-message-url");
     },
 
     /**
-     * @param {string} scriptId
-     * @param {string} url
-     * @param {number} lineNumber
-     * @param {number} columnNumber
+     * @param {!WebInspector.Linkifier} linkifier
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
      * @return {?Element}
      */
-    _linkifyScriptId: function(scriptId, url, lineNumber, columnNumber)
+    _linkifyScriptId: function(linkifier, consoleMessage)
     {
-        var target = this._target();
+        var target = consoleMessage.target();
         if (!target)
             return null;
-        return this._linkifier.linkifyScriptLocation(target, scriptId, url, lineNumber, columnNumber, "console-message-url");
+        return linkifier.linkifyScriptLocation(target, consoleMessage.scriptId, consoleMessage.url || "", consoleMessage.line, consoleMessage.column, "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);
         if (typeof parameter === "object")
             return target.runtimeModel.createRemoteObject(parameter);
         return target.runtimeModel.createRemoteObjectFromPrimitiveValue(parameter);
     },
 
     /**
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
+     * @param {!WebInspector.Linkifier} linkifier
      * @param {!Array.<!WebInspector.RemoteObject|string>} parameters
      * @return {!Element}
      */
-    _format: function(parameters)
+    _format: function(consoleMessage, linkifier, parameters)
     {
         // This node is used like a Builder. Values are continually appended onto it.
         var formattedResult = createElement("span");
         if (!parameters.length)
             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());
+            parameters[i] = this._parameterToRemoteObject(parameters[i], consoleMessage.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 messageType = consoleMessage.type;
+        var shouldFormatMessage = WebInspector.RemoteObject.type((/** @type {!Array.<!WebInspector.RemoteObject>} **/ (parameters))[0]) === "string" && (messageType !== WebInspector.ConsoleMessage.MessageType.Result || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.Error || consoleMessage.level === WebInspector.ConsoleMessage.MessageLevel.RevokedError);
 
         // 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(consoleMessage, linkifier, /** @type {string} **/ (parameters[0].description), parameters.slice(1), formattedResult);
             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(consoleMessage, linkifier, parameters[i], false, true));
             if (i < parameters.length - 1)
                 formattedResult.createTextChild(" ");
         }
         return formattedResult;
     },
 
     /**
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
+     * @param {!WebInspector.Linkifier} linkifier
      * @param {!WebInspector.RemoteObject} output
      * @param {boolean=} forceObjectFormat
      * @param {boolean=} includePreview
      * @return {!Element}
      */
-    _formatParameter: function(output, forceObjectFormat, includePreview)
+    _formatParameter: function(consoleMessage, linkifier, output, forceObjectFormat, includePreview)
     {
-        if (output.customPreview()) {
+        if (output.customPreview())
             return (new WebInspector.CustomPreviewComponent(output)).element;
-        }
 
         var type = forceObjectFormat ? "object" : (output.subtype || output.type);
         var formatter = this._customFormatters[type] || this._formatParameterAsValue;
         var span = createElement("span");
         span.className = "object-value-" + type + " source-code";
-        formatter.call(this, output, span, includePreview);
+        formatter.call(this, {
+            object: output,
+            element: span,
+            includePreview: includePreview,
+            linkifier: linkifier,
+            consoleMessage: consoleMessage
+        });
         return span;
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} obj
-     * @param {!Element} elem
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsValue: function(obj, elem)
+    _formatParameterAsValue: function(options)
     {
+        var elem = options.element;
+        var obj = options.object;
         elem.createTextChild(obj.description || "");
         if (obj.objectId)
             elem.addEventListener("contextmenu", this._contextMenuEventFired.bind(this, obj), false);
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} obj
-     * @param {!Element} elem
-     * @param {boolean=} includePreview
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsObject: function(obj, elem, includePreview)
+    _formatParameterAsObject: function(options)
     {
-        this._formatParameterAsArrayOrObject(obj, elem, includePreview);
-    },
-
-    /**
-     * @param {!WebInspector.RemoteObject} obj
-     * @param {!Element} elem
-     * @param {boolean=} includePreview
-     */
-    _formatParameterAsArrayOrObject: function(obj, elem, includePreview)
-    {
+        var obj = options.object;
+        var elem = options.element;
         var titleElement = createElement("span");
-        if (includePreview && obj.preview) {
+        if (options.includePreview && obj.preview) {
             titleElement.classList.add("console-object-preview");
             this._previewFormatter.appendObjectPreview(titleElement, obj.preview);
         } else {
             if (obj.type === "function") {
                 WebInspector.ObjectPropertiesSection.formatObjectAsFunction(obj, titleElement, false);
                 titleElement.classList.add("object-value-function");
             } else {
                 titleElement.createTextChild(obj.description || "");
             }
         }
 
-        var section = new WebInspector.ObjectPropertiesSection(obj, titleElement, this._linkifier);
+        var section = new WebInspector.ObjectPropertiesSection(obj, titleElement, options.linkifier);
         section.element.classList.add("console-view-object-properties-section");
         section.enableContextMenu();
         elem.appendChild(section.element);
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} func
-     * @param {!Element} element
-     * @param {boolean=} includePreview
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsFunction: function(func, element, includePreview)
+    _formatParameterAsFunction: function(options)
     {
+        var func = options.object;
+        var element = options.element;
+        var includePreview = options.includePreview;
         WebInspector.RemoteFunction.objectAsFunction(func).targetFunction().then(formatTargetFunction.bind(this));
 
         /**
          * @param {!WebInspector.RemoteObject} targetFunction
          * @this {WebInspector.ConsoleViewMessage}
          */
         function formatTargetFunction(targetFunction)
         {
             var functionElement = createElement("span");
             WebInspector.ObjectPropertiesSection.formatObjectAsFunction(targetFunction, functionElement, true, includePreview);
@@ skipping 24 matching lines @@
      */
     _renderPropertyPreviewOrAccessor: function(object, propertyPath)
     {
         var property = propertyPath.peekLast();
         if (property.type === "accessor")
             return this._formatAsAccessorProperty(object, propertyPath.map(property => property.name), false);
         return this._previewFormatter.renderPropertyPreview(property.type, /** @type {string} */ (property.subtype), property.value);
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} object
-     * @param {!Element} elem
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsNode: function(object, elem)
+    _formatParameterAsNode: function(options)
     {
+        var object = options.object;
+        var elem = options.element;
+        var linkifier = options.linkifier;
         WebInspector.Renderer.renderPromise(object).then(appendRenderer.bind(this), failedToRender.bind(this));
         /**
          * @param {!Element} rendererElement
          * @this {WebInspector.ConsoleViewMessage}
          */
         function appendRenderer(rendererElement)
         {
             elem.appendChild(rendererElement);
             this._formattedParameterAsNodeForTest();
         }
 
         /**
          * @this {WebInspector.ConsoleViewMessage}
          */
         function failedToRender()
         {
-            this._formatParameterAsObject(object, elem, false);
+            this._formatParameterAsObject({
+                object: object,
+                element: elem,
+                includePreview: false,
+                linkifier: linkifier
+            });
         }
     },
 
     _formattedParameterAsNodeForTest: function()
     {
     },
 
     /**
-     * @return {boolean}
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _usePrintedArrayFormatter: function()
+    _formatParameterAsArray: function(options)
     {
-        return this._message.type !== WebInspector.ConsoleMessage.MessageType.DirXML && this._message.type !== WebInspector.ConsoleMessage.MessageType.Result;
+        var array = options.object;
+        var elem = options.element;
+        var linkifier = options.linkifier;
+        var messageType = options.consoleMessage.type;
+        var usePrintedArrayFormat = messageType !== WebInspector.ConsoleMessage.MessageType.DirXML && messageType !== WebInspector.ConsoleMessage.MessageType.Result;
+        var maxFlatArrayLength = 100;
+        if (usePrintedArrayFormat || array.arrayLength() > maxFlatArrayLength)
+            this._formatParameterAsObject({
+                object: array,
+                element: elem,
+                includePreview: usePrintedArrayFormat || array.arrayLength() <= maxFlatArrayLength,
+                linkifier: linkifier
+            });
+        else
+            array.getAllProperties(false, this._printArrayResult.bind(this, array, elem, linkifier));
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} array
-     * @param {!Element} elem
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsArray: function(array, elem)
-    {
-        var maxFlatArrayLength = 100;
-        if (this._usePrintedArrayFormatter() || array.arrayLength() > maxFlatArrayLength)
-            this._formatParameterAsArrayOrObject(array, elem, this._usePrintedArrayFormatter() || array.arrayLength() <= maxFlatArrayLength);
-        else
-            array.getAllProperties(false, this._printArrayResult.bind(this, array, elem));
-    },
-
-    /**
-     * @param {!WebInspector.RemoteObject} output
-     * @param {!Element} elem
-     */
-    _formatParameterAsString: function(output, elem)
+    _formatParameterAsString: function(options)
     {
         var span = createElement("span");
         span.className = "object-value-string source-code";
-        span.appendChild(WebInspector.linkifyStringAsFragment(output.description || ""));
+        span.appendChild(WebInspector.linkifyStringAsFragment(options.object.description || ""));
 
         // Make black quotes.
+        var elem = options.element;
         elem.classList.remove("object-value-string");
         elem.createTextChild("\"");
         elem.appendChild(span);
         elem.createTextChild("\"");
     },
 
     /**
-     * @param {!WebInspector.RemoteObject} output
-     * @param {!Element} elem
+     * @param {!WebInspector.ConsoleViewMessage.FormatterOptions} options
      */
-    _formatParameterAsError: function(output, elem)
+    _formatParameterAsError: function(options)
     {
-        var span = elem.createChild("span", "object-value-error source-code");
-        var errorSpan = this._tryFormatAsError(output.description || "");
-        span.appendChild(errorSpan ? errorSpan : WebInspector.linkifyStringAsFragment(output.description || ""));
+        var obj = options.object;
+        var span = options.element.createChild("span", "object-value-error source-code");
+        var errorSpan = this._tryFormatAsError(options.consoleMessage.target(), options.linkifier, obj.description || "");
+        span.appendChild(errorSpan ? errorSpan : WebInspector.linkifyStringAsFragment(obj.description || ""));
     },
 
     /**
      * @param {!WebInspector.RemoteObject} array
      * @param {!Element} elem
+     * @param {!WebInspector.Linkifier} linkifier
      * @param {?Array.<!WebInspector.RemoteObjectProperty>} properties
      */
-    _printArrayResult: function(array, elem, properties)
+    _printArrayResult: function(array, elem, linkifier, properties)
     {
         if (!properties) {
-            this._formatParameterAsObject(array, elem, false);
+            this._formatParameterAsObject({
+                object: array,
+                element: elem,
+                includePreview: false,
+                linkifier: linkifier
+            });
             return;
         }
 
         var titleElement = createElement("span");
         var elements = {};
         for (var i = 0; i < properties.length; ++i) {
             var property = properties[i];
             var name = property.name;
             if (isNaN(name))
                 continue;
@@ skipping 27 matching lines @@
 
             titleElement.appendChild(element);
             lastNonEmptyIndex = i;
             if (i < length - 1)
                 titleElement.createTextChild(", ");
         }
         appendUndefined(titleElement, length);
 
         titleElement.createTextChild("]");
 
-        var section = new WebInspector.ObjectPropertiesSection(array, titleElement, this._linkifier);
+        var section = new WebInspector.ObjectPropertiesSection(array, titleElement, linkifier);
         section.element.classList.add("console-view-object-properties-section");
         section.enableContextMenu();
         elem.appendChild(section.element);
     },
 
     /**
      * @param {!WebInspector.RemoteObject} output
      * @return {!Element}
      */
     _formatAsArrayEntry: function(output)
     {
-        if (this._message.type === WebInspector.ConsoleMessage.MessageType.DirXML) {
-            // Prevent infinite expansion of cross-referencing arrays.
-            return this._formatParameter(output, output.subtype === "array" || output.subtype === "typedarray", false);
-        }
+        // // TODO(luoe): This condition won't be here after rebase with master VV
+        // if (this._message.type === WebInspector.ConsoleMessage.MessageType.DirXML) {
+        //     // Prevent infinite expansion of cross-referencing arrays.
+        //     return this._formatParameter(output, output.subtype === "array" || output.subtype === "typedarray", false);
+        // }
         return this._previewFormatter.renderPropertyPreview(output.type, output.subtype, output.description);
     },
 
     /**
      * @param {?WebInspector.RemoteObject} object
      * @param {!Array.<string>} propertyPath
      * @param {boolean} isArrayEntry
      * @return {!Element}
      */
     _formatAsAccessorProperty: function(object, propertyPath, isArrayEntry)
@@ skipping 29 matching lines @@
                         description = result.description.trimEnd(maxLength);
                 }
                 rootElement.appendChild(this._previewFormatter.renderPropertyPreview(type, subtype, description));
             }
         }
 
         return rootElement;
     },
 
     /**
+     * @param {!WebInspector.ConsoleMessage} consoleMessage
+     * @param {!WebInspector.Linkifier} linkifier
      * @param {string} format
      * @param {!Array.<!WebInspector.RemoteObject>} parameters
      * @param {!Element} formattedResult
      */
-    _formatWithSubstitutionString: function(format, parameters, formattedResult)
+    _formatWithSubstitutionString: function(consoleMessage, linkifier, format, parameters, formattedResult)
     {
         var formatters = {};
 
         /**
+         * @param {!WebInspector.RemoteObject} obj
          * @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(consoleMessage, linkifier, obj, force, false);
         }
 
         function stringFormatter(obj)
         {
             return obj.description;
         }
 
         function floatFormatter(obj)
         {
             if (typeof obj.value !== "number")
@@ skipping 157 matching lines @@
 
         var contentElement = createElementWithClass("div", "console-message");
         this._contentElement = contentElement;
         if (this._message.type === WebInspector.ConsoleMessage.MessageType.StartGroup || this._message.type === WebInspector.ConsoleMessage.MessageType.StartGroupCollapsed)
             contentElement.classList.add("console-group-title");
 
         var formattedMessage;
         if (this._message.type === WebInspector.ConsoleMessage.MessageType.Table)
             formattedMessage = this._formatMessageAsTable(this._message);
         else
-            formattedMessage = this._buildMessage(this._message);
+            formattedMessage = this._buildMessage(this._message, this._linkifier);
         contentElement.appendChild(formattedMessage);
 
         this.updateTimestamp(WebInspector.moduleSetting("consoleTimestampsEnabled").get());
         return this._contentElement;
     },
 
     /**
      * @return {!Element}
      */
     toMessageElement: function()
@@ skipping 143 matching lines @@
 
     /**
      * @return {!Element}
      */
     searchHighlightNode: function(index)
     {
         return this._searchHighlightNodes[index];
     },
 
     /**
+     * @param {?WebInspector.Target} target
+     * @param {!WebInspector.Linkifier} linkifier
      * @param {string} string
      * @return {?Element}
      */
-    _tryFormatAsError: function(string)
+    _tryFormatAsError: function(target, linkifier, string)
     {
         /**
          * @param {string} prefix
          */
         function startsWith(prefix)
         {
             return string.startsWith(prefix);
         }
 
         var errorPrefixes = ["EvalError", "ReferenceError", "SyntaxError", "TypeError", "RangeError", "Error", "URIError"];
-        var target = this._target();
         if (!target || !errorPrefixes.some(startsWith))
             return null;
         var debuggerModel = WebInspector.DebuggerModel.fromTarget(target);
         if (!debuggerModel)
             return null;
 
         var lines = string.split("\n");
         var links = [];
         var position = 0;
         for (var i = 0; i < lines.length; ++i) {
@@ skipping 34 matching lines @@
             links.push({url: url, positionLeft: position + left, positionRight: position + right, lineNumber: splitResult.lineNumber, columnNumber: splitResult.columnNumber});
         }
 
         if (!links.length)
             return null;
 
         var formattedResult = createElement("span");
         var start = 0;
         for (var i = 0; i < links.length; ++i) {
             formattedResult.appendChild(WebInspector.linkifyStringAsFragment(string.substring(start, links[i].positionLeft)));
-            formattedResult.appendChild(this._linkifier.linkifyScriptLocation(target, null, links[i].url, links[i].lineNumber, links[i].columnNumber));
+            formattedResult.appendChild(linkifier.linkifyScriptLocation(target, null, links[i].url, links[i].lineNumber, links[i].columnNumber));
             start = links[i].positionRight;
         }
 
         if (start !== string.length)
             formattedResult.appendChild(WebInspector.linkifyStringAsFragment(string.substring(start)));
 
         return formattedResult;
     }
 }
 
 /**
+ * @typedef {{
+ *  object: (!WebInspector.RemoteObject),
+ *  element: (!Element),
+ *  linkifier: (!WebInspector.Linkifier),
+ *  includePreview: (boolean|undefined),
+ *  consoleMessage: (!WebInspector.ConsoleMessage|undefined)
+ * }}
+ **/

[lushnikov, 2016/09/30 21:56:46]

let's not create an options object; instead, let's just pass arguments into the
functions

[luoe, 2016/10/01 01:10:52]

Done.

+WebInspector.ConsoleViewMessage.FormatterOptions;
+
+/**
  * @constructor
  * @extends {WebInspector.ConsoleViewMessage}
  * @param {!WebInspector.ConsoleMessage} consoleMessage
  * @param {!WebInspector.Linkifier} linkifier
  * @param {number} nestingLevel
  */
 WebInspector.ConsoleGroupViewMessage = function(consoleMessage, linkifier, nestingLevel)
 {
     console.assert(consoleMessage.isGroupStartMessage());
     WebInspector.ConsoleViewMessage.call(this, consoleMessage, linkifier, nestingLevel);
@@ skipping 27 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
 }