Changeset 223144 in webkit

Timestamp:

Oct 10, 2017 2:26:03 PM (7 years ago)

Author:

mrajca@apple.com

Message:

Respect audio rate change restrictions in HTMLMediaElement::setVolume.
​https://bugs.webkit.org/show_bug.cgi?id=178140

Reviewed by Eric Carlson.

Source/WebCore:

Tests: media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html

media/audio-playback-volume-changes-with-restrictions.html

It's currently possible for a website to start auto-playing media with a zero volume and then
programmatically set the volume to a non-zero value without a user gesture. This code path didn't
have to be considered previously because volume changes are not supported on iOS.

We currently pause media when an audio track comes in after an element has already started playing silently
in mediaPlayerDidAddAudioTrack. This patch does the same when a non-zero volume is set after a media
element already began playing silently and there is an audio rate change restriction.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::setVolume):

LayoutTests:

• media/audio-playback-volume-changes-with-restrictions-and-user-gestures-expected.txt: Added.
• media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html: Added.
• media/audio-playback-volume-changes-with-restrictions-expected.txt: Added.
• media/audio-playback-volume-changes-with-restrictions.html: Added.
• platform/ios/TestExpectations:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/audio-playback-volume-changes-with-restrictions-and-user-gestures-expected.txt (added)
• LayoutTests/media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html (added)
• LayoutTests/media/audio-playback-volume-changes-with-restrictions-expected.txt (added)
• LayoutTests/media/audio-playback-volume-changes-with-restrictions.html (added)
• LayoutTests/platform/ios/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-10-10  Matt Rajca  <mrajca@apple.com>
+
+        Respect audio rate change restrictions in HTMLMediaElement::setVolume.
+        https://bugs.webkit.org/show_bug.cgi?id=178140
+
+        Reviewed by Eric Carlson.
+
+        * media/audio-playback-volume-changes-with-restrictions-and-user-gestures-expected.txt: Added.
+        * media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html: Added.
+        * media/audio-playback-volume-changes-with-restrictions-expected.txt: Added.
+        * media/audio-playback-volume-changes-with-restrictions.html: Added.
+        * platform/ios/TestExpectations:
+
 2017-10-10  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/LayoutTests/platform/ios/TestExpectations

@@ -382 +382 @@
 media/restricted-audio-playback-with-document-gesture.html [ Skip ]
 media/restricted-audio-playback-with-multiple-settimeouts.html [ Skip ]
+media/audio-playback-volume-changes-with-restrictions.html [ Skip ]
+media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html [ Skip ]
 storage/domstorage/sessionstorage/set-item-synchronous-keydown.html [ Skip ]
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-10-10  Matt Rajca  <mrajca@apple.com>
+
+        Respect audio rate change restrictions in HTMLMediaElement::setVolume.
+        https://bugs.webkit.org/show_bug.cgi?id=178140
+
+        Reviewed by Eric Carlson.
+
+        Tests: media/audio-playback-volume-changes-with-restrictions-and-user-gestures.html
+               media/audio-playback-volume-changes-with-restrictions.html
+
+        It's currently possible for a website to start auto-playing media with a zero volume and then
+        programmatically set the volume to a non-zero value without a user gesture. This code path didn't
+        have to be considered previously because volume changes are not supported on iOS.
+
+        We currently pause media when an audio track comes in after an element has already started playing silently
+        in mediaPlayerDidAddAudioTrack. This patch does the same when a non-zero volume is set after a media
+        element already began playing silently and there is an audio rate change restriction.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::setVolume):
+
 2017-10-10  Ryosuke Niwa  <rniwa@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -3568 +3568 @@
         return { };
 
+    if (volume && processingUserGestureForMedia())
+        removeBehaviorsRestrictionsAfterFirstUserGesture(MediaElementSession::AllRestrictions & ~MediaElementSession::RequireUserGestureToControlControlsManager);
+
     m_volume = volume;
     m_volumeInitialized = true;
     updateVolume();
     scheduleEvent(eventNames().volumechangeEvent);
+
+    if (isPlaying() && !m_mediaSession->playbackPermitted(*this)) {
+        pauseInternal();
+        setPlaybackWithoutUserGesture(PlaybackWithoutUserGesture::Prevented);
+    }
 #endif
     return { };