Changeset 187318 in webkit

Timestamp:

Jul 24, 2015, 12:54:27 AM (11 years ago)

Author:

matthew_hanson@apple.com

Message:

Merge r187209. rdar://problem/21946519

Location:

branches/safari-601.1-branch/Source/WebInspectorUI

Files:

• ChangeLog (modified) (1 diff)
• UserInterface/Views/TimelineRecordingContentView.js (modified) (1 diff)

branches/safari-601.1-branch/Source/WebInspectorUI/ChangeLog

@@ +1 @@
+2015-07-24  Matthew Hanson  <matthew_hanson@apple.com>
+
+        Merge r187209. rdar://problem/21946519
+
+    2015-07-22  Joseph Pecoraro  <pecoraro@apple.com>
+
+            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  <lforschler@apple.com>
 

branches/safari-601.1-branch/Source/WebInspectorUI/UserInterface/Views/TimelineRecordingContentView.js

@@ -515 +515 @@
 
         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)