Changeset 162145 in webkit

Timestamp:

Jan 16, 2014, 1:26:53 PM (11 years ago)

Author:

eric.carlson@apple.com

Message:

Allow MediaSessionManager to restrict inline <video> playback
​https://bugs.webkit.org/show_bug.cgi?id=127113

Reviewed by Jer Noble.

Source/WebCore:

Test: media/video-fullscreeen-only-playback.html

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::updatePlayState): Drive-by change to not tell the media session that

playback is starting if the media player is already playing. Enter fullscreen if the media
session says it is required.

• html/HTMLMediaSession.cpp:

(WebCore::HTMLMediaSession::clientWillBeginPlayback): Make it const.
(WebCore::HTMLMediaSession::requiresFullscreenForVideoPlayback): New, see if the specified

media element must be played in fullscreen based on the media session settings, document
settings, and attributes.

• html/HTMLMediaSession.h:

• platform/audio/MediaSession.h: pauseSession shouldn't be virtual.

• platform/audio/MediaSessionManager.cpp:

(WebCore::MediaSessionManager::sessionWillBeginPlayback): Return immediately if ConcurrentPlaybackNotPermitted

is not set.

(WebCore::MediaSessionManager::sessionRestrictsInlineVideoPlayback): New.

• platform/audio/MediaSessionManager.h:

• platform/audio/ios/MediaSessionManagerIOS.mm:

(WebCore::MediaSessionManageriOS::MediaSessionManageriOS): Set InlineVideoPlaybackRestricted if

running on an iPhone or iPod class device.

• testing/Internals.cpp:

(WebCore::Internals::setMediaSessionRestrictions): Support InlineVideoPlaybackRestricted.

LayoutTests:

• media/video-fullscreeen-only-playback-expected.txt: Added.
• media/video-fullscreeen-only-playback.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/video-fullscreeen-only-playback-expected.txt (added)
• LayoutTests/media/video-fullscreeen-only-playback.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (1 diff)
• Source/WebCore/html/HTMLMediaSession.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaSession.h (modified) (2 diffs)
• Source/WebCore/platform/audio/MediaSession.h (modified) (1 diff)
• Source/WebCore/platform/audio/MediaSessionManager.cpp (modified) (2 diffs)
• Source/WebCore/platform/audio/MediaSessionManager.h (modified) (2 diffs)
• Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm (modified) (2 diffs)
• Source/WebCore/testing/Internals.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2014-01-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Allow MediaSessionManager to restrict inline <video> playback
+        https://bugs.webkit.org/show_bug.cgi?id=127113
+
+        Reviewed by Jer Noble.
+
+        * media/video-fullscreeen-only-playback-expected.txt: Added.
+        * media/video-fullscreeen-only-playback.html: Added.
+
 2014-01-07  Myles C. Maxfield  <mmaxfield@apple.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2014-01-16  Eric Carlson  <eric.carlson@apple.com>
+
+        Allow MediaSessionManager to restrict inline <video> playback
+        https://bugs.webkit.org/show_bug.cgi?id=127113
+
+        Reviewed by Jer Noble.
+
+        Test: media/video-fullscreeen-only-playback.html
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::updatePlayState): Drive-by change to not tell the media session that
+            playback is starting if the media player is already playing. Enter fullscreen if the media
+            session says it is required.
+
+        * html/HTMLMediaSession.cpp:
+        (WebCore::HTMLMediaSession::clientWillBeginPlayback): Make it const.
+        (WebCore::HTMLMediaSession::requiresFullscreenForVideoPlayback): New, see if the specified
+            media element must be played in fullscreen based on the media session settings, document
+            settings, and attributes.
+        * html/HTMLMediaSession.h:
+
+        * platform/audio/MediaSession.h: pauseSession shouldn't be virtual.
+
+        * platform/audio/MediaSessionManager.cpp:
+        (WebCore::MediaSessionManager::sessionWillBeginPlayback): Return immediately if ConcurrentPlaybackNotPermitted
+            is not set.
+        (WebCore::MediaSessionManager::sessionRestrictsInlineVideoPlayback): New.
+        * platform/audio/MediaSessionManager.h:
+
+        * platform/audio/ios/MediaSessionManagerIOS.mm:
+        (WebCore::MediaSessionManageriOS::MediaSessionManageriOS): Set InlineVideoPlaybackRestricted if
+            running on an iPhone or iPod class device.
+
+        * testing/Internals.cpp:
+        (WebCore::Internals::setMediaSessionRestrictions): Support InlineVideoPlaybackRestricted.
+
 2014-01-16  Roger Fong  <roger_fong@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -4256 +4256 @@
         invalidateCachedTime();
 
