| 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 5bc1160afd4d05f5846b9cb8c1d21bb2ba1c1d9b..cbd83eace64823243ab3efdddc444ae322bc1dfa 100644
|
| --- a/Source/devtools/front_end/timeline/TimelineLayersView.js
|
| +++ b/Source/devtools/front_end/timeline/TimelineLayersView.js
|
| @@ -146,32 +146,32 @@ WebInspector.TimelineLayersView.prototype = {
|
| },
|
|
|
| /**
|
| - * @param {?WebInspector.Layers3DView.ActiveObject} activeObject
|
| + * @param {?WebInspector.Layers3DView.Selection} selection
|
| */
|
| - _selectObject: function(activeObject)
|
| + _selectObject: function(selection)
|
| {
|
| - var layer = activeObject && activeObject.layer;
|
| - if (this._currentlySelectedLayer === activeObject)
|
| + var layer = selection && selection.layer;
|
| + if (this._currentlySelectedLayer === selection)
|
| return;
|
| - this._currentlySelectedLayer = activeObject;
|
| + this._currentlySelectedLayer = selection;
|
| this._toggleNodeHighlight(layer ? layer.nodeForSelfOrAncestor() : null);
|
| this._layerTreeOutline.selectLayer(layer);
|
| - this._layers3DView.selectObject(activeObject);
|
| - this._layerDetailsView.setObject(activeObject);
|
| + this._layers3DView.selectObject(selection);
|
| + this._layerDetailsView.setObject(selection);
|
| },
|
|
|
| /**
|
| - * @param {?WebInspector.Layers3DView.ActiveObject} activeObject
|
| + * @param {?WebInspector.Layers3DView.Selection} selection
|
| */
|
| - _hoverObject: function(activeObject)
|
| + _hoverObject: function(selection)
|
| {
|
| - var layer = activeObject && activeObject.layer;
|
| - if (this._currentlyHoveredLayer === activeObject)
|
| + var layer = selection && selection.layer;
|
| + if (this._currentlyHoveredLayer === selection)
|
| return;
|
| - this._currentlyHoveredLayer = activeObject;
|
| + this._currentlyHoveredLayer = selection;
|
| this._toggleNodeHighlight(layer ? layer.nodeForSelfOrAncestor() : null);
|
| this._layerTreeOutline.hoverLayer(layer);
|
| - this._layers3DView.hoverObject(activeObject);
|
| + this._layers3DView.hoverObject(selection);
|
| },
|
|
|
| /**
|
| @@ -193,8 +193,8 @@ WebInspector.TimelineLayersView.prototype = {
|
| */
|
| _onObjectSelected: function(event)
|
| {
|
| - var activeObject = /** @type {!WebInspector.Layers3DView.ActiveObject} */ (event.data);
|
| - this._selectObject(activeObject);
|
| + var selection = /** @type {!WebInspector.Layers3DView.Selection} */ (event.data);
|
| + this._selectObject(selection);
|
| },
|
|
|
| /**
|
| @@ -202,8 +202,8 @@ WebInspector.TimelineLayersView.prototype = {
|
| */
|
| _onObjectHovered: function(event)
|
| {
|
| - var activeObject = /** @type {!WebInspector.Layers3DView.ActiveObject} */ (event.data);
|
| - this._hoverObject(activeObject);
|
| + var selection = /** @type {!WebInspector.Layers3DView.Selection} */ (event.data);
|
| + this._hoverObject(selection);
|
| },
|
|
|
| _disposeTiles: function()
|
|
|