Changeset 254512 in webkit

Timestamp:

Jan 14, 2020 8:37:10 AM (4 years ago)

Author:

Peng Liu

Message:

A video element cannot enter fullscreen from PiP mode
​https://bugs.webkit.org/show_bug.cgi?id=204468

Reviewed by Eric Carlson.

This patch fixes two issues:

• Make sure the message exchanges between WebContent and UI process can complete in the scenario that switching to fullscreen from PiP.
• Do not send fullscreenModeChanged event with mode = 3 (both fullscreen and Picture-in-Picture) to WebContent process.

We need to use API tests to verify the fix.
No new tests are added because of webkit.org/b/203724.

• platform/ios/VideoFullscreenInterfaceAVKit.mm:

(VideoFullscreenInterfaceAVKit::didStopPictureInPicture):
(VideoFullscreenInterfaceAVKit::doEnterFullscreen):
(VideoFullscreenInterfaceAVKit::setMode):

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2020-01-14  Peng Liu  <peng.liu6@apple.com>
+
+        A video element cannot enter fullscreen from PiP mode
+        https://bugs.webkit.org/show_bug.cgi?id=204468
+
+        Reviewed by Eric Carlson.
+
+        This patch fixes two issues:
+        - Make sure the message exchanges between WebContent and UI process can complete in the scenario that switching to fullscreen from PiP.
+        - Do not send fullscreenModeChanged event with mode = 3 (both fullscreen and Picture-in-Picture) to WebContent process.
+
+        We need to use API tests to verify the fix.
+        No new tests are added because of webkit.org/b/203724.
+
+        * platform/ios/VideoFullscreenInterfaceAVKit.mm:
+        (VideoFullscreenInterfaceAVKit::didStopPictureInPicture):
+        (VideoFullscreenInterfaceAVKit::doEnterFullscreen):
+        (VideoFullscreenInterfaceAVKit::setMode):
+
 2020-01-14  Philippe Normand  <pnormand@igalia.com>
 

trunk/Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm

@@ -1079 +1079 @@
         if (m_exitFullscreenNeedsExitPictureInPicture)
             doExitFullscreen();
+
+        if (m_enterFullscreenNeedsExitPictureInPicture)
+            doEnterFullscreen();
         return;
     }
@@ -1326 +1329 @@
     if (m_targetMode.hasFullscreen() && !m_currentMode.hasFullscreen()) {
         m_enterFullscreenNeedsEnterFullscreen = true;
+        [m_window setHidden:NO];
         [m_playerViewController enterFullScreenAnimated:YES completionHandler:[this, protectedThis = makeRefPtr(this)] (BOOL success, NSError *error) {
             enterFullscreenHandler(success, error);
@@ -1477 +1481 @@
 
     m_currentMode.setMode(mode);
+    // Mode::mode() can be 3 (VideoFullscreenModeStandard | VideoFullscreenModePictureInPicture).
+    // HTMLVideoElement does not expect such a value in the fullscreenModeChanged() callback.
     if (m_videoFullscreenModel)
-        m_videoFullscreenModel->fullscreenModeChanged(m_currentMode.mode());
+        m_videoFullscreenModel->fullscreenModeChanged(mode);
 }