Chromium Code Reviews| Index: Source/devtools/front_end/timeline/PaintProfilerView.js |
| diff --git a/Source/devtools/front_end/timeline/PaintProfilerView.js b/Source/devtools/front_end/timeline/PaintProfilerView.js |
| index 7147fc9d1d3eac70bda21258865b34b6137ce9ec..e516586fad81206f2698c6b44776025935537e16 100644 |
| --- a/Source/devtools/front_end/timeline/PaintProfilerView.js |
| +++ b/Source/devtools/front_end/timeline/PaintProfilerView.js |
| @@ -36,6 +36,7 @@ |
| WebInspector.PaintProfilerView = function(showImageCallback) |
| { |
| WebInspector.HBox.call(this); |
| + this.registerRequiredCSS("paintProfilerView.css"); |
| this.element.classList.add("paint-profiler-view"); |
| this._showImageCallback = showImageCallback; |
| @@ -214,13 +215,12 @@ WebInspector.PaintProfilerCommandLogView = function() |
| { |
| WebInspector.VBox.call(this); |
| this.setMinimumSize(100, 25); |
| - this.element.classList.add("outline-disclosure"); |
| + this.element.classList.add("outline-disclosure", "profiler-log-view"); |
| var sidebarTreeElement = this.element.createChild("ol", "sidebar-tree"); |
| 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(); |
| } |
| @@ -258,35 +258,12 @@ WebInspector.PaintProfilerCommandLogView.prototype = { |
| }, |
| /** |
| - * @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); |
| @@ -303,7 +280,7 @@ WebInspector.PaintProfilerCommandLogView.prototype = { |
| 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()) |
| @@ -372,11 +349,8 @@ WebInspector.LogTreeElement.prototype = { |
| 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) + ")"; |
|
caseq
2014/07/21 14:36:41
We still want this, so that we can have a quick ov
malch
2014/07/22 07:22:25
Done.
|
| - span.textContent = textContent; |
| + var section = new WebInspector.ObjectPropertiesSection(WebInspector.RemoteObject.fromLocalObject(logItem.params), logItem.method); |
| + title.appendChild(section.element); |
| this.title = title; |
| }, |