Commit c7d44e11 authored by caseq@chromium.org's avatar caseq@chromium.org

Use simple CSS selectors to identify elements in Layer's panel tree view

Drive-by: fix navigation to Elements panel via context menu.

BUG=

Review URL: https://codereview.chromium.org/206123005

git-svn-id: svn://svn.chromium.org/blink/trunk@169662 bbb929c8-8fbe-4397-9dbb-9b2b20218538
parent 1df35a7c
...@@ -159,7 +159,7 @@ WebInspector.LayerTree.prototype = { ...@@ -159,7 +159,7 @@ WebInspector.LayerTree.prototype = {
var layer = /** @type {!WebInspector.Layer} */ (node.representedObject); var layer = /** @type {!WebInspector.Layer} */ (node.representedObject);
if (!layer) if (!layer)
return; return;
var nodeId = layer.nodeId(); var nodeId = layer.nodeIdForSelfOrAncestor();
if (!nodeId) if (!nodeId)
return; return;
var domNode = WebInspector.domAgent.nodeForId(nodeId); var domNode = WebInspector.domAgent.nodeForId(nodeId);
...@@ -201,7 +201,7 @@ WebInspector.LayerTreeElement.prototype = { ...@@ -201,7 +201,7 @@ WebInspector.LayerTreeElement.prototype = {
var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : null; var node = nodeId ? WebInspector.domAgent.nodeForId(nodeId) : null;
var title = document.createDocumentFragment(); var title = document.createDocumentFragment();
title.createChild("div", "selection"); title.createChild("div", "selection");
title.appendChild(document.createTextNode(node ? WebInspector.DOMPresentationUtils.fullQualifiedSelector(node, false) : "#" + layer.id())); title.appendChild(document.createTextNode(node ? WebInspector.DOMPresentationUtils.simpleSelector(node) : "#" + layer.id()));
var details = title.createChild("span", "dimmed"); var details = title.createChild("span", "dimmed");
details.textContent = WebInspector.UIString(" (%d × %d)", layer.width(), layer.height()); details.textContent = WebInspector.UIString(" (%d × %d)", layer.width(), layer.height());
this.title = title; this.title = title;
......
...@@ -380,7 +380,7 @@ WebInspector.Layers3DView.prototype = { ...@@ -380,7 +380,7 @@ WebInspector.Layers3DView.prototype = {
_onContextMenu: function(event) _onContextMenu: function(event)
{ {
var layer = this._layerFromEventPoint(event); var layer = this._layerFromEventPoint(event);
var nodeId = layer && layer.nodeId(); var nodeId = layer && layer.nodeIdForSelfOrAncestor();
if (!nodeId) if (!nodeId)
return; return;
var domNode = WebInspector.domAgent.nodeForId(nodeId); var domNode = WebInspector.domAgent.nodeForId(nodeId);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment