Changeset 278622 in webkit

Timestamp:

Jun 8, 2021, 11:39:39 AM (5 years ago)

Author:

Devin Rousso

Message:

[Modern Media Controls] Don't show Playback Speed when up-to-date Live Boadcasts
​https://bugs.webkit.org/show_bug.cgi?id=226744

Reviewed by Eric Carlson.

Source/WebCore:

Test: http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast.html

• Modules/modern-media-controls/media/overflow-support.js:

(OverflowSupport.prototype.get mediaEvents):
(OverflowSupport.prototype.syncControl):
(OverflowSupport.prototype.get _includePlaybackRates): Added.
Rework existing logic that determines whether to include "Playback Speed" into a separate
function for clarity.

LayoutTests:

• http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast.html: Added.
• http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/media/modern-media-controls/overflow-support (added)
• LayoutTests/http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast-expected.txt (added)
• LayoutTests/http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/Modules/modern-media-controls/media/overflow-support.js (modified) (3 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2021-06-08  Devin Rousso  <drousso@apple.com>
+
+        [Modern Media Controls] Don't show Playback Speed when up-to-date Live Boadcasts
+        https://bugs.webkit.org/show_bug.cgi?id=226744
+
+        Reviewed by Eric Carlson.
+
+        * http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast.html: Added.
+        * http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast-expected.txt: Added.
+
 2021-06-08  Devin Rousso  <drousso@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2021-06-08  Devin Rousso  <drousso@apple.com>
+
+        [Modern Media Controls] Don't show Playback Speed when up-to-date Live Boadcasts
+        https://bugs.webkit.org/show_bug.cgi?id=226744
+
+        Reviewed by Eric Carlson.
+
+        Test: http/tests/media/modern-media-controls/overflow-support/playback-speed-live-broadcast.html
+
+        * Modules/modern-media-controls/media/overflow-support.js:
+        (OverflowSupport.prototype.get mediaEvents):
+        (OverflowSupport.prototype.syncControl):
+        (OverflowSupport.prototype.get _includePlaybackRates): Added.
+        Rework existing logic that determines whether to include "Playback Speed" into a separate
+        function for clarity.
+
 2021-06-08  Antti Koivisto  <antti@apple.com>
 

trunk/Source/WebCore/Modules/modern-media-controls/media/overflow-support.js

@@ -31 +31 @@
     get mediaEvents()
     {
-        return ["loadstart", "loadedmetadata"];
+        return [
+            "abort",
+            "canplay",
+            "canplaythrough",
+            "durationchange",
+            "emptied",
+            "error",
+            "loadeddata",
+            "loadedmetadata",
+            "loadstart",
+            "playing",
+            "stalled",
+            "suspend",
+            "waiting",
+        ];
     }
 
@@ -55 +69 @@
         let defaultContextMenuOptions = {};
 
-        if (!this.mediaController.hidePlaybackRates && (!window.MediaStream || !(this.mediaController.media.srcObject instanceof MediaStream)))
+        if (this._includePlaybackRates)
             defaultContextMenuOptions.includePlaybackRates = true;
 
@@ -70 +84 @@
     }
 
+    // Private
+
+    get _includePlaybackRates()
+    {
+        if (this.mediaController.hidePlaybackRates)
+            return false;
+
+        let media = this.mediaController.media;
+
+        if (media.duration === Number.POSITIVE_INFINITY && media.readyState >= HTMLMediaElement.HAVE_CURRENT_DATA) {
+            // Do not allow adjustment of the playback rate for live broadcasts.
+            return false;
+        }
+
+        if (window.MediaStream && media.srcObject instanceof MediaStream) {
+            // http://w3c.github.io/mediacapture-main/#mediastreams-in-media-elements
+            // "playbackRate" - A MediaStream is not seekable.
+            return false;
+        }
+
+        return true;
+    }
+
 }