DevTools: Remove popover and add properties section for paint profiler log.

Source/devtools/front_end/timeline/PaintProfilerView.js

 /*
  * Copyright (C) 2013 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are
  * met:
  *
  *     * Redistributions of source code must retain the above copyright
  * notice, this list of conditions and the following disclaimer.
  *     * Redistributions in binary form must reproduce the above
@@ skipping 227 matching lines @@
 };
 
 /**
  * @constructor
  * @extends {WebInspector.VBox}
  */
 WebInspector.PaintProfilerCommandLogView = function()
 {
     WebInspector.VBox.call(this);
     this.setMinimumSize(100, 25);
-    this.element.classList.add("outline-disclosure");
-    var sidebarTreeElement = this.element.createChild("ol", "sidebar-tree");
+    this.element.classList.add("outline-disclosure", "profiler-log-view", "section");
+    var sidebarTreeElement = this.element.createChild("ol", "sidebar-tree properties monospace");
     sidebarTreeElement.addEventListener("mousemove", this._onMouseMove.bind(this), false);
     sidebarTreeElement.addEventListener("mouseout", this._onMouseMove.bind(this), false);
     sidebarTreeElement.addEventListener("contextmenu", this._onContextMenu.bind(this), true);
     this.sidebarTree = new TreeOutline(sidebarTreeElement);
-    this._popoverHelper = new WebInspector.ObjectPopoverHelper(this.element, this._getHoverAnchor.bind(this), this._resolveObjectForPopover.bind(this), undefined, true);
 
     this._reset();
 }
 
 WebInspector.PaintProfilerCommandLogView.prototype = {
     /**
      * @param {?WebInspector.Target} target
      * @param {!Array.<!WebInspector.PaintProfilerLogItem>=} log
      */
     setCommandLog: function(target, log)
     {
         this._target = target;
         this._log = log;
         this.updateWindow();
     },
 
     /**
+      * @param {!TreeOutline} treeOutline
+      * @param {!WebInspector.PaintProfilerLogItem} logItem
+      */
+    _appendLogItem: function(treeOutline, logItem)
+    {
+        var first = new WebInspector.LogTreeElement(this, logItem);

[caseq, 2014/07/31 14:20:37]

s/first/treeElement/?

[malch, 2014/07/31 14:27:33]

Done.

+        treeOutline.appendChild(first);
+    },
+
+    /**
      * @param {number=} stepLeft
      * @param {number=} stepRight
      */
     updateWindow: function(stepLeft, stepRight)
     {
         stepLeft = stepLeft || 0;
         stepRight = stepRight || this._log.length - 1;
         this.sidebarTree.removeChildren();
-        for (var i = stepLeft; i <= stepRight; ++i) {
-            var node = new WebInspector.LogTreeElement(this, this._log[i]);
-            this.sidebarTree.appendChild(node);
-        }
+        for (var i = stepLeft; i <= stepRight; ++i)
+            this._appendLogItem(this.sidebarTree, this._log[i]);
     },
 
     _reset: function()
     {
         this._log = [];
     },
 
     /**
-     * @param {!Element} target
-     * @return {!Element}
-     */
-    _getHoverAnchor: function(target)
-    {
-        return /** @type {!Element} */ (target.enclosingNodeOrSelfWithNodeName("span"));
-    },
-
-    /**
-     * @param {!Element} element
-     * @param {function(!WebInspector.RemoteObject, boolean, !Element=):undefined} showCallback
-     */
-    _resolveObjectForPopover: function(element, showCallback)
-    {
-        var liElement = element.enclosingNodeOrSelfWithNodeName("li");
-        var logItem = liElement.treeElement.representedObject;
-        var obj = {"method": logItem.method};
-        if (logItem.params)
-            obj.params = logItem.params;
-        showCallback(WebInspector.RemoteObject.fromLocalObject(obj), false);
-    },
-
-    /**
      * @param {?Event} event
      */
     _onMouseMove: function(event)
     {
         var node = this.sidebarTree.treeElementFromPoint(event.pageX, event.pageY);
-        if (node === this._lastHoveredNode)
+        if (node === this._lastHoveredNode || !(node instanceof WebInspector.LogTreeElement))
             return;
         if (this._lastHoveredNode)
             this._lastHoveredNode.setHovered(false);
         this._lastHoveredNode = node;
         if (this._lastHoveredNode)
             this._lastHoveredNode.setHovered(true);
     },
 
     /**
      * @param {?Event} event
      */
     _onContextMenu: function(event)
     {
         if (!this._target)
             return;
         var node = this.sidebarTree.treeElementFromPoint(event.pageX, event.pageY);
-        if (!node || !node.representedObject)
+        if (!node || !node.representedObject || !(node instanceof WebInspector.LogTreeElement))
             return;
         var logItem = /** @type {!WebInspector.PaintProfilerLogItem} */ (node.representedObject);
         if (!logItem.nodeId())
             return;
         var contextMenu = new WebInspector.ContextMenu(event);
         var domNode = new WebInspector.DeferredDOMNode(this._target, logItem.nodeId());
         contextMenu.appendApplicableItems(domNode);
         contextMenu.show();
     },
 
     __proto__: WebInspector.VBox.prototype
 };
 
 /**
   * @constructor
   * @param {!WebInspector.PaintProfilerCommandLogView} ownerView
   * @param {!WebInspector.PaintProfilerLogItem} logItem
   * @extends {TreeElement}
   */
 WebInspector.LogTreeElement = function(ownerView, logItem)
 {
     TreeElement.call(this, "", logItem);
     this._ownerView = ownerView;
-    this._update();
+    this._filled = false;
 }
 
 WebInspector.LogTreeElement.prototype = {
+    onattach: function()
+    {
+        this._update();
+        if (this.representedObject.params)
+            this.hasChildren = true;

[caseq, 2014/07/31 14:20:37]

nit: this.hasChildren = !!this.representedObject.params;

[malch, 2014/07/31 14:27:33]

Done.

+    },
+
+    onexpand: function()
+    {
+        if (this._filled)
+            return;
+        this._filled = true;
+        for (var param in this.representedObject.params)
+            WebInspector.LogPropertyTreeElement._appendLogPropertyItem(this, param, this.representedObject.params[param]);
+    },
+
     /**
       * @param {!Object} param
       * @param {string} name
       * @return {string}
       */
     _paramToString: function(param, name)
     {
         if (typeof param !== "object")
             return typeof param === "string" && param.length > 100 ? name : JSON.stringify(param);
         var str = "";
@@ skipping 21 matching lines @@
             str += this._paramToString(params[key], key);
         }
         return str;
     },
 
     _update: function()
     {
         var logItem = this.representedObject;
         var title = document.createDocumentFragment();
         title.createChild("div", "selection");
-        var span = title.createChild("span");
-        var textContent = logItem.method;
-        if (logItem.params)
-            textContent += "(" + this._paramsToString(logItem.params) + ")";
-        span.textContent = textContent;
+        title.createTextChild(logItem.method + "(" + this._paramsToString(logItem.params) + ")");
         this.title = title;
     },
 
     /**
      * @param {boolean} hovered
      */
     setHovered: function(hovered)
     {
         this.listItemElement.classList.toggle("hovered", hovered);
         var target = this._ownerView._target;
@@ skipping 17 matching lines @@
         {
             if (node)
                 node.highlight();
         }
     },
 
     __proto__: TreeElement.prototype
 };
 
 /**
+  * @constructor
+  * @param {!{name: string, value}} property
+  * @extends {TreeElement}
+  */
+WebInspector.LogPropertyTreeElement = function(property)
+{
+    TreeElement.call(this, "", property);
+};
+
+/**
+  * @param {!TreeElement} element
+  * @param {string} name
+  * @param {*} value
+  */
+WebInspector.LogPropertyTreeElement._appendLogPropertyItem = function(element, name, value)
+{
+    var treeElement = new WebInspector.LogPropertyTreeElement({name: name, value: value});
+    element.appendChild(treeElement);
+    if (value && typeof value === "object") {
+        for (var property in value)
+            WebInspector.LogPropertyTreeElement._appendLogPropertyItem(treeElement, property, value[property]);
+    }
+};
+
+WebInspector.LogPropertyTreeElement.prototype = {
+    onattach: function()
+    {
+        this._update();
+    },
+
+    /**
+      * @param {*} value
+      * @return {string}
+      */
+    _type: function(value)
+    {
+        return value === null ? "null" : typeof value;
+    },
+
+    _update: function()
+    {
+        var property = this.representedObject;
+        var title = document.createDocumentFragment();
+        title.createChild("div", "selection");
+        var nameElement = title.createChild("span", "name");
+        nameElement.textContent = property.name;
+        var separatorElement = title.createChild("span", "separator");
+        separatorElement.textContent = ": ";
+        if (property.value === null || typeof property.value !== "object") {
+            var valueElement = title.createChild("span", "value");
+            valueElement.textContent = JSON.stringify(property.value);
+            valueElement.classList.add("console-formatted-" + this._type(property.value));
+        }
+        this.title = title;
+    },
+
+    __proto__: TreeElement.prototype
+};
+
+/**
  * @return {!Object.<string, !WebInspector.PaintProfilerCategory>}
  */
 WebInspector.PaintProfilerView.categories = function()
 {
     if (WebInspector.PaintProfilerView._categories)
         return WebInspector.PaintProfilerView._categories;
     WebInspector.PaintProfilerView._categories = {
         shapes: new WebInspector.PaintProfilerCategory("shapes", WebInspector.UIString("Shapes"), "rgb(255, 161, 129)"),
         bitmap: new WebInspector.PaintProfilerCategory("bitmap", WebInspector.UIString("Bitmap"), "rgb(136, 196, 255)"),
         text: new WebInspector.PaintProfilerCategory("text", WebInspector.UIString("Text"), "rgb(180, 255, 137)"),
@@ skipping 76 matching lines @@
     var method = logItem.method.toTitleCase();
 
     var logItemCategories = WebInspector.PaintProfilerView._initLogItemCategories();
     var result = logItemCategories[method];
     if (!result) {
         result = WebInspector.PaintProfilerView.categories()["misc"];
         logItemCategories[method] = result;
     }
     return result;
 }