Title: [271060] trunk
Revision
271060
Author
[email protected]
Date
2020-12-22 12:00:23 -0800 (Tue, 22 Dec 2020)

Log Message

MediaStreamTrack.muted value should not change before the corresponding event is fired
https://bugs.webkit.org/show_bug.cgi?id=220084

Reviewed by Eric Carlson.

Source/WebCore:

Before the patch, the muted value was changed and a task was queued to dispatch the corresponding event.
During a period of time, the muted value was changed while the event was not fired.
To fix this, dispatch a task that will change the value and dispatch the event.
MediaStreamTrack is now storing the muted value instead of relying on its m_private muted value.
The muted value is only used for JS as the rest of the code base expects to get the actual muted value.

Test: fast/mediastream/media-stream-track-muted-event.html

* Modules/mediastream/MediaStreamTrack.cpp:
(WebCore::MediaStreamTrack::MediaStreamTrack):
(WebCore::MediaStreamTrack::mutedForBindings const):
(WebCore::MediaStreamTrack::trackMutedChanged):
* Modules/mediastream/MediaStreamTrack.h:
* Modules/mediastream/MediaStreamTrack.idl:

LayoutTests:

* fast/mediastream/media-stream-track-muted-event-expected.txt: Added.
* fast/mediastream/media-stream-track-muted-event.html: Added.
* platform/ios/mediastream/audio-muted-in-background-tab.html: Updated to cope with async muted change.
* platform/ios/mediastream/video-muted-in-background-tab.html: Dittod

Modified Paths

Added Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (271059 => 271060)


--- trunk/LayoutTests/ChangeLog	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/LayoutTests/ChangeLog	2020-12-22 20:00:23 UTC (rev 271060)
@@ -1,3 +1,15 @@
+2020-12-22  Youenn Fablet  <[email protected]>
+
+        MediaStreamTrack.muted value should not change before the corresponding event is fired
+        https://bugs.webkit.org/show_bug.cgi?id=220084
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/media-stream-track-muted-event-expected.txt: Added.
+        * fast/mediastream/media-stream-track-muted-event.html: Added.
+        * platform/ios/mediastream/audio-muted-in-background-tab.html: Updated to cope with async muted change.
+        * platform/ios/mediastream/video-muted-in-background-tab.html: Dittod
+
 2020-12-22  Philippe Normand  <[email protected]>
 
         REGRESSION(r270612) [GStreamer][MSE] Some play/seek related failures

Added: trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event-expected.txt (0 => 271060)


--- trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event-expected.txt	                        (rev 0)
+++ trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event-expected.txt	2020-12-22 20:00:23 UTC (rev 271060)
@@ -0,0 +1,3 @@
+
+PASS Muted attribute value should not change before the corresponding event is fired
+

Added: trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event.html (0 => 271060)


--- trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event.html	                        (rev 0)
+++ trunk/LayoutTests/fast/mediastream/media-stream-track-muted-event.html	2020-12-22 20:00:23 UTC (rev 271060)
@@ -0,0 +1,32 @@
+<!DOCTYPE html>
+<html>
+<head>
+    <meta charset="utf-8">
+    <title>Muted attribute and events.</title>
+    <script src=""
+    <script src=""
+</head>
+<body>
+    <script>
+    promise_test(async (test) => {
+        const stream = await navigator.mediaDevices.getUserMedia({ audio: true});
+        if (!window.internals)
+            return;
+        const track = stream.getTracks()[0];
+        assert_false(track.muted, "muted 1");
+
+        internals.setMediaStreamTrackMuted(track, true);
+        assert_false(track.muted, "muted 2");
+        await  new Promise(resolve => track._onmute_ = resolve);
+        assert_true(track.muted, "muted 3");
+
+
+        internals.setMediaStreamTrackMuted(track, false);
+        assert_true(track.muted, "muted 4");
+        await  new Promise(resolve => track._onunmute_ = resolve);
+        assert_false(track.muted, "muted 5");
+    }, "Muted attribute value should not change before the corresponding event is fired");
+
+    </script>
+</body>
+</html>

Modified: trunk/LayoutTests/platform/ios/mediastream/audio-muted-in-background-tab.html (271059 => 271060)


