Attachment 368631 Details for Bug 197263 – Patch

[patch] Patch

bug-197263-20190430164838.patch (text/plain), 3.88 KB, created by Jay Mulani on 2019-04-30 16:48:39 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Jay Mulani

Created: 2019-04-30 16:48:39 PDT

Size: 3.88 KB

patch

obsolete

>Subversion Revision: 244602
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 8e8baa819fb15ff8805961b54001600a3251bea7..4503aec9fa75124c3f9422621dab2ae10fa18ee2 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,16 @@
>+2019-04-30  Jay Mulani  <jmulani@apple.com>
>+
>+        Expose full screen controller SPI to check if full screen is open and close full screen
>+        https://bugs.webkit.org/show_bug.cgi?id=197263
>+
>+        Reviewed by Jer Noble.
>+
>+        * UIProcess/API/Cocoa/WKWebView.mm:
>+        (-[WKWebView closeFullScreenWindowController]):
>+        (-[WKWebView fullScreenWindowController]):
>+        * UIProcess/API/Cocoa/WKWebViewInternal.h:
>+        * UIProcess/API/Cocoa/WKWebViewPrivate.h:
>+
> 2019-04-24  Wenson Hsieh  <wenson_hsieh@apple.com>
> 
>         Plumb the navigation's request when determining recommended compatibility mode
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>index 3442dc3b924b168bde2113d78f0c68f7410bce3e..224f4bd2fb40bf34ac7cde97fda9995e05423786 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebView.mm
>@@ -7308,28 +7308,32 @@ @end
> 
> #if ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
> 
>-@implementation WKWebView (FullScreenAPI)
>+@implementation WKWebView (FullScreenAPI_Private)
> 
> - (BOOL)hasFullScreenWindowController
> {
>     return !!_fullScreenWindowController;
> }
> 
>-- (WKFullScreenWindowController *)fullScreenWindowController
>+- (void)closeFullScreenWindowController
> {
>     if (!_fullScreenWindowController)
>-        _fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWebView:self]);
>+        return;
> 
>-    return _fullScreenWindowController.get();
>+    [_fullScreenWindowController close];
>+    _fullScreenWindowController = nullptr;
> }
> 
>-- (void)closeFullScreenWindowController
>+@end
>+
>+@implementation WKWebView (FullScreenAPI_Internal)
>+
>+- (WKFullScreenWindowController *)fullScreenWindowController
> {
>     if (!_fullScreenWindowController)
>-        return;
>+        _fullScreenWindowController = adoptNS([[WKFullScreenWindowController alloc] initWithWebView:self]);
> 
>-    [_fullScreenWindowController close];
>-    _fullScreenWindowController = nullptr;
>+    return _fullScreenWindowController.get();
> }
> 
> @end
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>index 36c6818f70d1944ac2cf598ffb7554b0b360789b..56fe5c21cf41d0a068510b5940572fcc83cd8e11 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewInternal.h
>@@ -195,12 +195,10 @@ struct PrintInfo;
> WKWebView* fromWebPageProxy(WebKit::WebPageProxy&);
> 
> #if ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
>-@interface WKWebView (FullScreenAPI)
>--(BOOL)hasFullScreenWindowController;
>+@interface WKWebView (FullScreenAPI_Internal)
> -(WKFullScreenWindowController *)fullScreenWindowController;
>--(void)closeFullScreenWindowController;
> @end
>-#endif // ENABLE(FULLSCREEN_API) && PLATFORM(IOS_FAMILY)
>+#endif
> 
> #if PLATFORM(IOS_FAMILY) && !PLATFORM(IOSMAC)
> @interface WKWebView (_WKWebViewPrintFormatter)
>diff --git a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>index fa372e96446d2df581ea2fb90151f33fdec447bc..06c1eb4a6856d79788cd23bee4667b65187a247f 100644
>--- a/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>+++ b/Source/WebKit/UIProcess/API/Cocoa/WKWebViewPrivate.h
>@@ -427,6 +427,13 @@ typedef NS_OPTIONS(NSUInteger, _WKRectEdge) {
> 
> @end
> 
>+#if TARGET_OS_IOS || (defined(TARGET_OS_IOSMAC) && TARGET_OS_IOSMAC) || TARGET_OS_TV
>+@interface WKWebView (FullScreenAPI_Private)
>+-(BOOL)hasFullScreenWindowController;
>+-(void)closeFullScreenWindowController;
>+@end
>+#endif
>+
> #if TARGET_OS_IPHONE
> 
> @interface WKWebView () <UIResponderStandardEditActions>

Actions: View | Formatted Diff | Diff

Attachments on bug 197263: 368257 | 368631