Skip to content

W
webkit
Commit 387f50ed authored by timothy@apple.com's avatar timothy@apple.com
Browse files
Options

Clean up Timelines code by using ES6 features and less global access of TimelineRecording. 

Also don't recreate Timeline objects when TimelineRecording is reset, reset them instead.

https://bugs.webkit.org/show_bug.cgi?id=127157

Reviewed by Joseph Pecoraro.

* UserInterface/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView.prototype.reset):
* UserInterface/NetworkTimeline.js:
(WebInspector.NetworkTimeline):
(WebInspector.NetworkTimeline.prototype.reset):
* UserInterface/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView.prototype.reset):
* UserInterface/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype._networkTimelineRecordAdded):
* UserInterface/ScriptTimelineView.js:
(WebInspector.ScriptTimelineView.prototype.reset):
* UserInterface/Timeline.js:
(WebInspector.Timeline):
(WebInspector.Timeline.prototype.reset):
* UserInterface/TimelineContentView.js:
(WebInspector.TimelineContentView.set createPathComponent):
(WebInspector.TimelineContentView.set var):
(WebInspector.TimelineContentView.prototype.showOverviewTimelineView):
(WebInspector.TimelineContentView.prototype.showTimelineView):
(WebInspector.TimelineContentView.prototype._showTimelineView):
(WebInspector.TimelineContentView.prototype._update):
(WebInspector.TimelineContentView.prototype._recordingReset):
* UserInterface/TimelineRecording.js:
(WebInspector.TimelineRecording.prototype.reset):

