Index: Source/devtools/front_end/timeline/TimelineLayersView.js |
diff --git a/Source/devtools/front_end/timeline/TimelineLayersView.js b/Source/devtools/front_end/timeline/TimelineLayersView.js |
index 25559e2e8266167eb7a071409491cf7f44dcc161..14166d9b2a434f6e5cbd9c77046dd0d7174045e0 100644 |
--- a/Source/devtools/front_end/timeline/TimelineLayersView.js |
+++ b/Source/devtools/front_end/timeline/TimelineLayersView.js |
@@ -6,18 +6,26 @@ |
/** |
* @constructor |
- * @extends {WebInspector.VBox} |
+ * @extends {WebInspector.SplitView} |
*/ |
WebInspector.TimelineLayersView = function() |
{ |
- WebInspector.VBox.call(this); |
+ WebInspector.SplitView.call(this, true, false, "timelineLayersView"); |
this._paintTiles = []; |
+ |
+ this.sidebarElement().classList.add("outline-disclosure", "layer-tree"); |
+ var sidebarTreeElement = this.sidebarElement().createChild("ol"); |
+ var treeOutline = new TreeOutline(sidebarTreeElement); |
+ this._layerTreeOutline = new WebInspector.LayerTreeOutline(treeOutline); |
+ this._layerTreeOutline.addEventListener(WebInspector.LayerTreeOutline.Events.LayerSelected, this._onObjectSelected, this); |
+ this._layerTreeOutline.addEventListener(WebInspector.LayerTreeOutline.Events.LayerHovered, this._onObjectHovered, this); |
+ |
this._layers3DView = new WebInspector.Layers3DView(); |
this._layers3DView.addEventListener(WebInspector.Layers3DView.Events.ObjectSelected, this._onObjectSelected, this); |
this._layers3DView.addEventListener(WebInspector.Layers3DView.Events.ObjectHovered, this._onObjectHovered, this); |
this._layers3DView.addEventListener(WebInspector.Layers3DView.Events.JumpToPaintEventRequested, this._jumpToPaintEvent, this); |
- this._layers3DView.show(this.element); |
+ this._layers3DView.show(this.mainElement()); |
} |
WebInspector.TimelineLayersView.prototype = { |
@@ -125,6 +133,7 @@ WebInspector.TimelineLayersView.prototype = { |
*/ |
function onLayersAndTilesReady() |
{ |
+ this._layerTreeOutline.update(layerTree); |
this._layers3DView.setLayerTree(layerTree); |
this._layers3DView.setTiles(this._paintTiles); |
} |
@@ -140,6 +149,7 @@ WebInspector.TimelineLayersView.prototype = { |
return; |
this._currentlySelectedLayer = activeObject; |
this._toggleNodeHighlight(layer ? layer.nodeForSelfOrAncestor() : null); |
+ this._layerTreeOutline.selectLayer(layer); |
this._layers3DView.selectObject(activeObject); |
}, |
@@ -153,6 +163,7 @@ WebInspector.TimelineLayersView.prototype = { |
return; |
this._currentlyHoveredLayer = activeObject; |
this._toggleNodeHighlight(layer ? layer.nodeForSelfOrAncestor() : null); |
+ this._layerTreeOutline.hoverLayer(layer); |
this._layers3DView.hoverObject(activeObject); |
}, |
@@ -195,5 +206,5 @@ WebInspector.TimelineLayersView.prototype = { |
this._paintTiles = []; |
}, |
- __proto__: WebInspector.VBox.prototype |
+ __proto__: WebInspector.SplitView.prototype |
} |