Changeset 295052 in webkit

Timestamp:

May 31, 2022 8:22:39 AM (2 years ago)

Author:

Wenson Hsieh

Message:

[iOS] Refactor some logic around VideoFullscreenInterfaceAVKit
​https://bugs.webkit.org/show_bug.cgi?id=241113

Reviewed by Eric Carlson.

Adjust the window level of VideoFullscreenInterfaceAVKit's window. No change in behavior.

• Source/WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm:

(VideoFullscreenInterfaceAVKit::doSetup):

• Source/WebKit/UIProcess/PageClient.h:
• Source/WebKit/UIProcess/WebPageProxy.cpp:

(WebKit::WebPageProxy::didEnterFullscreen):
(WebKit::WebPageProxy::didExitFullscreen):

Also refactor WebPageProxy::did(Enter|Exit)Fullscreen, such that we implement
didExitFullscreen(PlaybackSessionContextIdentifier) in the case where
ENABLE(VIDEO_PRESENTATION_MODE) is enabled, and didExitFullscreen() (with no arguments) in the
case where it's disabled.

Currently both versions of did(Enter|Exit)Fullscreen() exist if ENABLE(VIDEO_PRESENTATION_MODE)
is set, even though we only expect to call into did(Enter|Exit)Fullscreen() from outside of
WebPageProxy.

• Source/WebKit/UIProcess/WebPageProxy.h:
• Source/WebKit/UIProcess/ios/PageClientImplIOS.h:
• Source/WebKit/UIProcess/ios/PageClientImplIOS.mm:

(WebKit::PageClientImpl::didEnterFullscreen):
(WebKit::PageClientImpl::didExitFullscreen):

• Source/WebKit/UIProcess/ios/WKContentViewInteraction.h:
• Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm:

(-[WKContentView _didEnterFullscreen]):
(-[WKContentView _didExitFullscreen]):

• Source/WebKit/UIProcess/mac/PageClientImplMac.h:

Canonical link: ​https://commits.webkit.org/251147@main

Location:

trunk/Source

Files:

• WebCore/platform/ios/VideoFullscreenInterfaceAVKit.mm (modified) (1 diff)
• WebKit/UIProcess/PageClient.h (modified) (1 diff)
• WebKit/UIProcess/WebPageProxy.cpp (modified) (3 diffs)
• WebKit/UIProcess/WebPageProxy.h (modified) (2 diffs)
• WebKit/UIProcess/ios/PageClientImplIOS.h (modified) (1 diff)
• WebKit/UIProcess/ios/PageClientImplIOS.mm (modified) (1 diff)
• WebKit/UIProcess/ios/WKContentViewInteraction.h (modified) (2 diffs)
• WebKit/UIProcess/ios/WKContentViewInteraction.mm (modified) (1 diff)
• WebKit/UIProcess/mac/PageClientImplMac.h (modified) (1 diff)

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

@@ -1372 +1372 @@
         [m_viewController _setIgnoreAppSupportedOrientations:YES];
         [m_window setRootViewController:m_viewController.get()];
-        [m_window setWindowLevel:PAL::get_UIKit_UITextEffectsBeneathStatusBarWindowLevel() + 1];
+        [m_window setWindowLevel:PAL::get_UIKit_UITextEffectsBeneathStatusBarWindowLevel() - 1];
         [m_window makeKeyAndVisible];
     }

trunk/Source/WebKit/UIProcess/PageClient.h

@@ -659 +659 @@
     virtual bool usesOffscreenRendering() const = 0;
 #endif
+
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+    virtual void didEnterFullscreen() = 0;
+    virtual void didExitFullscreen() = 0;
+#endif
 };
 

trunk/Source/WebKit/UIProcess/WebPageProxy.cpp

@@ -6082 +6082 @@
 }
 
