Title: [199241] trunk/Source/WebInspectorUI
- Revision
- 199241
- Author
- [email protected]
- Date
- 2016-04-08 12:40:48 -0700 (Fri, 08 Apr 2016)
Log Message
JSContext Inspector: Fix asserts and uncaught exception showing Timeline Tab
https://bugs.webkit.org/show_bug.cgi?id=156411
Patch by Joseph Pecoraro <[email protected]> on 2016-04-08
Reviewed by Timothy Hatcher.
* UserInterface/Views/OverviewTimelineView.js:
(WebInspector.OverviewTimelineView):
(WebInspector.OverviewTimelineView.prototype.closed):
Gracefully handle if we do not have a Network Timeline.
* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView.prototype._changeViewMode):
This function is always called by the constructor, so the assert
is not useful since it can be called when FPS is not supported.
Modified Paths
Diff
Modified: trunk/Source/WebInspectorUI/ChangeLog (199240 => 199241)
--- trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 19:37:04 UTC (rev 199240)
+++ trunk/Source/WebInspectorUI/ChangeLog 2016-04-08 19:40:48 UTC (rev 199241)
@@ -1,3 +1,20 @@
+2016-04-08 Joseph Pecoraro <[email protected]>
+
+ JSContext Inspector: Fix asserts and uncaught exception showing Timeline Tab
+ https://bugs.webkit.org/show_bug.cgi?id=156411
+
+ Reviewed by Timothy Hatcher.
+
+ * UserInterface/Views/OverviewTimelineView.js:
+ (WebInspector.OverviewTimelineView):
+ (WebInspector.OverviewTimelineView.prototype.closed):
+ Gracefully handle if we do not have a Network Timeline.
+
+ * UserInterface/Views/TimelineTabContentView.js:
+ (WebInspector.TimelineTabContentView.prototype._changeViewMode):
+ This function is always called by the constructor, so the assert
+ is not useful since it can be called when FPS is not supported.
+
2016-04-08 Matt Baker <[email protected]>
Web Inspector: Attempting to dismiss a popover that is already being dismissed causes an error
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js (199240 => 199241)
--- trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-04-08 19:37:04 UTC (rev 199240)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/OverviewTimelineView.js 2016-04-08 19:40:48 UTC (rev 199241)
@@ -54,7 +54,8 @@
this.addSubview(this._dataGrid);
this._networkTimeline = recording.timelines.get(WebInspector.TimelineRecord.Type.Network);
- this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
+ if (this._networkTimeline)
+ this._networkTimeline.addEventListener(WebInspector.Timeline.Event.RecordAdded, this._networkTimelineRecordAdded, this);
recording.addEventListener(WebInspector.TimelineRecording.Event.SourceCodeTimelineAdded, this._sourceCodeTimelineAdded, this);
recording.addEventListener(WebInspector.TimelineRecording.Event.MarkerAdded, this._markerAdded, this);
@@ -85,7 +86,8 @@
closed()
{
- this._networkTimeline.removeEventListener(null, null, this);
+ if (this._networkTimeline)
+ this._networkTimeline.removeEventListener(null, null, this);
this._recording.removeEventListener(null, null, this);
}
Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (199240 => 199241)
--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-04-08 19:37:04 UTC (rev 199240)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js 2016-04-08 19:40:48 UTC (rev 199241)
@@ -496,8 +496,6 @@
_changeViewMode(mode, selectedByUser)
{
- console.assert(WebInspector.FPSInstrument.supported());
-
if (this._viewMode === mode)
return;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
