DevTools: refactor Common.Renderer for DOM nodes

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 468 matching lines @@
         break;
       case 'iterator':
       case 'map':
       case 'object':
       case 'promise':
       case 'proxy':
       case 'set':
         element = this._formatParameterAsObject(output, includePreview);
         break;
       case 'node':
-        element = this._formatParameterAsNode(output);
+        element = output.isNode() ? this._formatParameterAsNode(output) : this._formatParameterAsObject(output, false);
         break;
       case 'string':
         element = this._formatParameterAsString(output);
         break;
       case 'boolean':
       case 'date':
       case 'null':
       case 'number':
       case 'regexp':
       case 'symbol':
@@ skipping 91 matching lines @@
    */
   _renderPropertyPreviewOrAccessor(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 {!SDK.RemoteObject} object
+   * @param {!SDK.RemoteObject} remoteObject
    * @return {!Element}
    */
-  _formatParameterAsNode(object) {
+  _formatParameterAsNode(remoteObject) {
     var result = createElement('span');
-    Common.Renderer.renderPromise(object).then(appendRenderer.bind(this), failedToRender.bind(this));
-    return result;
+
+    var domModel = SDK.DOMModel.fromTarget(remoteObject.runtimeModel().target());
+    domModel.pushObjectAsNodeToFrontend(remoteObject).then(onNodeResolved.bind(this));

[dgozman, 2017/03/21 23:00:49]

if (!domModel) return result;

[chenwilliam, 2017/03/22 00:30:38]

Done.

 
     /**
-     * @param {!Element} rendererElement
+     * @param {?SDK.DOMNode} node
      * @this {Console.ConsoleViewMessage}
      */
-    function appendRenderer(rendererElement) {
-      result.appendChild(rendererElement);
-      this._formattedParameterAsNodeForTest();
+    function onNodeResolved(node) {

[dgozman, 2017/03/21 23:00:49]

Make it an arrow function?

[chenwilliam, 2017/03/22 00:30:38]

Done.

+      if (!node) {
+        result.appendChild(this._formatParameterAsObject(remoteObject, false));

[dgozman, 2017/03/21 23:00:49]

Just return here.

[chenwilliam, 2017/03/22 00:30:38]

Done.

+        return result;
+      }
+      Common.Renderer.renderPromise(node).then(rendererElement => {
+        result.appendChild(rendererElement);
+        this._formattedParameterAsNodeForTest();
+      });
     }
-
-    /**
-     * @this {Console.ConsoleViewMessage}
-     */
-    function failedToRender() {
-      result.appendChild(this._formatParameterAsObject(object, false));
-    }
+    return result;
   }
 
   _formattedParameterAsNodeForTest() {
   }
 
   /**
    * @param {!SDK.RemoteObject} output
    * @return {!Element}
    */
   _formatParameterAsString(output) {
@@ skipping 613 matching lines @@
   toMessageElement() {
     if (!this._element) {
       super.toMessageElement();
       this._expandGroupIcon = UI.Icon.create('', 'expand-group-icon');
       this._contentElement.insertBefore(this._expandGroupIcon, this._contentElement.firstChild);
       this.setCollapsed(this._collapsed);
     }
     return this._element;
   }
 };