Changeset 183826 in webkit

Timestamp:

May 5, 2015, 1:50:02 PM (10 years ago)

Author:

eric.carlson@apple.com

Message:

Only autoplay videos should not automatically play to playback target
​https://bugs.webkit.org/show_bug.cgi?id=144633

Reviewed by Jer Noble.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement): Set RequireUserGestureToAutoplayToExternalDevice.
(WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture): Remove
RequireUserGestureToAutoplayToExternalDevice.
(WebCore::HTMLMediaElement::mediaState): Set ExternalDeviceAutoPlayCandidate if playback
was started from a user gesture, even if the video loops and/or doesn't have audio.

• html/HTMLMediaSession.h: Define RequireUserGestureToAutoplayToExternalDevice.

(WebCore::HTMLMediaSession::hasBehaviorRestriction): New.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (3 diffs)
• html/HTMLMediaSession.h (modified) (2 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-05-05  Eric Carlson  <eric.carlson@apple.com>
+
+        Only autoplay videos should not automatically play to playback target
+        https://bugs.webkit.org/show_bug.cgi?id=144633
+
+        Reviewed by Jer Noble.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Set RequireUserGestureToAutoplayToExternalDevice.
+        (WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture): Remove
+        RequireUserGestureToAutoplayToExternalDevice.
+        (WebCore::HTMLMediaElement::mediaState): Set ExternalDeviceAutoPlayCandidate if playback
+        was started from a user gesture, even if the video loops and/or doesn't have audio.
+
+        * html/HTMLMediaSession.h: Define RequireUserGestureToAutoplayToExternalDevice.
+        (WebCore::HTMLMediaSession::hasBehaviorRestriction): New.
+
 2015-05-05  Brent Fulgham  <bfulgham@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -342 +342 @@
     m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureForFullscreen);
     m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequirePageConsentToLoadMedia);
+#if ENABLE(WIRELESS_PLAYBACK_TARGET)
+    m_mediaSession->addBehaviorRestriction(HTMLMediaSession::RequireUserGestureToAutoplayToExternalDevice);
+#endif
 
     // FIXME: We should clean up and look to better merge the iOS and non-iOS code below.
@@ -5893 +5896 @@
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
         | HTMLMediaSession::RequireUserGestureToShowPlaybackTargetPicker
+        | HTMLMediaSession::RequireUserGestureToAutoplayToExternalDevice
 #endif
         | HTMLMediaSession::RequireUserGestureForLoad
@@ -6211 +6215 @@
     }
 
-    if (hasActiveVideo && hasAudio && !loop())
+    bool requireUserGesture = m_mediaSession->hasBehaviorRestriction(HTMLMediaSession::RequireUserGestureToAutoplayToExternalDevice);
+    if (hasActiveVideo && (!requireUserGesture || (hasAudio && !loop())))
         state |= ExternalDeviceAutoPlayCandidate;
-
 #endif
 

trunk/Source/WebCore/html/HTMLMediaSession.h

@@ -84 +84 @@
         RequirePageConsentToLoadMedia = 1 << 3,
         RequirePageConsentToResumeMedia = 1 << 4,
+        RequireUserGestureForAudioRateChange = 1 << 5,
 #if ENABLE(WIRELESS_PLAYBACK_TARGET)
-        RequireUserGestureToShowPlaybackTargetPicker = 1 << 5,
-        WirelessVideoPlaybackDisabled =  1 << 6,
+        RequireUserGestureToShowPlaybackTargetPicker = 1 << 6,
+        WirelessVideoPlaybackDisabled =  1 << 7,
+        RequireUserGestureToAutoplayToExternalDevice = 1 << 8,
 #endif
-        RequireUserGestureForAudioRateChange = 1 << 7,
     };
     typedef unsigned BehaviorRestrictions;
@@ -95 +96 @@
     WEBCORE_EXPORT void addBehaviorRestriction(BehaviorRestrictions);
     WEBCORE_EXPORT void removeBehaviorRestriction(BehaviorRestrictions);
+    bool hasBehaviorRestriction(BehaviorRestrictions restriction) const { return restriction & m_restrictions; }
 
 #if ENABLE(MEDIA_SOURCE)