Title: [198603] trunk/Source/WebInspectorUI
Revision
198603
Author
[email protected]
Date
2016-03-23 16:42:18 -0700 (Wed, 23 Mar 2016)

Log Message

Web Inspector: Timeline Tab sometimes restores as blank
https://bugs.webkit.org/show_bug.cgi?id=155811

Patch by Joseph Pecoraro <[email protected]> on 2016-03-23
Reviewed by Timothy Hatcher.

* UserInterface/Views/TimelineTabContentView.js:
(WebInspector.TimelineTabContentView.prototype.restoreFromCookie):
When early bailing in restore, if there is no content view to restore,
then at least fallback to showing the Overview.

Modified Paths

Diff

Modified: trunk/Source/WebInspectorUI/ChangeLog (198602 => 198603)


--- trunk/Source/WebInspectorUI/ChangeLog	2016-03-23 22:45:55 UTC (rev 198602)
+++ trunk/Source/WebInspectorUI/ChangeLog	2016-03-23 23:42:18 UTC (rev 198603)
@@ -1,5 +1,17 @@
 2016-03-23  Joseph Pecoraro  <[email protected]>
 
+        Web Inspector: Timeline Tab sometimes restores as blank
+        https://bugs.webkit.org/show_bug.cgi?id=155811
+
+        Reviewed by Timothy Hatcher.
+
+        * UserInterface/Views/TimelineTabContentView.js:
+        (WebInspector.TimelineTabContentView.prototype.restoreFromCookie):
+        When early bailing in restore, if there is no content view to restore,
+        then at least fallback to showing the Overview.
+
+2016-03-23  Joseph Pecoraro  <[email protected]>
+
         Web Inspector: REGRESSION: Timeline Reset does not clear datagrids
         https://bugs.webkit.org/show_bug.cgi?id=155804
 

Modified: trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js (198602 => 198603)


--- trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js	2016-03-23 22:45:55 UTC (rev 198602)
+++ trunk/Source/WebInspectorUI/UserInterface/Views/TimelineTabContentView.js	2016-03-23 23:42:18 UTC (rev 198603)
@@ -306,8 +306,11 @@
         console.assert(this._displayedContentView);
 
         this._restoredShowingTimelineRecordingContentView = cookie[WebInspector.TimelineTabContentView.ShowingTimelineRecordingContentViewCookieKey];
-        if (!this._restoredShowingTimelineRecordingContentView)
+        if (!this._restoredShowingTimelineRecordingContentView) {
+            if (!this.contentBrowser.currentContentView)
+                this._showTimelineViewForType(WebInspector.TimelineTabContentView.OverviewTimelineIdentifierCookieValue);
             return;
+        }
 
         let selectedTimelineViewIdentifier = cookie[WebInspector.TimelineTabContentView.SelectedTimelineViewIdentifierCookieKey];
         if (selectedTimelineViewIdentifier === WebInspector.TimelineRecord.Type.RenderingFrame && !WebInspector.FPSInstrument.supported())
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to