Title: [211273] branches/safari-603-branch/Source/WebCore
- Revision
- 211273
- Author
- matthew_han...@apple.com
- Date
- 2017-01-27 00:02:28 -0800 (Fri, 27 Jan 2017)
Log Message
Merge r211242. rdar://problem/29957753
Modified Paths
Diff
Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (211272 => 211273)
--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 08:02:25 UTC (rev 211272)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-27 08:02:28 UTC (rev 211273)
@@ -1,5 +1,24 @@
2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+ Merge r211242. rdar://problem/29957753
+
+ 2017-01-26 Commit Queue <commit-qu...@webkit.org>
+
+ Unreviewed, rolling out r210328.
+ https://bugs.webkit.org/show_bug.cgi?id=167476
+
+ Blocking bug is fixed <rdar://problem/29957753> (Requested by
+ keith_miller on #webkit).
+
+ Reverted changeset:
+
+ "Disable smooth playhead animation for main content media in
+ the Touch Bar"
+ https://bugs.webkit.org/show_bug.cgi?id=166715
+ http://trac.webkit.org/changeset/210328
+
+2017-01-26 Matthew Hanson <matthew_han...@apple.com>
+
Merge r211241. rdar://problem/30099051
2017-01-26 Joseph Pecoraro <pecor...@apple.com>
Modified: branches/safari-603-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (211272 => 211273)
--- branches/safari-603-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2017-01-27 08:02:25 UTC (rev 211272)
+++ branches/safari-603-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2017-01-27 08:02:28 UTC (rev 211273)
@@ -220,10 +220,7 @@
|| (manager.rate < 0 && model->playbackStartedTime() <= currentTime))
effectivePlaybackRate = 0;
- // FIXME: The timing value should ideally use the effective playback rate, but this causes AVKit to indefinitely fire a repeating timer.
- // More investigation will be required before we re-enable smooth playhead animation -- for now, we should just pretend that the playback
- // rate is always 0.
- manager.timing = [getAVValueTimingClass() valueTimingWithAnchorValue:currentTime anchorTimeStamp:effectiveAnchorTime rate:0];
+ manager.timing = [getAVValueTimingClass() valueTimingWithAnchorValue:currentTime anchorTimeStamp:effectiveAnchorTime rate:effectivePlaybackRate];
}
#endif // ENABLE(WEB_PLAYBACK_CONTROLS_MANAGER)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
