Changeset 185834 in webkit

Timestamp:

Jun 22, 2015, 10:41:59 AM (11 years ago)

Author:

commit-queue@webkit.org

Message:

Do not exit fullscreen when starting PiP since this is done automatically.
​https://bugs.webkit.org/show_bug.cgi?id=144871

Patch by Jeremy Jones <​jeremyj@apple.com> on 2015-06-22
Reviewed by Darin Adler.

Since we don't explicitly exit fullscreen, update state in shouldExitFullscreenWithReason()

• platform/ios/WebVideoFullscreenInterfaceAVKit.h: Declare shouldExitFullscreenWithReason().
• platform/ios/WebVideoFullscreenInterfaceAVKit.mm:

(-[WebAVPlayerController playerViewController:shouldExitFullScreenWithReason:]): Forward to WebVideoFullscreenInterfaceAVKit.
(WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason): Added.
(WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture): Remove enter fullscreen code.

• platform/spi/cocoa/AVKitSPI.h: Add missing enums.

Location:

trunk/Source/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/ios/WebVideoFullscreenInterfaceAVKit.h (modified) (1 diff)
• platform/ios/WebVideoFullscreenInterfaceAVKit.mm (modified) (3 diffs)
• platform/spi/cocoa/AVKitSPI.h (modified) (1 diff)

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2015-06-22  Jeremy Jones  <jeremyj@apple.com>
+
+        Do not exit fullscreen when starting PiP since this is done automatically.
+        https://bugs.webkit.org/show_bug.cgi?id=144871
+
+        Reviewed by Darin Adler.
+
+        Since we don't explicitly exit fullscreen, update state in shouldExitFullscreenWithReason()
+
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.h: Declare shouldExitFullscreenWithReason().
+        * platform/ios/WebVideoFullscreenInterfaceAVKit.mm:
+        (-[WebAVPlayerController playerViewController:shouldExitFullScreenWithReason:]): Forward to WebVideoFullscreenInterfaceAVKit.
+        (WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason): Added.
+        (WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture): Remove enter fullscreen code.
+        * platform/spi/cocoa/AVKitSPI.h: Add missing enums.
+
 2015-06-22  Daniel Bates  <dabates@apple.com>
 

trunk/Source/WebCore/platform/ios/WebVideoFullscreenInterfaceAVKit.h

@@ -100 +100 @@
     WEBCORE_EXPORT virtual void preparedToReturnToInline(bool visible, const IntRect& inlineRect);
 
+    enum class ExitFullScreenReason {
+        DoneButtonTapped,
+        FullScreenButtonTapped,
+        PinchGestureHandled,
+        RemoteControlStopEventReceived,
+        PictureInPictureStarted
+    };
+
+    bool shouldExitFullscreenWithReason(ExitFullScreenReason);
     HTMLMediaElementEnums::VideoFullscreenMode mode() const { return m_mode; }
     bool allowsPictureInPicturePlayback() const { return m_allowsPictureInPicturePlayback; }

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

@@ -223 +223 @@
 }
 
+static WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason convertToExitFullScreenReason(AVPlayerViewControllerExitFullScreenReason reason)
+{
+    switch (reason) {
+    case AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped:
+        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::DoneButtonTapped;
+    case AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped:
+        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::FullScreenButtonTapped;
+    case AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted:
+        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PictureInPictureStarted;
+    case AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled:
+        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::PinchGestureHandled;
+    case AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived:
+        return WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason::RemoteControlStopEventReceived;
+    }
+}
+
 - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason
 {
     UNUSED_PARAM(playerViewController);
-    UNUSED_PARAM(reason);
-    if (!self.delegate)
-        return YES;
-    
-    if (reason == AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped || reason == AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived)
-        self.delegate->pause();
-    
-    self.delegate->requestExitFullscreen();
-    return NO;
+    return self.fullscreenInterface->shouldExitFullscreenWithReason(convertToExitFullScreenReason(reason));
 }
 
@@ -1146 +1154 @@
     LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture(%p)", this);
     setMode(HTMLMediaElementEnums::VideoFullscreenModePictureInPicture);
-
-    if (!hasMode(HTMLMediaElementEnums::VideoFullscreenModeStandard))
-        return;
-
-    RefPtr<WebVideoFullscreenInterfaceAVKit> strongThis(this);
-    fullscreenMayReturnToInline([strongThis, this](bool visible) {
-        LOG(Fullscreen, "WebVideoFullscreenInterfaceAVKit::willStartPictureInPicture - lambda(%p) - visible(%s)", this, boolString(visible));
-
-        if (!visible) {
-            [m_window setHidden:YES];
-            [[m_playerViewController view] setHidden:YES];
-            return;
-        }
-
-        [[m_playerViewController view] layoutIfNeeded];
-
-        [m_playerViewController exitFullScreenAnimated:YES completionHandler:[strongThis, this] (BOOL completed, NSError*) {
-            if (!completed)
-                return;
-            clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
-            [m_window setHidden:YES];
-            [[m_playerViewController view] setHidden:YES];
-        }];
-    });
 }
 
@@ -1241 +1225 @@
 }
 
+bool WebVideoFullscreenInterfaceAVKit::shouldExitFullscreenWithReason(WebVideoFullscreenInterfaceAVKit::ExitFullScreenReason reason)
+{
+    if (!m_videoFullscreenModel)
+        return true;
+
+    if (reason == ExitFullScreenReason::PictureInPictureStarted) {
+        clearMode(HTMLMediaElementEnums::VideoFullscreenModeStandard);
+        return true;
+    }
+
+    if (reason == ExitFullScreenReason::DoneButtonTapped || reason == ExitFullScreenReason::RemoteControlStopEventReceived)
+        m_videoFullscreenModel->pause();
+    
+    m_videoFullscreenModel->requestExitFullscreen();
+    
+    return false;
+}
+
 void WebVideoFullscreenInterfaceAVKit::setMode(HTMLMediaElementEnums::VideoFullscreenMode mode)
 {

trunk/Source/WebCore/platform/spi/cocoa/AVKitSPI.h

@@ -75 +75 @@
 @optional
 typedef NS_ENUM(NSInteger, AVPlayerViewControllerExitFullScreenReason) {
-    AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped = 0,
-    AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived = 3,
+    AVPlayerViewControllerExitFullScreenReasonDoneButtonTapped,
+    AVPlayerViewControllerExitFullScreenReasonFullScreenButtonTapped,
+    AVPlayerViewControllerExitFullScreenReasonPinchGestureHandled,
+    AVPlayerViewControllerExitFullScreenReasonRemoteControlStopEventReceived,
+    AVPlayerViewControllerExitFullScreenReasonPictureInPictureStarted
 };
 - (BOOL)playerViewController:(AVPlayerViewController *)playerViewController shouldExitFullScreenWithReason:(AVPlayerViewControllerExitFullScreenReason)reason;