Title: [187318] branches/safari-601.1-branch/Source/WebInspectorUI
Revision
187318
Author
[email protected]
Date
2015-07-24 00:54:27 -0700 (Fri, 24 Jul 2015)

Log Message

Merge r187209. rdar://problem/21946519

Modified Paths

Diff

Modified: branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog (187317 => 187318)


--- branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog	2015-07-24 07:54:25 UTC (rev 187317)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog	2015-07-24 07:54:27 UTC (rev 187318)
@@ -1,3 +1,20 @@
+2015-07-24  Matthew Hanson  <[email protected]>
+
+        Merge r187209. rdar://problem/21946519
+
+    2015-07-22  Joseph Pecoraro  <[email protected]>
+
+            Web Inspector: Timeline's Current Time does not jump forward to new start time when starting a new recording, causes timeline to appear delayed and broken
+            https://bugs.webkit.org/show_bug.cgi?id=147204
+
+            Reviewed by Timothy Hatcher.
+
+            * UserInterface/Views/TimelineRecordingContentView.js:
+            (WebInspector.TimelineRecordingContentView.prototype._recordingTimesUpdated):
+            We were skipping a timeline, but it might have a new event record with
+            a new start time. This ensures we get an updated current time which makes
+            sense, and we jump forward to that time in the main timeline.
+
 2015-07-23  Lucas Forschler  <[email protected]>
 
         Merge r187123

Modified: branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js (187317 => 187318)


--- branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js	2015-07-24 07:54:25 UTC (rev 187317)
+++ branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js	2015-07-24 07:54:27 UTC (rev 187318)
@@ -514,10 +514,6 @@
         // We might want to have the backend send a "start" record to get current time moving.
 
         for (var timeline of this._recording.timelines.values()) {
-            // The rendering frame timeline doesn't use a time axis.
-            if (timeline.type === WebInspector.TimelineRecord.Type.RenderingFrame)
-                continue;
-
             var lastRecord = timeline.records.lastValue;
             if (!lastRecord)
                 continue;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to