Title: [265331] branches/safari-610.1.25-branch/Source/WebCore
- Revision
- 265331
- Author
- repst...@apple.com
- Date
- 2020-08-06 09:37:50 -0700 (Thu, 06 Aug 2020)
Log Message
Cherry-pick r265318. rdar://problem/66630841
Netflix.com shows a scrubber that doesn't work
https://bugs.webkit.org/show_bug.cgi?id=215199
Reviewed by Eric Carlson.
The "contentDuration" property of WebPlaybackControlsManager needs to be infinite
when the video is not seekable. Otherwise, AVKit will show a scrubber that doesn't
work on the Touch Bar.
* platform/mac/WebPlaybackControlsManager.mm:
(-[WebPlaybackControlsManager contentDuration]):
(-[WebPlaybackControlsManager setContentDuration:]):
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265318 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Modified Paths
Diff
Modified: branches/safari-610.1.25-branch/Source/WebCore/ChangeLog (265330 => 265331)
--- branches/safari-610.1.25-branch/Source/WebCore/ChangeLog 2020-08-06 16:18:03 UTC (rev 265330)
+++ branches/safari-610.1.25-branch/Source/WebCore/ChangeLog 2020-08-06 16:37:50 UTC (rev 265331)
@@ -1,3 +1,38 @@
+2020-08-06 Alan Coon <alanc...@apple.com>
+
+ Cherry-pick r265318. rdar://problem/66630841
+
+ Netflix.com shows a scrubber that doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=215199
+
+ Reviewed by Eric Carlson.
+
+ The "contentDuration" property of WebPlaybackControlsManager needs to be infinite
+ when the video is not seekable. Otherwise, AVKit will show a scrubber that doesn't
+ work on the Touch Bar.
+
+ * platform/mac/WebPlaybackControlsManager.mm:
+ (-[WebPlaybackControlsManager contentDuration]):
+ (-[WebPlaybackControlsManager setContentDuration:]):
+
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265318 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2020-08-05 Peng Liu <peng.l...@apple.com>
+
+ Netflix.com shows a scrubber that doesn't work
+ https://bugs.webkit.org/show_bug.cgi?id=215199
+
+ Reviewed by Eric Carlson.
+
+ The "contentDuration" property of WebPlaybackControlsManager needs to be infinite
+ when the video is not seekable. Otherwise, AVKit will show a scrubber that doesn't
+ work on the Touch Bar.
+
+ * platform/mac/WebPlaybackControlsManager.mm:
+ (-[WebPlaybackControlsManager contentDuration]):
+ (-[WebPlaybackControlsManager setContentDuration:]):
+
2020-08-05 Russell Epstein <repst...@apple.com>
Revert r265115. rdar://problem/66552761
Modified: branches/safari-610.1.25-branch/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm (265330 => 265331)
--- branches/safari-610.1.25-branch/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2020-08-06 16:18:03 UTC (rev 265330)
+++ branches/safari-610.1.25-branch/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm 2020-08-06 16:37:50 UTC (rev 265331)
@@ -45,7 +45,6 @@
@implementation WebPlaybackControlsManager
-@synthesize contentDuration=_contentDuration;
@synthesize seekToTime=_seekToTime;
@synthesize hasEnabledAudio=_hasEnabledAudio;
@synthesize hasEnabledVideo=_hasEnabledVideo;
@@ -62,6 +61,16 @@
[super dealloc];
}
+- (NSTimeInterval)contentDuration
+{
+ return [_seekableTimeRanges count] ? _contentDuration : std::numeric_limits<double>::infinity();
+}
+
+- (void)setContentDuration:(NSTimeInterval)duration
+{
+ _contentDuration = duration;
+}
+
- (AVValueTiming *)timing
{
return _timing.get();
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
