Changeset 201841 in webkit

Timestamp:

Jun 8, 2016, 4:09:44 PM (10 years ago)

Author:

jer.noble@apple.com

Message:

With audio user gesture restriction in place, video.src = 'file', video.play() succeeds where it should fail.
​https://bugs.webkit.org/show_bug.cgi?id=158546

Reviewed by Eric Carlson.

Source/WebCore:

Test: media/video-playback-restriction-play-before-load.html

Don't check that the media element isPlaying(); that will only return true if playback has begun.
Instead, check !paused(), as that will be true as soon as the play() method returns.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
(WebCore::HTMLMediaElement::updateShouldPlay):

• rendering/RenderLayer.h:

LayoutTests:

• media/video-playback-restriction-play-before-load-expected.txt: Added.
• media/video-playback-restriction-play-before-load.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-playback-restriction-play-before-load-expected.txt (added)
• LayoutTests/media/video-playback-restriction-play-before-load.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2016-06-08  Jer Noble  <jer.noble@apple.com>
+
+        With audio user gesture restriction in place, video.src = 'file', video.play() succeeds where it should fail.
+        https://bugs.webkit.org/show_bug.cgi?id=158546
+
+        Reviewed by Eric Carlson.
+
+        * media/video-playback-restriction-play-before-load-expected.txt: Added.
+        * media/video-playback-restriction-play-before-load.html: Added.
+
 2016-06-08  Chris Dumez  <cdumez@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-08  Jer Noble  <jer.noble@apple.com>
+
+        With audio user gesture restriction in place, video.src = 'file', video.play() succeeds where it should fail.
+        https://bugs.webkit.org/show_bug.cgi?id=158546
+
+        Reviewed by Eric Carlson.
+
+        Test: media/video-playback-restriction-play-before-load.html
+
+        Don't check that the media element isPlaying(); that will only return true if playback has begun.
+        Instead, check !paused(), as that will be true as soon as the play() method returns.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::mediaPlayerCharacteristicChanged):
+        (WebCore::HTMLMediaElement::updateShouldPlay):
+        * rendering/RenderLayer.h:
+
 2016-06-08  Alex Christensen  <achristensen@webkit.org>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4643 +4643 @@
     updateRenderer();
 
-    if (isPlaying() && !m_mediaSession->playbackPermitted(*this))
+    if (!paused() && !m_mediaSession->playbackPermitted(*this))
         pauseInternal();
 
@@ -7055 +7055 @@
 void HTMLMediaElement::updateShouldPlay()
 {
-    if (isPlaying() && !m_mediaSession->playbackPermitted(*this))
+    if (!paused() && !m_mediaSession->playbackPermitted(*this))
         pauseInternal();
     else if (canTransitionFromAutoplayToPlay())