Changeset 275100 in webkit

Timestamp:

Mar 26, 2021, 8:58:17 AM (4 years ago)

Author:

Devin Rousso

Message:

Adopt AVKit SPI for hiding touch bar seeking controls
​https://bugs.webkit.org/show_bug.cgi?id=223773
<rdar://problem/68937617>

Reviewed by Jer Noble.

Source/WebCore:

• platform/mac/WebPlaybackControlsManager.h:
• platform/mac/WebPlaybackControlsManager.mm:

(-[WebPlaybackControlsManager setSeekableTimeRanges:]):
(-[WebPlaybackControlsManager canBeginTouchBarScrubbing]):
If the list of seekable time ranges is empty, we are unable to seek.

Source/WebCore/PAL:

• pal/spi/cocoa/AVKitSPI.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• PAL/ChangeLog (modified) (1 diff)
• PAL/pal/spi/cocoa/AVKitSPI.h (modified) (1 diff)
• platform/mac/WebPlaybackControlsManager.h (modified) (2 diffs)
• platform/mac/WebPlaybackControlsManager.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-03-26  Devin Rousso  <drousso@apple.com>
+
+        Adopt AVKit SPI for hiding touch bar seeking controls
+        https://bugs.webkit.org/show_bug.cgi?id=223773
+        <rdar://problem/68937617>
+
+        Reviewed by Jer Noble.
+
+        * platform/mac/WebPlaybackControlsManager.h:
+        * platform/mac/WebPlaybackControlsManager.mm:
+        (-[WebPlaybackControlsManager setSeekableTimeRanges:]):
+        (-[WebPlaybackControlsManager canBeginTouchBarScrubbing]):
+        If the list of seekable time ranges is empty, we are unable to seek.
+
 2021-03-26  Kimmo Kinnunen  <kkinnunen@apple.com>
 

trunk/Source/WebCore/PAL/ChangeLog

@@ +1 @@
+2021-03-26  Devin Rousso  <drousso@apple.com>
+
+        Adopt AVKit SPI for hiding touch bar seeking controls
+        https://bugs.webkit.org/show_bug.cgi?id=223773
+        <rdar://problem/68937617>
+
+        Reviewed by Jer Noble.
+
+        * pal/spi/cocoa/AVKitSPI.h:
+
 2021-03-26  Jessie Berlin  <jberlin@webkit.org>
 

trunk/Source/WebCore/PAL/pal/spi/cocoa/AVKitSPI.h

@@ -330 +330 @@
 @property (readonly) BOOL canTogglePictureInPicture;
 - (void)togglePictureInPicture;
+@property (nonatomic, readonly) BOOL canSeek;
 
 typedef NS_ENUM(NSInteger, AVTouchBarMediaSelectionOptionType) {

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.h

@@ -57 +57 @@
     BOOL _hasEnabledVideo;
     BOOL _canTogglePlayback;
+    BOOL _canSeek;
 }
 
@@ -74 +75 @@
 @property BOOL canTogglePictureInPicture;
 - (void)togglePictureInPicture;
+@property (nonatomic, readonly) BOOL canSeek;
 
 - (AVTouchBarMediaSelectionOption *)currentAudioTouchBarMediaSelectionOption;

trunk/Source/WebCore/platform/mac/WebPlaybackControlsManager.mm

@@ -55 +55 @@
 @synthesize pictureInPictureActive;
 @synthesize canTogglePictureInPicture;
+@synthesize canSeek = _canSeek;
 
 - (void)dealloc
@@ -91 +92 @@
 {
     _seekableTimeRanges = timeRanges;
+
+    _canSeek = timeRanges.count;
 }
 
@@ -131 +134 @@
     // other media. The intent of the API is that we return NO when the media is being scrubbed via the on-screen scrubber.
     // But we can only possibly get the right answer for media that uses the default controls.
-    return std::isfinite(_contentDuration) && [_seekableTimeRanges count];
+    return _canSeek && std::isfinite(_contentDuration);
 }