Changeset 201729 in webkit

Timestamp:

Jun 6, 2016 2:47:05 PM (8 years ago)

Author:

jer.noble@apple.com

Message:

Media elements should only be allowed to control controls manager during a user gesture.
​https://bugs.webkit.org/show_bug.cgi?id=158432

Reviewed by Eric Carlson.

Add a new MediaElementSession behavior restriction for the controls manager
which is cleared on the first user gesture. Since canControlControlsManager()
may be called before the first layout, call updatePlaybackControlsManager()
since the main content check requires the laid-out size of the media element.

(WebCore::HTMLMediaElement::HTMLMediaElement):
(WebCore::HTMLMediaElement::layoutSizeChanged):
(WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture):

• html/HTMLMediaElement.h:
• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::canControlControlsManager):

• html/MediaElementSession.h:

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• html/HTMLMediaElement.cpp (modified) (4 diffs)
• html/HTMLMediaElement.h (modified) (1 diff)
• html/MediaElementSession.cpp (modified) (1 diff)
• html/MediaElementSession.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-06-06  Jer Noble  <jer.noble@apple.com>
+
+        Media elements should only be allowed to control controls manager during a user gesture.
+        https://bugs.webkit.org/show_bug.cgi?id=158432
+
+        Reviewed by Eric Carlson.
+
+        Add a new MediaElementSession behavior restriction for the controls manager
+        which is cleared on the first user gesture. Since canControlControlsManager()
+        may be called before the first layout, call updatePlaybackControlsManager()
+        since the main content check requires the laid-out size of the media element.
+
+        (WebCore::HTMLMediaElement::HTMLMediaElement):
+        (WebCore::HTMLMediaElement::layoutSizeChanged):
+        (WebCore::HTMLMediaElement::removeBehaviorsRestrictionsAfterFirstUserGesture):
+        * html/HTMLMediaElement.h:
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::canControlControlsManager):
+        * html/MediaElementSession.h:
+
 2016-06-06  Adam Bergkvist  <adam.bergkvist@ericsson.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -410 +410 @@
     , m_elementIsHidden(document.hidden())
     , m_creatingControls(false)
+    , m_receivedLayoutSizeChanged(false)
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)
     , m_mediaControlsDependOnPageScaleFactor(false)
@@ -444 +445 @@
     m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToAutoplayToExternalDevice);
 #endif
+    m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureToControlControlsManager);
 
     Settings* settings = document.settings();
@@ -4002 +4004 @@
     m_resizeTaskQueue.enqueueTask(WTFMove(task));
 #endif
+
+    if (!m_receivedLayoutSizeChanged) {
+        m_receivedLayoutSizeChanged = true;
+        updatePlaybackControlsManager();
+    }
 }
 
@@ -6405 +6412 @@
         | MediaElementSession::RequireUserGestureForAudioRateChange
         | MediaElementSession::RequireUserGestureForFullscreen
-        | MediaElementSession::InvisibleAutoplayNotPermitted;
+        | MediaElementSession::InvisibleAutoplayNotPermitted
+        | MediaElementSession::RequireUserGestureToControlControlsManager;
     m_mediaSession->removeBehaviorRestriction(restrictionsToRemove);
 }

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -927 +927 @@
     bool m_elementIsHidden : 1;
     bool m_creatingControls : 1;
+    bool m_receivedLayoutSizeChanged : 1;
 
 #if ENABLE(MEDIA_CONTROLS_SCRIPT)

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -215 +215 @@
 bool MediaElementSession::canControlControlsManager(const HTMLMediaElement& element) const
 {
-    if (!element.hasAudio())
-        return false;
-
-    if (element.muted())
-        return false;
-
-    if (element.ended())
-        return false;
-
-    if (element.document().activeDOMObjectsAreSuspended())
-        return false;
-
-    if (!playbackPermitted(element))
-        return false;
-
-    if (!element.renderer())
-        return false;
-
-    if (isElementLargeEnoughForMainContent(element))
-        return true;
-
-    if (ScriptController::processingUserGestureForMedia())
-        return true;
-
-    return false;
+    if (!element.hasAudio()) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No audio");
+        return false;
+    }
+
+    if (element.muted()) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Muted");
+        return false;
+    }
+
+    if (element.ended()) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Ended");
+        return false;
+    }
+
+    if (element.document().activeDOMObjectsAreSuspended()) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: activeDOMObjectsAreSuspended()");
+        return false;
+    }
+
+    if (!playbackPermitted(element)) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: Playback not permitted");
+        return false;
+    }
+
+    if (element.isVideo()) {
+        if (!element.renderer()) {
+            LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No renderer");
+            return false;
+        }
+
+        if (!element.hasVideo()) {
+            LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No video");
+            return false;
+        }
+
+        if (isElementLargeEnoughForMainContent(element)) {
+            LOG(Media, "MediaElementSession::canControlControlsManager - returning TRUE: Is main content");
+            return true;
+        }
+    }
+
+    if (m_restrictions & RequireUserGestureToControlControlsManager && !ScriptController::processingUserGestureForMedia()) {
+        LOG(Media, "MediaElementSession::canControlControlsManager - returning FALSE: No user gesture");
+        return false;
+    }
+
+    LOG(Media, "MediaElementSession::canControlControlsManager - returning TRUE: All criteria met");
+    return true;
 }
 

trunk/Source/WebCore/html/MediaElementSession.h

@@ -95 +95 @@
         AutoPreloadingNotPermitted = 1 << 10,
         InvisibleAutoplayNotPermitted = 1 << 11,
-        OverrideUserGestureRequirementForMainContent = 1 << 12
+        OverrideUserGestureRequirementForMainContent = 1 << 12,
+        RequireUserGestureToControlControlsManager = 1 << 13,
     };
     typedef unsigned BehaviorRestrictions;