--- trunk/LayoutTests/platform/ios/mediastream/audio-muted-in-background-tab.html	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/LayoutTests/platform/ios/mediastream/audio-muted-in-background-tab.html	2020-12-22 20:00:23 UTC (rev 271060)
@@ -29,36 +29,48 @@
                 })
 
                 .then(() => {
-                    test(() => {
+                    promise_test(async () => {
                         if (window.internals)
                             window.internals.setPageVisibility(false);
+                        if (!audioTrack.muted)
+                            await new Promise(resolve => audioTrack._onmute_ = resolve);
                         assert_true(audioTrack.muted, "audio track is muted");
+                        if (!videoTrack.muted)
+                            await new Promise(resolve => videoTrack._onmute_ = resolve);
                         assert_true(videoTrack.muted, "video track is muted");
                     }, "Hide page, video and audio should be muted");
                 })
 
                 .then(() => {
-                    test(() => {
+                    promise_test(async () => {
                         if (window.internals)
                             window.internals.setPageVisibility(true);
+                        if (audioTrack.muted)
+                            await new Promise(resolve => audioTrack._onunmute_ = resolve);
                         assert_false(audioTrack.muted, "audio track is active");
+                        if (videoTrack.muted)
+                            await new Promise(resolve => videoTrack._onunmute_ = resolve);
                         assert_false(videoTrack.muted, "video track is active");
                     }, "Show page, video and audio should be unmuted");
                 })
 
                 .then(() => {
-                    test(() => {
+                    promise_test(async () => {
                         if (window.internals) {
                             window.internals.setPageVisibility(false);
                             window.internals.setPageMuted("capturedevices");
                         }
+                        if (!audioTrack.muted)
+                            await new Promise(resolve => audioTrack._onmute_ = resolve);
                         assert_true(audioTrack.muted, "audio track is muted");
+                        if (!videoTrack.muted)
+                            await new Promise(resolve => videoTrack._onmute_ = resolve);
                         assert_true(videoTrack.muted, "video track is muted");
                     }, "Hide and mute page, video and audio should be muted");
                 })
 
                 .then(() => {
-                    test(() => {
+                    promise_test(async () => {
                         if (window.internals)
                             window.internals.setPageVisibility(true);
                         assert_true(audioTrack.muted, "audio track is muted");

Modified: trunk/LayoutTests/platform/ios/mediastream/video-muted-in-background-tab.html (271059 => 271060)


--- trunk/LayoutTests/platform/ios/mediastream/video-muted-in-background-tab.html	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/LayoutTests/platform/ios/mediastream/video-muted-in-background-tab.html	2020-12-22 20:00:23 UTC (rev 271060)
@@ -47,6 +47,8 @@
                     window.internals.setPageVisibility(false);
                 }
                 assert_false(audioTrack.muted, "audio track is active");
+                if (!videoTrack.muted)
+                    await new Promise(resolve => videoTrack._onmute_ = resolve);
                 assert_true(videoTrack.muted, "video track is muted");
             }, "Hide page, only video should be muted");
 
@@ -54,6 +56,8 @@
                 if (window.internals)
                     window.internals.setPageVisibility(true);
                 assert_false(audioTrack.muted, "audio track is active");
+                if (videoTrack.muted)
+                    await new Promise(resolve => videoTrack._onunmute_ = resolve);
                 assert_false(videoTrack.muted, "video track is active");
 
                 assert_true(await validateMediaStreamTrackIsGeneratingContent(audioTrack), "audio track");
@@ -65,7 +69,11 @@
                     window.internals.setPageVisibility(false);
                     window.internals.setPageMuted("capturedevices");
                 }
+                if (!audioTrack.muted)
+                    await new Promise(resolve => audioTrack._onmute_ = resolve);
                 assert_true(audioTrack.muted, "audio track is muted");
+                if (!videoTrack.muted)
+                    await new Promise(resolve => videoTrack._onmute_ = resolve);
                 assert_true(videoTrack.muted, "video track is muted");
             }, "Hide and mute page, video and audio should be muted");
 

Modified: trunk/Source/WebCore/ChangeLog (271059 => 271060)


--- trunk/Source/WebCore/ChangeLog	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/Source/WebCore/ChangeLog	2020-12-22 20:00:23 UTC (rev 271060)
@@ -1,3 +1,25 @@
+2020-12-22  Youenn Fablet  <[email protected]>
+
+        MediaStreamTrack.muted value should not change before the corresponding event is fired
+        https://bugs.webkit.org/show_bug.cgi?id=220084
+
+        Reviewed by Eric Carlson.
+
+        Before the patch, the muted value was changed and a task was queued to dispatch the corresponding event.
+        During a period of time, the muted value was changed while the event was not fired.
+        To fix this, dispatch a task that will change the value and dispatch the event.
+        MediaStreamTrack is now storing the muted value instead of relying on its m_private muted value.
+        The muted value is only used for JS as the rest of the code base expects to get the actual muted value.
+
+        Test: fast/mediastream/media-stream-track-muted-event.html
+
+        * Modules/mediastream/MediaStreamTrack.cpp:
+        (WebCore::MediaStreamTrack::MediaStreamTrack):
+        (WebCore::MediaStreamTrack::mutedForBindings const):
+        (WebCore::MediaStreamTrack::trackMutedChanged):
+        * Modules/mediastream/MediaStreamTrack.h:
+        * Modules/mediastream/MediaStreamTrack.idl:
+
 2020-12-22  Kate Cheney  <[email protected]>
 
         Cannot see 'Add to my stations' button in BBC World service Radio

Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp (271059 => 271060)


--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.cpp	2020-12-22 20:00:23 UTC (rev 271060)
@@ -80,6 +80,7 @@
 MediaStreamTrack::MediaStreamTrack(ScriptExecutionContext& context, Ref<MediaStreamTrackPrivate>&& privateTrack)
     : ActiveDOMObject(&context)
     , m_private(WTFMove(privateTrack))
+    , m_muted(m_private->muted())
     , m_isCaptureTrack(m_private->isCaptureTrack())
 {
     ALWAYS_LOG(LOGIDENTIFIER);
@@ -196,6 +197,11 @@
     return m_private->muted();
 }
 
+bool MediaStreamTrack::mutedForBindings() const
+{
+    return m_muted;
+}
+
 auto MediaStreamTrack::readyState() const -> State
 {
     return ended() ? State::Ended : State::Live;
@@ -562,9 +568,12 @@
     if (scriptExecutionContext()->activeDOMObjectsAreStopped() || m_ended)
         return;
 
-    AtomString eventType = muted() ? eventNames().muteEvent : eventNames().unmuteEvent;
-    queueTaskToDispatchEvent(*this, TaskSource::Networking, Event::create(eventType, Event::CanBubble::No, Event::IsCancelable::No));
-
+    queueTaskKeepingObjectAlive(*this, TaskSource::Networking, [this, muted = m_private->muted()] {
+        if (!scriptExecutionContext() || scriptExecutionContext()->activeDOMObjectsAreStopped())
+            return;
+        m_muted = muted;
+        dispatchEvent(Event::create(muted ? eventNames().muteEvent : eventNames().unmuteEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    });
     configureTrackRendering();
 }
 

Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h (271059 => 271060)


--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.h	2020-12-22 20:00:23 UTC (rev 271060)
@@ -87,6 +87,7 @@
     void setEnabled(bool);
 
     bool muted() const;
+    bool mutedForBindings() const;
 
     enum class State { Live, Ended };
     State readyState() const;
@@ -201,6 +202,7 @@
     MediaTrackConstraints m_constraints;
     std::unique_ptr<DOMPromiseDeferred<void>> m_promise;
 
+    bool m_muted { false };
     bool m_ended { false };
     const bool m_isCaptureTrack { false };
 };

Modified: trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl (271059 => 271060)


--- trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl	2020-12-22 19:45:08 UTC (rev 271059)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStreamTrack.idl	2020-12-22 20:00:23 UTC (rev 271060)
@@ -39,7 +39,7 @@
     readonly attribute DOMString label;
     attribute boolean enabled;
     attribute DOMString contentHint;
-    readonly attribute boolean muted;
+    [ImplementedAs=mutedForBindings] readonly attribute boolean muted;
     attribute EventHandler onmute;
     attribute EventHandler onunmute;
     readonly attribute MediaStreamTrackState readyState;
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to