Changeset 200587 in webkit

Timestamp:

May 9, 2016 1:18:15 PM (8 years ago)

Author:

eric.carlson@apple.com

Message:

"Main content" restrictions should not apply to media documents
​https://bugs.webkit.org/show_bug.cgi?id=157479
<rdar://problem/25840861>

Reviewed by Jer Noble.

No new tests, this change only applies to media documents in a top level document so it
isn't possible to have a layout test.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::HTMLMediaElement): Don't apply restrictions to a media document.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2016-05-09  Eric Carlson  <eric.carlson@apple.com>
+
+        "Main content" restrictions should not apply to media documents
+        https://bugs.webkit.org/show_bug.cgi?id=157479
+        <rdar://problem/25840861>
+
+        Reviewed by Jer Noble.
+
+        No new tests, this change only applies to media documents in a top level document so it
+        isn't possible to have a layout test.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::HTMLMediaElement): Don't apply restrictions to a media document.
+
 2016-05-09  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -462 +462 @@
     }
 #endif
+
     if (settings && settings->invisibleAutoplayNotPermitted())
         m_mediaSession->addBehaviorRestriction(MediaElementSession::InvisibleAutoplayNotPermitted);
 
-    if (settings && settings->audioPlaybackRequiresUserGesture())
-        m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForAudioRateChange);
-
-    if (!settings || !settings->mediaDataLoadsAutomatically())
-        m_mediaSession->addBehaviorRestriction(MediaElementSession::AutoPreloadingNotPermitted);
+    if (document.ownerElement() || !document.isMediaDocument()) {
+        if (settings && settings->audioPlaybackRequiresUserGesture())
+            m_mediaSession->addBehaviorRestriction(MediaElementSession::RequireUserGestureForAudioRateChange);
+
+        if (!settings || !settings->mediaDataLoadsAutomatically())
+            m_mediaSession->addBehaviorRestriction(MediaElementSession::AutoPreloadingNotPermitted);
+
+        if (settings && settings->mainContentUserGestureOverrideEnabled())
+            m_mediaSession->addBehaviorRestriction(MediaElementSession::OverrideUserGestureRequirementForMainContent);
+    }
 
 #if ENABLE(VIDEO_TRACK)
@@ -475 +481 @@
         m_captionDisplayMode = document.page()->group().captionPreferences().captionDisplayMode();
 #endif
-
-    if (settings && settings->mainContentUserGestureOverrideEnabled())
-        m_mediaSession->addBehaviorRestriction(MediaElementSession::OverrideUserGestureRequirementForMainContent);
 
 #if ENABLE(MEDIA_SESSION)