-        m_mediaSession->clientWillBeginPlayback();
-
         if (playerPaused) {
-            if (!m_isFullscreen && isVideo() && document().page() && document().page()->chrome().requiresFullscreenForVideoPlayback())
+            m_mediaSession->clientWillBeginPlayback();
+
+            if (m_mediaSession->requiresFullscreenForVideoPlayback(*this))
                 enterFullscreen();
 

trunk/Source/WebCore/html/HTMLMediaSession.cpp

@@ -35 +35 @@
 #include "Page.h"
 #include "ScriptController.h"
+
+#if PLATFORM(IOS)
+#include "RuntimeApplicationChecksIOS.h"
+#endif
 
 namespace WebCore {
@@ -123 +127 @@
 #endif
 
-void HTMLMediaSession::clientWillBeginPlayback()
+void HTMLMediaSession::clientWillBeginPlayback() const
 {
     MediaSessionManager::sharedManager().sessionWillBeginPlayback(*this);
 }
 
-void HTMLMediaSession::pauseSession()
+bool HTMLMediaSession::requiresFullscreenForVideoPlayback(const HTMLMediaElement& element) const
 {
-    client().pausePlayback();
+    if (!MediaSessionManager::sharedManager().sessionRestrictsInlineVideoPlayback(*this))
+        return false;
+
+    Settings* settings = element.document().settings();
+    if (!settings || !settings->mediaPlaybackAllowsInline())
+        return true;
+
+    if (element.fastHasAttribute(HTMLNames::webkit_playsinlineAttr))
+        return false;
+
+#if PLATFORM(IOS)
+    if (applicationIsDumpRenderTree())
+        return false;
+#endif
+
+    return true;
 }
- 
+
 }
 

trunk/Source/WebCore/html/HTMLMediaSession.h

@@ -42 +42 @@
     virtual ~HTMLMediaSession() { }
 
-    void clientWillBeginPlayback();
-
-    virtual void pauseSession() override;
+    void clientWillBeginPlayback() const;
 
     bool playbackPermitted(const HTMLMediaElement&) const;
@@ -54 +52 @@
     bool showingPlaybackTargetPickerPermitted(const HTMLMediaElement&) const;
 #endif
+    bool requiresFullscreenForVideoPlayback(const HTMLMediaElement&) const;
 
     // Restrictions to modify default behaviors.

trunk/Source/WebCore/platform/audio/MediaSession.h

@@ -63 +63 @@
     void endInterruption(EndInterruptionFlags);
 
-    virtual void pauseSession();
+    void pauseSession();
 
 protected:

trunk/Source/WebCore/platform/audio/MediaSessionManager.cpp

@@ -127 +127 @@
 }
 
-void MediaSessionManager::sessionWillBeginPlayback(MediaSession& session)
+void MediaSessionManager::sessionWillBeginPlayback(const MediaSession& session) const
 {
     MediaSession::MediaType sessionType = session.mediaType();
     SessionRestrictions restrictions = m_restrictions[sessionType];
-    if (restrictions == NoRestrictions)
+    if (!restrictions & ConcurrentPlaybackNotPermitted)
         return;
 
@@ -144 +144 @@
 }
 
+bool MediaSessionManager::sessionRestrictsInlineVideoPlayback(const MediaSession& session) const
+{
+    MediaSession::MediaType sessionType = session.mediaType();
+    if (sessionType != MediaSession::Video)
+        return false;
+
+    return m_restrictions[sessionType] & InlineVideoPlaybackRestricted;
+}
+
 #if !PLATFORM(MAC)
 void MediaSessionManager::updateSessionState()

trunk/Source/WebCore/platform/audio/MediaSessionManager.h

@@ -50 +50 @@
         NoRestrictions = 0,
         ConcurrentPlaybackNotPermitted = 1 << 0,
+        InlineVideoPlaybackRestricted = 1 << 0,
     };
     typedef unsigned SessionRestrictions;
@@ -57 +58 @@
     SessionRestrictions restrictions(MediaSession::MediaType);
 
-    void sessionWillBeginPlayback(MediaSession&);
+    void sessionWillBeginPlayback(const MediaSession&) const;
+    bool sessionRestrictsInlineVideoPlayback(const MediaSession&) const;
 
 protected:

trunk/Source/WebCore/platform/audio/ios/MediaSessionManagerIOS.mm

@@ -33 +33 @@
 #import "SoftLinking.h"
 #import "WebCoreThreadRun.h"
+#import "WebCoreSystemInterface.h"
 #import <AVFoundation/AVAudioSession.h>
 #import <objc/runtime.h>
@@ -73 +74 @@
     , m_objcObserver(adoptNS([[WebMediaSessionHelper alloc] initWithCallback:this]))
 {
+    DEFINE_STATIC_LOCAL(wkDeviceClass, deviceClass, iosDeviceClass());
+
+    if (deviceClass == wkDeviceClassiPhone || deviceClass == wkDeviceClassiPod)
+        addRestriction(MediaSession::Video, InlineVideoPlaybackRestricted);
+
     addRestriction(MediaSession::Video, ConcurrentPlaybackNotPermitted);
 }

trunk/Source/WebCore/testing/Internals.cpp

@@ -2313 +2313 @@
     if (equalIgnoringCase(restrictionsString, "ConcurrentPlaybackNotPermitted"))
         restrictions = MediaSessionManager::ConcurrentPlaybackNotPermitted;
+    if (equalIgnoringCase(restrictionsString, "InlineVideoPlaybackRestricted"))
+        restrictions += MediaSessionManager::InlineVideoPlaybackRestricted;
     
     MediaSessionManager::sharedManager().addRestriction(mediaType, restrictions);