Title: [287755] trunk/Source/WebKit
- Revision
- 287755
- Author
- peng.l...@apple.com
- Date
- 2022-01-07 09:44:46 -0800 (Fri, 07 Jan 2022)
Log 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):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (287754 => 287755)
--- trunk/Source/WebKit/ChangeLog 2022-01-07 17:37:09 UTC (rev 287754)
+++ trunk/Source/WebKit/ChangeLog 2022-01-07 17:44:46 UTC (rev 287755)
@@ -1,3 +1,21 @@
+2022-01-07 Peng Liu <peng.l...@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 <pvol...@apple.com>
[MacCatalyst] Add required syscall
Modified: trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.h (287754 => 287755)
--- trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.h 2022-01-07 17:37:09 UTC (rev 287754)
+++ trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.h 2022-01-07 17:44:46 UTC (rev 287755)
@@ -28,12 +28,10 @@
#import "WKFoundation.h"
#import "APIFullscreenClient.h"
+#import "WKWebView.h"
#import <wtf/RetainPtr.h>
#import <wtf/WeakObjCPtr.h>
-@class WKWebView;
-using WKFullscreenClientView = WKWebView;
-
@protocol _WKFullscreenDelegate;
namespace WebKit {
@@ -40,7 +38,7 @@
class FullscreenClient : public API::FullscreenClient {
public:
- explicit FullscreenClient(WKFullscreenClientView *);
+ explicit FullscreenClient(WKWebView *);
~FullscreenClient() { };
bool isType(API::FullscreenClient::Type target) const override { return target == API::FullscreenClient::WebKitType; };
@@ -54,7 +52,7 @@
void didExitFullscreen(WebPageProxy*) override;
private:
- WKFullscreenClientView *m_webView;
+ WKWebView *m_webView;
WeakObjCPtr<id <_WKFullscreenDelegate> > m_delegate;
struct {
Modified: trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.mm (287754 => 287755)
--- trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.mm 2022-01-07 17:37:09 UTC (rev 287754)
+++ trunk/Source/WebKit/UIProcess/Cocoa/FullscreenClient.mm 2022-01-07 17:44:46 UTC (rev 287755)
@@ -30,7 +30,7 @@
namespace WebKit {
-FullscreenClient::FullscreenClient(WKFullscreenClientView *webView)
+FullscreenClient::FullscreenClient(WKWebView *webView)
: m_webView(webView)
{
}
@@ -63,7 +63,7 @@
[m_webView didChangeValueForKey:@"fullscreenState"];
#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)
[m_delegate.get() _webViewWillEnterElementFullscreen:m_webView];
@@ -76,7 +76,7 @@
[m_webView didChangeValueForKey:@"fullscreenState"];
#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)
[m_delegate.get() _webViewDidEnterElementFullscreen:m_webView];
@@ -89,7 +89,7 @@
[m_webView didChangeValueForKey:@"fullscreenState"];
#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)
[m_delegate.get() _webViewWillExitElementFullscreen:m_webView];
@@ -102,7 +102,7 @@
[m_webView didChangeValueForKey:@"fullscreenState"];
#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)
[m_delegate.get() _webViewDidExitElementFullscreen:m_webView];
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
