Changeset 268816 in webkit

Timestamp:

Oct 21, 2020 12:21:55 PM (21 months ago)

Author:

Peng Liu

Message:

A video element may fail to enter picture-in-picture from fullscreen
​https://bugs.webkit.org/show_bug.cgi?id=217999

Reviewed by Eric Carlson.

When a video element is entering picture-in-picture from fullscreen,
WebKit should only fire the webkitendfullscreenEvent event, but should not
request the player in the UI process to exit fullscreen(picture-in-picture).
So the condition to decide sending the exit fullscreen request is wrong because
HTMLMediaElement::didBecomeFullscreenElement(), which sets m_waitingToEnterFullscreen
to false, might be called before dispatching the webkitendfullscreenEvent event.

• html/HTMLMediaElement.cpp:

(WebCore::HTMLMediaElement::dispatchEvent): Fix the condition.
(WebCore::HTMLMediaElement::exitFullscreen): Set fullscreen mode to VideoFullscreenModeNone.

Location:

trunk/Source/WebCore

Files:

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

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-10-21  Peng Liu  <peng.liu6@apple.com>
+
+        A video element may fail to enter picture-in-picture from fullscreen
+        https://bugs.webkit.org/show_bug.cgi?id=217999
+
+        Reviewed by Eric Carlson.
+
+        When a video element is entering picture-in-picture from fullscreen,
+        WebKit should only fire the `webkitendfullscreenEvent` event, but should not
+        request the player in the UI process to exit fullscreen(picture-in-picture).
+        So the condition to decide sending the exit fullscreen request is wrong because
+        HTMLMediaElement::didBecomeFullscreenElement(), which sets `m_waitingToEnterFullscreen`
+        to false, might be called before dispatching the `webkitendfullscreenEvent` event.
+
+        * html/HTMLMediaElement.cpp:
+        (WebCore::HTMLMediaElement::dispatchEvent): Fix the condition.
+        (WebCore::HTMLMediaElement::exitFullscreen): Set fullscreen mode to VideoFullscreenModeNone.
+
 2020-10-21  Zalan Bujtas  <zalan@apple.com>
 

trunk/Source/WebCore/html/HTMLMediaElement.cpp

@@ -5741 +5741 @@
     // to change the position/size back *before* exiting fullscreen.
     // Otherwise, the exit fullscreen animation will be incorrect.
-    if (!m_videoFullscreenStandby && !m_waitingToEnterFullscreen && event.type() == eventNames().webkitendfullscreenEvent) {
-        setFullscreenMode(VideoFullscreenModeNone);
+    if (!m_videoFullscreenStandby && m_videoFullscreenMode == VideoFullscreenModeNone && event.type() == eventNames().webkitendfullscreenEvent)
         document().page()->chrome().client().exitVideoFullscreenForVideoElement(downcast<HTMLVideoElement>(*this));
-    }
 }
 
@@ -6003 +6001 @@
 
         if (oldVideoFullscreenMode == VideoFullscreenModeStandard) {
+            setFullscreenMode(VideoFullscreenModeNone);
             // The exit fullscreen request will be sent in dispatchEvent().
             scheduleEvent(eventNames().webkitendfullscreenEvent);