Title: [210362] branches/safari-602-branch/Source/WebCore
- Revision
- 210362
- Author
- bshaf...@apple.com
- Date
- 2017-01-05 10:32:24 -0800 (Thu, 05 Jan 2017)
Log Message
Merged r210328. rdar://problem/29885151
Modified Paths
Diff
Modified: branches/safari-602-branch/Source/WebCore/ChangeLog (210361 => 210362)
--- branches/safari-602-branch/Source/WebCore/ChangeLog 2017-01-05 18:31:27 UTC (rev 210361)
+++ branches/safari-602-branch/Source/WebCore/ChangeLog 2017-01-05 18:32:24 UTC (rev 210362)
@@ -1,3 +1,21 @@
+2017-01-05 Babak Shafiei <bshaf...@apple.com>
+
+ Merge r210328.
+
+ 2017-01-05 Wenson Hsieh <wenson_hs...@apple.com>
+
+ Disable smooth playhead animation for main content media in the Touch Bar
+ https://bugs.webkit.org/show_bug.cgi?id=166715
+ <rdar://problem/29870673>
+
+ Reviewed by Eric Carlson.
+
+ Passing in a non-zero playback rate to WebPlaybackControlsManager's timing property causes unintended effects
+ further down the stack. Please see the Radar for more details.
+
+ * platform/mac/WebPlaybackSessionInterfaceMac.mm:
+ (WebCore::WebPlaybackSessionInterfaceMac::updatePlaybackControlsManagerTiming):
+
2017-01-04 Babak Shafiei <bshaf...@apple.com>
Build fix for r210288.
Modified: branches/safari-602-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm (210361 => 210362)
--- branches/safari-602-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2017-01-05 18:31:27 UTC (rev 210361)
+++ branches/safari-602-branch/Source/WebCore/platform/mac/WebPlaybackSessionInterfaceMac.mm 2017-01-05 18:32:24 UTC (rev 210362)
@@ -188,7 +188,10 @@
|| (manager.rate < 0 && model->playbackStartedTime() <= currentTime))
effectivePlaybackRate = 0;
- manager.timing = [getAVValueTimingClass() valueTimingWithAnchorValue:currentTime anchorTimeStamp:effectiveAnchorTime rate:effectivePlaybackRate];
+ // 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];
}
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