-void WebPageProxy::didEnterFullscreen()
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+
+void WebPageProxy::didEnterFullscreen(PlaybackSessionContextIdentifier identifier)
 {
     m_uiClient->didEnterFullscreen(this);
-}
-
-void WebPageProxy::didExitFullscreen()
-{
-    m_uiClient->didExitFullscreen(this);
-}
-
-#if ENABLE(VIDEO_PRESENTATION_MODE)
-
-void WebPageProxy::didEnterFullscreen(PlaybackSessionContextIdentifier identifier)
-{
-    didEnterFullscreen();
 
     m_currentFullscreenVideoSessionIdentifier = identifier;
@@ -6104 +6094 @@
 void WebPageProxy::didExitFullscreen(PlaybackSessionContextIdentifier identifier)
 {
-    didExitFullscreen();
+    m_uiClient->didExitFullscreen(this);
 
     if (m_currentFullscreenVideoSessionIdentifier == identifier) {
@@ -6112 +6102 @@
 }
 
-#endif // ENABLE(VIDEO_PRESENTATION_MODE)
+#else
+
+void WebPageProxy::didEnterFullscreen()
+{
+    m_uiClient->didEnterFullscreen(this);
+}
+
+void WebPageProxy::didExitFullscreen()
+{
+    m_uiClient->didExitFullscreen(this);
+}
+
+#endif
 
 void WebPageProxy::closePage()

trunk/Source/WebKit/UIProcess/WebPageProxy.h

@@ -523 +523 @@
     void fullscreenMayReturnToInline();
 
-    void didEnterFullscreen();
-    void didExitFullscreen();
-
     void suspend(CompletionHandler<void(bool)>&&);
     void resume(CompletionHandler<void(bool)>&&);
@@ -1972 +1969 @@
     void didChangePlaybackRate(PlaybackSessionContextIdentifier);
     void didChangeCurrentTime(PlaybackSessionContextIdentifier);
+#else
+    void didEnterFullscreen();
+    void didExitFullscreen();
 #endif
 

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.h

@@ -313 +313 @@
     bool isInMultitaskingMode() const final;
 
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+    void didEnterFullscreen() final;
+    void didExitFullscreen() final;
+#endif
+
     WeakObjCPtr<WKContentView> m_contentView;
     RetainPtr<WKEditorUndoTarget> m_undoTarget;

trunk/Source/WebKit/UIProcess/ios/PageClientImplIOS.mm

@@ -984 +984 @@
 }
 
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+
+void PageClientImpl::didEnterFullscreen()
+{
+    [m_contentView _didEnterFullscreen];
+}
+
+void PageClientImpl::didExitFullscreen()
+{
+    [m_contentView _didExitFullscreen];
+}
+
+#endif // ENABLE(VIDEO_PRESENTATION_MODE)
+
 #if ENABLE(ATTACHMENT_ELEMENT)
 

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.h

@@ -225 +225 @@
     FocusedElementIsTooSmall = 1 << 1,
     InteractionIsHappening = 1 << 2,
+    ShowingFullscreenVideo = 1 << 3,
 };
 
@@ -729 +730 @@
 #endif
 
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+- (void)_didEnterFullscreen;
+- (void)_didExitFullscreen;
+#endif
+
 - (void)_requestTextInputContextsInRect:(CGRect)rect completionHandler:(void (^)(NSArray<_WKTextInputContext *> *))completionHandler;
 - (void)_focusTextInputContext:(_WKTextInputContext *)context placeCaretAt:(CGPoint)point completionHandler:(void (^)(UIResponder<UITextInput> *))completionHandler;

trunk/Source/WebKit/UIProcess/ios/WKContentViewInteraction.mm

@@ -10208 +10208 @@
 #endif // HAVE(PENCILKIT_TEXT_INPUT)
 
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+
+- (void)_didEnterFullscreen
+{
+    [self _startSuppressingSelectionAssistantForReason:WebKit::SuppressSelectionAssistantReason::ShowingFullscreenVideo];
+}
+
+- (void)_didExitFullscreen
+{
+    [self _stopSuppressingSelectionAssistantForReason:WebKit::SuppressSelectionAssistantReason::ShowingFullscreenVideo];
+}
+
+#endif // ENABLE(VIDEO_PRESENTATION_MODE)
+
 #if ENABLE(ATTACHMENT_ELEMENT)
 

trunk/Source/WebKit/UIProcess/mac/PageClientImplMac.h

@@ -296 +296 @@
     void requestScrollToRect(const WebCore::FloatRect& targetRect, const WebCore::FloatPoint& origin) override;
 
+#if ENABLE(VIDEO_PRESENTATION_MODE)
+    void didEnterFullscreen() final { }
+    void didExitFullscreen() final { }
+#endif
+
     NSView *m_view;
     WeakPtr<WebViewImpl> m_impl;