Changeset 287755 in webkit

Timestamp:

Jan 7, 2022, 9:44:46 AM (5 years ago)

Author:

Peng Liu

Message:

Clean up FullscreenClient
​https://bugs.webkit.org/show_bug.cgi?id=233076

Reviewed by Jer Noble.

This patch is a follow-up to r285741.

• Get rid of WKFullscreenClientView and use WKWebView instead.

• UIProcess/Cocoa/FullscreenClient.h:
• UIProcess/Cocoa/FullscreenClient.mm:

(WebKit::FullscreenClient::FullscreenClient):
(WebKit::FullscreenClient::willEnterFullscreen):
(WebKit::FullscreenClient::didEnterFullscreen):
(WebKit::FullscreenClient::willExitFullscreen):
(WebKit::FullscreenClient::didExitFullscreen):

Location:

trunk/Source/WebKit

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/Cocoa/FullscreenClient.h (modified) (3 diffs)
• UIProcess/Cocoa/FullscreenClient.mm (modified) (5 diffs)

trunk/Source/WebKit/ChangeLog

@@ +1 @@
+2022-01-07  Peng Liu  <peng.liu6@apple.com>
+
+        Clean up FullscreenClient
+        https://bugs.webkit.org/show_bug.cgi?id=233076
+
+        Reviewed by Jer Noble.
+
+        This patch is a follow-up to r285741.
+        - Get rid of `WKFullscreenClientView` and use `WKWebView` instead.
+
+        * UIProcess/Cocoa/FullscreenClient.h:
+        * UIProcess/Cocoa/FullscreenClient.mm:
+        (WebKit::FullscreenClient::FullscreenClient):
+        (WebKit::FullscreenClient::willEnterFullscreen):
+        (WebKit::FullscreenClient::didEnterFullscreen):
+        (WebKit::FullscreenClient::willExitFullscreen):
+        (WebKit::FullscreenClient::didExitFullscreen):
+
 2022-01-07  Per Arne Vollan  <pvollan@apple.com>
 

trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.h

@@ -29 +29 @@
 
 #import "APIFullscreenClient.h"
+#import "WKWebView.h"
 #import <wtf/RetainPtr.h>
 #import <wtf/WeakObjCPtr.h>
-
-@class WKWebView;
-using WKFullscreenClientView = WKWebView;
 
 @protocol _WKFullscreenDelegate;
@@ -41 +39 @@
 class FullscreenClient : public API::FullscreenClient {
 public:
-    explicit FullscreenClient(WKFullscreenClientView *);
+    explicit FullscreenClient(WKWebView *);
     ~FullscreenClient() { };
 
@@ -55 +53 @@
 
 private:
-    WKFullscreenClientView *m_webView;
+    WKWebView *m_webView;
     WeakObjCPtr<id <_WKFullscreenDelegate> > m_delegate;
 

trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.mm

@@ -31 +31 @@
 namespace WebKit {
 
-FullscreenClient::FullscreenClient(WKFullscreenClientView *webView)
+FullscreenClient::FullscreenClient(WKWebView *webView)
     : m_webView(webView)
 {
@@ -64 +64 @@
 #if PLATFORM(MAC)
     if (m_delegateMethods.webViewWillEnterFullscreen)
-        [m_delegate.get() _webViewWillEnterFullscreen:static_cast<NSView *>(m_webView)];
+        [m_delegate.get() _webViewWillEnterFullscreen:m_webView];
 #else
     if (m_delegateMethods.webViewWillEnterElementFullscreen)
@@ -77 +77 @@
 #if PLATFORM(MAC)
     if (m_delegateMethods.webViewDidEnterFullscreen)
-        [m_delegate.get() _webViewDidEnterFullscreen:static_cast<NSView *>(m_webView)];
+        [m_delegate.get() _webViewDidEnterFullscreen:m_webView];
 #else
     if (m_delegateMethods.webViewDidEnterElementFullscreen)
@@ -90 +90 @@
 #if PLATFORM(MAC)
     if (m_delegateMethods.webViewWillExitFullscreen)
-        [m_delegate.get() _webViewWillExitFullscreen:static_cast<NSView *>(m_webView)];
+        [m_delegate.get() _webViewWillExitFullscreen:m_webView];
 #else
     if (m_delegateMethods.webViewWillExitElementFullscreen)
@@ -103 +103 @@
 #if PLATFORM(MAC)
     if (m_delegateMethods.webViewDidExitFullscreen)
-        [m_delegate.get() _webViewDidExitFullscreen:static_cast<NSView *>(m_webView)];
+        [m_delegate.get() _webViewDidExitFullscreen:m_webView];
 #else
     if (m_delegateMethods.webViewDidExitElementFullscreen)