Changeset 212314 in webkit

Timestamp:

Feb 14, 2017 11:34:09 AM (7 years ago)

Author:

commit-queue@webkit.org

Message:

When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
​https://bugs.webkit.org/show_bug.cgi?id=167815
rdar://problem/27685077

Patch by Jeremy Jones <​jeremyj@apple.com> on 2017-02-14
Reviewed by Jer Noble.

Source/WebCore:

Test: media/media-fullscreen-loop-inline.html

When video is allowed to play inline after fullscreen. Looped video causes play state to update, which can send video back to fullscreen when
allowsInline is false. This change will set a new flag when allowsInlineMediaPlaybackAfterFullscreen allows inline playback that can be tested
in requiresFullscreenForVideoPlayback to prevent sending video back into fullscreen when video loops.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::enterFullscreen):
(WebCore::HTMLMediaElement::exitFullscreen):

• html/HTMLMediaElement.h:

(WebCore::HTMLMediaElement::isTemporarilyAllowingInlinePlaybackAfterFullscreen): Added.

• html/MediaElementSession.cpp:

(WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):

LayoutTests:

Add a new test that tests inline after fullscreen behavior of looping video.

• media/media-fullscreen-loop-inline-expected.txt: Added.
• media/media-fullscreen-loop-inline.html: Added.
• platform/mac-wk2/TestExpectations: Skipped on webkit2.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/media/media-fullscreen-loop-inline-expected.txt (added)
• LayoutTests/media/media-fullscreen-loop-inline.html (added)
• LayoutTests/platform/mac-wk2/TestExpectations (modified) (1 diff)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/html/HTMLMediaElement.cpp (modified) (2 diffs)
• Source/WebCore/html/HTMLMediaElement.h (modified) (2 diffs)
• Source/WebCore/html/MediaElementSession.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-02-14  Jeremy Jones  <jeremyj@apple.com>
+
+        When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
+        https://bugs.webkit.org/show_bug.cgi?id=167815
+        rdar://problem/27685077
+
+        Reviewed by Jer Noble.
+
+        Add a new test that tests inline after fullscreen behavior of looping video.
+
+        * media/media-fullscreen-loop-inline-expected.txt: Added.
+        * media/media-fullscreen-loop-inline.html: Added.
+        * platform/mac-wk2/TestExpectations: Skipped on webkit2.
+
 2017-02-14  Ryan Haddad  <ryanhaddad@apple.com>
 

trunk/LayoutTests/platform/mac-wk2/TestExpectations

@@ -322 +322 @@
 webkit.org/b/156077 inspector/heap/getRemoteObject.html [ Pass Failure ]
 
+# Video fullscreen is not implemented for mac wk2 in webkittestrunner
+media/media-fullscreen-loop-inline.html [ Skip ]
+
 ### END OF (1) Classified failures with bug reports
 ########################################

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-02-14  Jeremy Jones  <jeremyj@apple.com>
+
+        When playing inline after fullscreen, set a flag instead of adding attribute plays inline, and use in requiresFullscreenForVideoPlayback.
+        https://bugs.webkit.org/show_bug.cgi?id=167815
+        rdar://problem/27685077
+
+        Reviewed by Jer Noble.
+
+        Test: media/media-fullscreen-loop-inline.html
+
+        When video is allowed to play inline after fullscreen. Looped video causes play state to update, which can send video back to fullscreen when
+        allowsInline is false. This change will set a new flag when allowsInlineMediaPlaybackAfterFullscreen allows inline playback that can be tested
+        in requiresFullscreenForVideoPlayback to prevent sending video back into fullscreen when video loops.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::enterFullscreen):
+        (WebCore::HTMLMediaElement::exitFullscreen):
+        * html/HTMLMediaElement.h:
+        (WebCore::HTMLMediaElement::isTemporarilyAllowingInlinePlaybackAfterFullscreen): Added.
+        * html/MediaElementSession.cpp:
+        (WebCore::MediaElementSession::requiresFullscreenForVideoPlayback):
+
 2017-02-14  Jer Noble  <jer.noble@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5453 +5453 @@
         return;
 
+    m_temporarilyAllowingInlinePlaybackAfterFullscreen = false;
+
 #if ENABLE(FULLSCREEN_API)
     if (document().settings().fullScreenEnabled()) {
@@ -5516 +5518 @@
             pauseInternal();
         else {
-            // Allow inline playback, but set 'playsinline' so pausing and starting again (e.g. when scrubbing) won't go back to fullscreen.
+            // Allow inline playback, but set a flag so pausing and starting again (e.g. when scrubbing or looping) won't go back to fullscreen.
             // Also set the controls attribute so the user will be able to control playback.
-            setBooleanAttribute(HTMLNames::playsinlineAttr, true);
+            m_temporarilyAllowingInlinePlaybackAfterFullscreen = true;
             setControls(true);
         }

trunk/Source/WebCore/html/HTMLMediaElement.h

@@ -494 +494 @@
     double playbackStartedTime() const { return m_playbackStartedTime; }
 
+    bool isTemporarilyAllowingInlinePlaybackAfterFullscreen() const {return m_temporarilyAllowingInlinePlaybackAfterFullscreen; }
+
 protected:
     HTMLMediaElement(const QualifiedName&, Document&, bool createdByParser);
@@ -892 +894 @@
     std::function<void()> m_preparedForInlineCompletionHandler;
 
+    bool m_temporarilyAllowingInlinePlaybackAfterFullscreen { false };
+
 #if PLATFORM(IOS) || (PLATFORM(MAC) && ENABLE(VIDEO_PRESENTATION_MODE))
     RetainPtr<PlatformLayer> m_videoFullscreenLayer;

trunk/Source/WebCore/html/MediaElementSession.cpp

@@ -541 +541 @@
         return false;
 
+    if (element.isTemporarilyAllowingInlinePlaybackAfterFullscreen())
+        return false;
+
     if (!element.document().settings().allowsInlineMediaPlayback())
         return true;