git-svn-id: http://svn.webkit.org/repository/webkit/trunk@162418 268f45cc-cd09-0410-ab3c-d52691b4dbfc
parent 5474c9b4
Hide whitespace changes
Inline Side-by-side
Showing with 135 additions and 117 deletions
Source/WebInspectorUI/ChangeLog
View file @ 387f50ed
2014-01-16 Timothy Hatcher <timothy@apple.com>
Clean up Timelines code by using ES6 features and less global access of TimelineRecording.
Also don't recreate Timeline objects when TimelineRecording is reset, reset them instead.
https://bugs.webkit.org/show_bug.cgi?id=127157
Reviewed by Joseph Pecoraro.
* UserInterface/LayoutTimelineView.js:
(WebInspector.LayoutTimelineView.prototype.reset):
* UserInterface/NetworkTimeline.js:
(WebInspector.NetworkTimeline):
(WebInspector.NetworkTimeline.prototype.reset):
* UserInterface/NetworkTimelineView.js:
(WebInspector.NetworkTimelineView.prototype.reset):
* UserInterface/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView.prototype._networkTimelineRecordAdded):
* UserInterface/ScriptTimelineView.js:
(WebInspector.ScriptTimelineView.prototype.reset):
* UserInterface/Timeline.js:
(WebInspector.Timeline):
(WebInspector.Timeline.prototype.reset):
* UserInterface/TimelineContentView.js:
(WebInspector.TimelineContentView.set createPathComponent):
(WebInspector.TimelineContentView.set var):
(WebInspector.TimelineContentView.prototype.showOverviewTimelineView):
(WebInspector.TimelineContentView.prototype.showTimelineView):
(WebInspector.TimelineContentView.prototype._showTimelineView):
(WebInspector.TimelineContentView.prototype._update):
(WebInspector.TimelineContentView.prototype._recordingReset):
* UserInterface/TimelineRecording.js:
(WebInspector.TimelineRecording.prototype.reset):
2014-01-16 Timothy Hatcher <timothy@apple.com>
Improve WebInspector.TimelineOverview by not putting WebInspector.TimelineRuler in a scroll area.
......
Source/WebInspectorUI/UserInterface/LayoutTimelineView.js
View file @ 387f50ed
......@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.LayoutTimelineView = function()
WebInspector.LayoutTimelineView = function(recording)
{
WebInspector.TimelineView.call(this);
......@@ -65,6 +65,9 @@ WebInspector.LayoutTimelineView = function()
this.element.classList.add(WebInspector.LayoutTimelineView.StyleClassName);
this.element.appendChild(this._dataGrid.element);
var layoutTimeline = recording.timelines.get(WebInspector.TimelineRecord.Type.Layout);
layoutTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._layoutTimelineRecordAdded, this);
this._pendingRecords = [];
};
......@@ -115,14 +118,6 @@ WebInspector.LayoutTimelineView.prototype = {
WebInspector.TimelineView.prototype.reset.call(this);
this._dataGrid.reset();
if (this._layoutTimeline)
this._layoutTimeline.removeEventListener(null, null, this);
this._layoutTimeline = WebInspector.timelineManager.recording.timelines.get(WebInspector.TimelineRecord.Type.Layout);
console.assert(this._layoutTimeline);
this._layoutTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._layoutTimelineRecordAdded, this);
},
// Private
......
Source/WebInspectorUI/UserInterface/NetworkTimeline.js
View file @ 387f50ed
......@@ -26,8 +26,6 @@
WebInspector.NetworkTimeline = function()
{
WebInspector.Timeline.call(this);
this._resourceRecordMap = new Map;
};
WebInspector.NetworkTimeline.prototype = {
......@@ -43,6 +41,13 @@ WebInspector.NetworkTimeline.prototype = {
return this._resourceRecordMap.get(resource) || null;
},
reset: function(suppressEvents)
{
this._resourceRecordMap = new Map;
WebInspector.Timeline.prototype.reset.call(this, suppressEvents);
},
addRecord: function(record)
{
console.assert(record instanceof WebInspector.ResourceTimelineRecord);
......
Source/WebInspectorUI/UserInterface/NetworkTimelineView.js
View file @ 387f50ed
......@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.NetworkTimelineView = function()
WebInspector.NetworkTimelineView = function(recording)
{
WebInspector.TimelineView.call(this);
......@@ -82,6 +82,9 @@ WebInspector.NetworkTimelineView = function()
this.element.classList.add(WebInspector.NetworkTimelineView.StyleClassName);
this.element.appendChild(this._dataGrid.element);
var networkTimeline = recording.timelines.get(WebInspector.TimelineRecord.Type.Network);
networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
this._pendingRecords = [];
};
......@@ -132,14 +135,6 @@ WebInspector.NetworkTimelineView.prototype = {
WebInspector.TimelineView.prototype.reset.call(this);
this._dataGrid.reset();
if (this._networkTimeline)
this._networkTimeline.removeEventListener(null, null, this);
this._networkTimeline = WebInspector.timelineManager.recording.timelines.get(WebInspector.TimelineRecord.Type.Network);
console.assert(this._networkTimeline);
this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
},
// Private
......
Source/WebInspectorUI/UserInterface/OverviewTimelineView.js
View file @ 387f50ed
......@@ -23,10 +23,12 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.OverviewTimelineView = function()
WebInspector.OverviewTimelineView = function(recording)
{
WebInspector.TimelineView.call(this);
this._recording = recording;
this.navigationSidebarTreeOutline.onselect = this._treeElementSelected.bind(this);
var columns = {"graph": {width: "100%"}};
......@@ -44,9 +46,12 @@ WebInspector.OverviewTimelineView = function()
this.element.classList.add(WebInspector.OverviewTimelineView.StyleClassName);
this.element.appendChild(this._dataGrid.element);
this._pendingRepresentedObjects = [];
this._networkTimeline = recording.timelines.get(WebInspector.TimelineRecord.Type.Network);
this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
recording.addEventListener(WebInspector.TimelineRecording.Event.SourceCodeTimelineAdded, this._sourceCodeTimelineAdded, this);
WebInspector.timelineManager.recording.addEventListener(WebInspector.TimelineRecording.Event.SourceCodeTimelineAdded, this._sourceCodeTimelineAdded, this);
this._pendingRepresentedObjects = [];
};
WebInspector.OverviewTimelineView.StyleClassName = "overview";
......@@ -62,16 +67,6 @@ WebInspector.OverviewTimelineView.prototype = {
return WebInspector.UIString("Timeline Events");
},
reset: function()
{
WebInspector.TimelineView.prototype.reset.call(this);
this._networkTimeline = WebInspector.timelineManager.recording.timelines.get(WebInspector.TimelineRecord.Type.Network);
console.assert(this._networkTimeline);
this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
},
shown: function()
{
WebInspector.TimelineView.prototype.shown.call(this);
......@@ -256,7 +251,7 @@ WebInspector.OverviewTimelineView.prototype = {
this.needsLayout();
// We don't expect to have any source code timelines yet. Those should be added with _sourceCodeTimelineAdded.
console.assert(!WebInspector.timelineManager.recording.sourceCodeTimelinesForSourceCode(resourceTimelineRecord.resource).length);
console.assert(!this._recording.sourceCodeTimelinesForSourceCode(resourceTimelineRecord.resource).length);
},
_sourceCodeTimelineAdded: function(event)
......
Source/WebInspectorUI/UserInterface/ScriptTimelineView.js
View file @ 387f50ed
......@@ -23,7 +23,7 @@
* THE POSSIBILITY OF SUCH DAMAGE.
*/
WebInspector.ScriptTimelineView = function()
WebInspector.ScriptTimelineView = function(recording)
{
WebInspector.TimelineView.call(this);
......@@ -62,6 +62,9 @@ WebInspector.ScriptTimelineView = function()
this.element.classList.add(WebInspector.ScriptTimelineView.StyleClassName);
this.element.appendChild(this._dataGrid.element);
var scriptTimeline = recording.timelines.get(WebInspector.TimelineRecord.Type.Script);
scriptTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._scriptTimelineRecordAdded, this);
this._pendingRecords = [];
};
......@@ -112,14 +115,6 @@ WebInspector.ScriptTimelineView.prototype = {
WebInspector.TimelineView.prototype.reset.call(this);
this._dataGrid.reset();
if (this._scriptTimeline)
this._scriptTimeline.removeEventListener(null, null, this);
this._scriptTimeline = WebInspector.timelineManager.recording.timelines.get(WebInspector.TimelineRecord.Type.Script);
console.assert(this._scriptTimeline);
this._scriptTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._scriptTimelineRecordAdded, this);
},
// Private
......
Source/WebInspectorUI/UserInterface/Timeline.js
View file @ 387f50ed
......@@ -27,12 +27,11 @@ WebInspector.Timeline = function()
{
WebInspector.Object.call(this);
this._records = [];
this._startTime = NaN;
this._endTime = NaN;
this.reset(true);
};
WebInspector.Timeline.Event = {
Reset: "timeline-reset",
RecordAdded: "timeline-record-added",
TimesUpdated: "timeline-times-updated"
};
......@@ -58,6 +57,18 @@ WebInspector.Timeline.prototype = {
return this._records;
},
reset: function(suppressEvents)
{
this._records = [];
this._startTime = NaN;
this._endTime = NaN;
if (!suppressEvents) {
this.dispatchEventToListeners(WebInspector.Timeline.Event.Reset);
this.dispatchEventToListeners(WebInspector.Timeline.Event.TimesUpdated);
}
},
addRecord: function(record)
{
if (record.updatesDynamically)
......
Source/WebInspectorUI/UserInterface/TimelineContentView.js
View file @ 387f50ed
......@@ -27,6 +27,8 @@ WebInspector.TimelineContentView = function(recording)
{
WebInspector.ContentView.call(this, recording);
this._recording = recording;
this.element.classList.add(WebInspector.TimelineContentView.StyleClassName);
this._timelineOverview = new WebInspector.TimelineOverview;
......@@ -40,12 +42,12 @@ WebInspector.TimelineContentView = function(recording)
this._viewContainer.classList.add(WebInspector.TimelineContentView.ViewContainerStyleClassName);
this.element.appendChild(this._viewContainer);
this._overviewTimelineView = new WebInspector.OverviewTimelineView;
this._discreteTimelineViewMap = {
[WebInspector.TimelineRecord.Type.Network]: new WebInspector.NetworkTimelineView,
[WebInspector.TimelineRecord.Type.Layout]: new WebInspector.LayoutTimelineView,
[WebInspector.TimelineRecord.Type.Script]: new WebInspector.ScriptTimelineView
};
this._overviewTimelineView = new WebInspector.OverviewTimelineView(recording);
this._discreteTimelineViewMap = new Map;
this._discreteTimelineViewMap.set(WebInspector.TimelineRecord.Type.Network, new WebInspector.NetworkTimelineView(recording));
this._discreteTimelineViewMap.set(WebInspector.TimelineRecord.Type.Layout, new WebInspector.LayoutTimelineView(recording));
this._discreteTimelineViewMap.set(WebInspector.TimelineRecord.Type.Script, new WebInspector.ScriptTimelineView(recording));
function createPathComponent(displayName, className, representedObject)
{
......@@ -54,20 +56,20 @@ WebInspector.TimelineContentView = function(recording)
return pathComponent;
}
var networkPathComponent = createPathComponent.call(this, WebInspector.UIString("Network Requests"), WebInspector.TimelineSidebarPanel.NetworkIconStyleClass, WebInspector.TimelineRecord.Type.Network);
var layoutPathComponent = createPathComponent.call(this, WebInspector.UIString("Layout & Rendering"), WebInspector.TimelineSidebarPanel.ColorsIconStyleClass, WebInspector.TimelineRecord.Type.Layout);
var scriptPathComponent = createPathComponent.call(this, WebInspector.UIString("JavaScript & Events"), WebInspector.TimelineSidebarPanel.ScriptIconStyleClass, WebInspector.TimelineRecord.Type.Script);
this._pathComponentMap = new Map;
this._pathComponentMap.set(WebInspector.TimelineRecord.Type.Network, createPathComponent.call(this, WebInspector.UIString("Network Requests"), WebInspector.TimelineSidebarPanel.NetworkIconStyleClass, WebInspector.TimelineRecord.Type.Network));
this._pathComponentMap.set(WebInspector.TimelineRecord.Type.Layout, createPathComponent.call(this, WebInspector.UIString("Layout & Rendering"), WebInspector.TimelineSidebarPanel.ColorsIconStyleClass, WebInspector.TimelineRecord.Type.Layout));
this._pathComponentMap.set(WebInspector.TimelineRecord.Type.Script, createPathComponent.call(this, WebInspector.UIString("JavaScript & Events"), WebInspector.TimelineSidebarPanel.ScriptIconStyleClass, WebInspector.TimelineRecord.Type.Script));
networkPathComponent.nextSibling = layoutPathComponent;
layoutPathComponent.previousSibling = networkPathComponent;
layoutPathComponent.nextSibling = scriptPathComponent;
scriptPathComponent.previousSibling = layoutPathComponent;
var previousPathComponent = null;
for (var pathComponent of this._pathComponentMap.values()) {
if (previousPathComponent) {
previousPathComponent.nextSibling = pathComponent;
pathComponent.previousSibling = previousPathComponent;
}
this._pathComponentMap = {
[WebInspector.TimelineRecord.Type.Network]: networkPathComponent,
[WebInspector.TimelineRecord.Type.Layout]: layoutPathComponent,
[WebInspector.TimelineRecord.Type.Script]: scriptPathComponent
};
previousPathComponent = pathComponent;
}
this._currentTimelineView = null;
this._currentTimelineViewIdentifier = null;
......@@ -75,7 +77,8 @@ WebInspector.TimelineContentView = function(recording)
this._updating = false;
this._lastUpdateTimestamp = NaN;
WebInspector.timelineManager.recording.addEventListener(WebInspector.TimelineRecording.Event.Reset, this._recordingReset, this);
recording.addEventListener(WebInspector.TimelineRecording.Event.Reset, this._recordingReset, this);
WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.RecordingStarted, this._recordingStarted, this);
WebInspector.timelineManager.addEventListener(WebInspector.TimelineManager.Event.RecordingStopped, this._recordingStopped, this);
......@@ -98,11 +101,11 @@ WebInspector.TimelineContentView.prototype = {
showTimelineView: function(identifier)
{
console.assert(identifier in this._discreteTimelineViewMap);
if (!(identifier in this._discreteTimelineViewMap))
console.assert(this._discreteTimelineViewMap.has(identifier));
if (!this._discreteTimelineViewMap.has(identifier))
return;
this._showTimelineView(this._discreteTimelineViewMap[identifier], identifier);
this._showTimelineView(this._discreteTimelineViewMap.get(identifier), identifier);
},
get allowedNavigationSidebarPanels()
......@@ -120,7 +123,7 @@ WebInspector.TimelineContentView.prototype = {
{
if (!this._currentTimelineViewIdentifier)
return [];
return [this._pathComponentMap[this._currentTimelineViewIdentifier]];
return [this._pathComponentMap.get(this._currentTimelineViewIdentifier)];
},
shown: function()
......@@ -156,7 +159,7 @@ WebInspector.TimelineContentView.prototype = {
var startTime = this._timelineOverview.selectionStartTime;
var endTime = this._timelineOverview.selectionStartTime + this._timelineOverview.selectionDuration;
var currentTime = this._currentTimeMarker.time || WebInspector.timelineManager.recording.startTime;
var currentTime = this._currentTimeMarker.time || this._recording.startTime;
function checkTimeBounds(itemStartTime, itemEndTime)
{
......@@ -236,9 +239,9 @@ WebInspector.TimelineContentView.prototype = {
_update: function(timestamp)
{
var startTime = WebInspector.timelineManager.recording.startTime;
var startTime = this._recording.startTime;
var currentTime = this._currentTimeMarker.time || startTime;
var endTime = WebInspector.timelineManager.recording.endTime;
var endTime = this._recording.endTime;
var timespanSinceLastUpdate = (timestamp - this._lastUpdateTimestamp) / 1000 || 0;
currentTime += timespanSinceLastUpdate;
......@@ -250,8 +253,8 @@ WebInspector.TimelineContentView.prototype = {
this._timelineOverview.selectionStartTime = startTime + selectionOffset;
this._overviewTimelineView.zeroTime = startTime;
for (var identifier in this._discreteTimelineViewMap)
this._discreteTimelineViewMap[identifier].zeroTime = startTime;
for (var timelineView of this._discreteTimelineViewMap.values())
timelineView.zeroTime = startTime;
delete this._startTimeNeedsReset;
}
......@@ -314,8 +317,8 @@ WebInspector.TimelineContentView.prototype = {
this._currentTimeMarker.time = 0;
this._overviewTimelineView.reset();
for (var identifier in this._discreteTimelineViewMap)
this._discreteTimelineViewMap[identifier].reset();
for (var timelineView of this._discreteTimelineViewMap.values())
timelineView.reset();
},
_timeRangeSelectionChanged: function(event)
......
Source/WebInspectorUI/UserInterface/TimelineRecording.js
View file @ 387f50ed
......@@ -27,6 +27,14 @@ WebInspector.TimelineRecording = function()
{
WebInspector.Object.call(this);
this._timelines = new Map;
this._timelines.set(WebInspector.TimelineRecord.Type.Network, new WebInspector.NetworkTimeline);
this._timelines.set(WebInspector.TimelineRecord.Type.Script, new WebInspector.Timeline);
this._timelines.set(WebInspector.TimelineRecord.Type.Layout, new WebInspector.Timeline);
for (var timeline of this._timelines.values())
timeline.addEventListener(WebInspector.Timeline.Event.TimesUpdated, this._timelineTimesUpdated, this);
this.reset(true);
};
......@@ -57,30 +65,20 @@ WebInspector.TimelineRecording.prototype = {
return this._endTime;
},
reset: function(newObject)
reset: function(suppressEvents)
{
if (this._timelines) {
this._timelines.forEach(function(timeline) {
timeline.removeEventListener(null, null, this);
}, this);
}
this._timelines = new Map;
this._timelines.set(WebInspector.TimelineRecord.Type.Network, new WebInspector.NetworkTimeline);
this._timelines.set(WebInspector.TimelineRecord.Type.Script, new WebInspector.Timeline);
this._timelines.set(WebInspector.TimelineRecord.Type.Layout, new WebInspector.Timeline);
this._timelines.forEach(function(timeline) {
timeline.addEventListener(WebInspector.Timeline.Event.TimesUpdated, this._timelineTimesUpdated, this);
}, this);
this._sourceCodeTimelinesMap = new Map;
this._eventMarkers = [];
this._startTime = NaN;
this._endTime = NaN;
if (!newObject)
for (var timeline of this._timelines.values())
timeline.reset(suppressEvents);
if (!suppressEvents) {
this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.Reset);
this.dispatchEventToListeners(WebInspector.TimelineRecording.Event.TimesUpdated);
}
},
sourceCodeTimelinesForSourceCode: function(sourceCode)
......@@ -88,15 +86,7 @@ WebInspector.TimelineRecording.prototype = {
var timelines = this._sourceCodeTimelinesMap.get(sourceCode);
if (!timelines)
return [];
var result = [];
// FIXME: This could use a for..of loop once they are supported on Maps.
timelines.forEach(function(sourceCodeTimeline) {
result.push(sourceCodeTimeline);
});
return result;
return timelines.values();
},
addEventMarker: function(eventMarker)
......
Source/WebInspectorUI/UserInterface/TimelineSidebarPanel.js
View file @ 387f50ed
......@@ -62,19 +62,13 @@ WebInspector.TimelineSidebarPanel = function()
return treeElement;
}
var networkTimelineTreeElement = createTimelineTreeElement.call(this, WebInspector.UIString("Network Requests"), WebInspector.TimelineSidebarPanel.NetworkIconStyleClass, WebInspector.TimelineRecord.Type.Network);
var layoutTimelineTreeElement = createTimelineTreeElement.call(this, WebInspector.UIString("Layout & Rendering"), WebInspector.TimelineSidebarPanel.ColorsIconStyleClass, WebInspector.TimelineRecord.Type.Layout);
var scriptTimelineTreeElement = createTimelineTreeElement.call(this, WebInspector.UIString("JavaScript & Events"), WebInspector.TimelineSidebarPanel.ScriptIconStyleClass, WebInspector.TimelineRecord.Type.Script);
this._timelineTreeElementMap = new Map;
this._timelineTreeElementMap.set(WebInspector.TimelineRecord.Type.Network, createTimelineTreeElement.call(this, WebInspector.UIString("Network Requests"), WebInspector.TimelineSidebarPanel.NetworkIconStyleClass, WebInspector.TimelineRecord.Type.Network));
this._timelineTreeElementMap.set(WebInspector.TimelineRecord.Type.Layout, createTimelineTreeElement.call(this, WebInspector.UIString("Layout & Rendering"), WebInspector.TimelineSidebarPanel.ColorsIconStyleClass, WebInspector.TimelineRecord.Type.Layout));
this._timelineTreeElementMap.set(WebInspector.TimelineRecord.Type.Script, createTimelineTreeElement.call(this, WebInspector.UIString("JavaScript & Events"), WebInspector.TimelineSidebarPanel.ScriptIconStyleClass, WebInspector.TimelineRecord.Type.Script));
this._timelinesTreeOutline.appendChild(networkTimelineTreeElement);
this._timelinesTreeOutline.appendChild(layoutTimelineTreeElement);
this._timelinesTreeOutline.appendChild(scriptTimelineTreeElement);
this._timelineTreeElementMap = {
[WebInspector.TimelineRecord.Type.Network]: networkTimelineTreeElement,
[WebInspector.TimelineRecord.Type.Layout]: layoutTimelineTreeElement,
[WebInspector.TimelineRecord.Type.Script]: scriptTimelineTreeElement
};
for (var timelineTreeElement of this._timelineTreeElementMap.values())
this._timelinesTreeOutline.appendChild(timelineTreeElement);
this._timelineOverviewTreeElement = new WebInspector.GeneralTreeElement(WebInspector.TimelineSidebarPanel.StopwatchIconStyleClass, WebInspector.UIString("Timelines"), null, WebInspector.timelineManager.recording);
this._timelineOverviewTreeElement.addEventListener(WebInspector.HierarchicalPathComponent.Event.SiblingWasSelected, this.showTimelineOverview, this);
......@@ -202,10 +196,11 @@ WebInspector.TimelineSidebarPanel.prototype = {
showTimelineView: function(identifier)
{
if (!this._timelineTreeElementMap[identifier])
console.assert(this._timelineTreeElementMap.has(identifier));
if (!this._timelineTreeElementMap.has(identifier))
return;
this._timelineTreeElementMap[identifier].select(true, false, true, true);
this._timelineTreeElementMap.get(identifier).select(true, false, true, true);
this._timelineContentView.showTimelineView(identifier);
WebInspector.contentBrowser.showContentView(this._timelineContentView);
......@@ -283,7 +278,7 @@ WebInspector.TimelineSidebarPanel.prototype = {
_timelinesTreeElementSelected: function(treeElement, selectedByUser)
{
console.assert(this._timelineTreeElementMap[treeElement.representedObject] === treeElement);
console.assert(this._timelineTreeElementMap.get(treeElement.representedObject) === treeElement);
this.showTimelineView(treeElement.representedObject);
},
......
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