Changeset 278850 in webkit

Timestamp:

Jun 14, 2021, 3:04:59 PM (5 years ago)

Author:

Devin Rousso

Message:

[macOS] TouchBar playback speed controls don't work
​https://bugs.webkit.org/show_bug.cgi?id=226987
<rdar://problem/79216098>

Reviewed by Eric Carlson.

Override setRate: and setDefaultPlaybackRate: instead of just having an ivar so that
TouchBar playback speed controls actually affect the corresponding <video>.

• platform/mac/WebPlaybackControlsManager.mm:

(-[WebPlaybackControlsManager defaultPlaybackRate]): Added.
(-[WebPlaybackControlsManager setDefaultPlaybackRate:]): Added.
(-[WebPlaybackControlsManager rate]): Added.
(-[WebPlaybackControlsManager setRate:]): Added.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/mac/WebPlaybackControlsManager.mm (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-14  Devin Rousso  <drousso@apple.com>
+
+        [macOS] TouchBar playback speed controls don't work
+        https://bugs.webkit.org/show_bug.cgi?id=226987
+        <rdar://problem/79216098>
+
+        Reviewed by Eric Carlson.
+
+        Override `setRate:` and `setDefaultPlaybackRate:` instead of just having an ivar so that
+        TouchBar playback speed controls actually affect the corresponding `<video>`.
+
+        * platform/mac/WebPlaybackControlsManager.mm:
+        (-[WebPlaybackControlsManager defaultPlaybackRate]): Added.
+        (-[WebPlaybackControlsManager setDefaultPlaybackRate:]): Added.
+        (-[WebPlaybackControlsManager rate]): Added.
+        (-[WebPlaybackControlsManager setRate:]): Added.
+
 2021-06-14  Alex Christensen  <achristensen@webkit.org>
 

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

@@ -49 +49 @@
 @synthesize hasEnabledAudio = _hasEnabledAudio;
 @synthesize hasEnabledVideo = _hasEnabledVideo;
-@synthesize defaultPlaybackRate = _defaultPlaybackRate;
-@synthesize rate = _rate;
 @synthesize canTogglePlayback = _canTogglePlayback;
 @synthesize allowsPictureInPicturePlayback;
@@ -332 +330 @@
 }
 
+- (double)defaultPlaybackRate
+{
+    return _defaultPlaybackRate;
+}
+
+- (void)setDefaultPlaybackRate:(double)defaultPlaybackRate
+{
+    if (defaultPlaybackRate == _defaultPlaybackRate)
+        return;
+
+    _defaultPlaybackRate = defaultPlaybackRate;
+
+    if (_playbackSessionInterfaceMac) {
+        if (auto* model = _playbackSessionInterfaceMac->playbackSessionModel(); model && model->defaultPlaybackRate() != _defaultPlaybackRate)
+            model->setDefaultPlaybackRate(_defaultPlaybackRate);
+    }
+
+    if ([self isPlaying])
+        [self setRate:_defaultPlaybackRate];
+}
+
+- (float)rate
+{
+    return _rate;
+}
+
+- (void)setRate:(float)rate
+{
+    if (rate == _rate)
+        return;
+
+    _rate = rate;
+
+    // AVKit doesn't have a separate variable for "paused", instead representing it by a `rate` of
+    // `0`. Unfortunately, `HTMLMediaElement::play` doesn't call `HTMLMediaElement::setPlaybackRate`
+    // so if we propagate a `rate` of `0` along to the `HTMLMediaElement` then any attempt to
+    // `HTMLMediaElement::play` will effectively be a no-op since the `playbackRate` will be `0`.
+    if (!_rate)
+        return;
+
+    // In AVKit, the `defaultPlaybackRate` is used when playback starts, such as resuming after
+    // pausing. In WebKit, however, `defaultPlaybackRate` is only used when first loading and after
+    // ending scanning, with the `playbackRate` being used in all other cases, including when
+    // resuming after pausing. As such, WebKit should return the `playbackRate` instead of the
+    // `defaultPlaybackRate` in these cases when communicating with AVKit.
+    [self setDefaultPlaybackRate:_rate];
+
+    if (_playbackSessionInterfaceMac) {
+        if (auto* model = _playbackSessionInterfaceMac->playbackSessionModel(); model && model->playbackRate() != _rate)
+            model->setPlaybackRate(_rate);
+    }
+}
+
 - (void)togglePictureInPicture
 {