Title: [197515] trunk/Source/WebInspectorUI
- Revision
- 197515
- Author
- [email protected]
- Date
- 2016-03-03 12:34:39 -0800 (Thu, 03 Mar 2016)
Log Message
Web Inspector: Assertion Failed: Cannot show timeline because it does not belong to the shown recording. – "overview"
https://bugs.webkit.org/show_bug.cgi?id=154972
<rdar://problem/24956233>
Reviewed by Timothy Hatcher.
* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView.prototype._showTimelineViewForType):
Just show the overview if the recording has no timeline of the given type.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (197514 => 197515)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-03-03 20:26:46 UTC (rev 197514)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-03-03 20:34:39 UTC (rev 197515)
@@ -1,3 +1,15 @@
+2016-03-03 Matt Baker <[email protected]>
+
+ Web Inspector: Assertion Failed: Cannot show timeline because it does not belong to the shown recording. – "overview"
+ https://bugs.webkit.org/show_bug.cgi?id=154972
+ <rdar://problem/24956233>
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WebInspector.TimelineTabContentView.prototype._showTimelineViewForType):
+ Just show the overview if the recording has no timeline of the given type.
+
2016-03-02 Matt Baker <[email protected]>
Web Inspector: Update MemoryTimelineView for new ruler height
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (197514 => 197515)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-03-03 20:26:46 UTC (rev 197514)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-03-03 20:34:39 UTC (rev 197515)
@@ -502,14 +502,10 @@
_showTimelineViewForType(timelineType)
{
- if (timelineType) {
- let timeline = this._displayedRecording.timelines.get(timelineType);
- console.assert(timeline, "Cannot show timeline because it does not belong to the shown recording.", timelineType);
- if (!timeline)
- return;
-
+ let timeline = timelineType ? this._displayedRecording.timelines.get(timelineType) : null;
+ if (timeline)
this._displayedContentView.showTimelineViewForTimeline(timeline);
- } else
+ else
this._displayedContentView.showOverviewTimelineView();
if (this.contentBrowser.currentContentView !== this._displayedContentView)
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
