Changeset 204069 in webkit

Timestamp:

Aug 2, 2016, 11:15:56 PM (10 years ago)

Author:

bshafiei@apple.com

Message:

Merge r203984. rdar://problem/27409854

Location:

branches/safari-602-branch/Source/WebCore

Files:

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

branches/safari-602-branch/Source/WebCore/ChangeLog

@@ +1 @@
+2016-08-02  Babak Shafiei  <bshafiei@apple.com>
+
+        Merge r203984. rdar://problem/27409854
+
+    2016-08-01  Eric Carlson  <eric.carlson@apple.com>
+
+            [iOS] A video element that does not pause after exiting from fullscreen should be allowed to continue playing inline
+            https://bugs.webkit.org/show_bug.cgi?id=160416
+            <rdar://problem/27409854>
+
+            Reviewed by Alex Christensen.
+
+            * html/HTMLMediaElement.cpp:
+            (WebCore::HTMLMediaElement::exitFullscreen): If playback normally requires fullscreen but the
+            element was not paused when exiting from fullscreen, set the 'playsinline' attribute so we won't
+            force fullscreen if playback is paused and resumes, and set the 'controls' attribute so the
+            user can control playback.
+
 2016-08-02  Babak Shafiei  <bshafiei@apple.com>
 

branches/safari-602-branch/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5465 +5465 @@
     if (hasMediaControls())
         mediaControls()->exitedFullscreen();
-    if (document().page() && is<HTMLVideoElement>(*this)) {
-        if (m_mediaSession->requiresFullscreenForVideoPlayback(*this) && (!document().settings() || !document().settings()->allowsInlineMediaPlaybackAfterFullscreen() || isVideoTooSmallForInlinePlayback()))
+
+    if (!document().page() || !is<HTMLVideoElement>(*this))
+        return;
+
+    if (!paused() && m_mediaSession->requiresFullscreenForVideoPlayback(*this)) {
+        if (!document().settings() || !document().settings()->allowsInlineMediaPlaybackAfterFullscreen() || isVideoTooSmallForInlinePlayback())
             pauseInternal();
+        else {
+            // Allow inline playback, but set 'playsinline' so pausing and starting again (e.g. when scrubbing) won't go back to fullscreen.
+            // Also set the controls attribute so the user will be able to control playback.
+            setBooleanAttribute(HTMLNames::playsinlineAttr, true);
+            setControls(true);
+        }
+    }
 
 #if PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE)
-        if (document().activeDOMObjectsAreSuspended() || document().activeDOMObjectsAreStopped())
-            document().page()->chrome().client().exitVideoFullscreenToModeWithoutAnimation(downcast<HTMLVideoElement>(*this), VideoFullscreenModeNone);
-        else
-#endif
-        if (document().page()->chrome().client().supportsVideoFullscreen(oldVideoFullscreenMode)) {
-            document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
-            scheduleEvent(eventNames().webkitendfullscreenEvent);
-        }
+    if (document().activeDOMObjectsAreSuspended() || document().activeDOMObjectsAreStopped())
+        document().page()->chrome().client().exitVideoFullscreenToModeWithoutAnimation(downcast<HTMLVideoElement>(*this), VideoFullscreenModeNone);
+    else
+#endif
+    if (document().page()->chrome().client().supportsVideoFullscreen(oldVideoFullscreenMode)) {
+        document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
+        scheduleEvent(eventNames().webkitendfullscreenEvent);
     }
 }