Changeset 217252 in webkit

Timestamp:

May 22, 2017 3:41:02 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

Need a way to allow WKWebView to load request with ShouldOpenExternalURLsPolicy::ShouldAllow.
​https://bugs.webkit.org/show_bug.cgi?id=172460

Add an new method [WKWebView _loadRequest:shouldOpenExternalURLs:] to WKWebView; a WebKit client
can use this to load request that allows opening external URLs.

Patch by Yongjun Zhang <​yongjun_zhang@apple.com> on 2017-05-22
Reviewed by Tim Horton.

• UIProcess/API/Cocoa/WKWebView.mm:

(-[WKWebView _loadRequest:shouldOpenExternalURLs:]): When calling WebPageProxy::loadRequest, also

set ShouldOpenExternalURLsPolicy based on the value of shouldOpenExternalURLs.

• UIProcess/API/Cocoa/WKWebViewPrivate.h: Add [WKWebView _loadRequest:shouldOpenExternalURLs:].

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebView.mm (modified) (1 diff)
• UIProcess/API/Cocoa/WKWebViewPrivate.h (modified) (1 diff)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2017-05-22  Yongjun Zhang  <yongjun_zhang@apple.com>
+
+        Need a way to allow WKWebView to load request with ShouldOpenExternalURLsPolicy::ShouldAllow.
+        https://bugs.webkit.org/show_bug.cgi?id=172460
+
+        Add an new method [WKWebView _loadRequest:shouldOpenExternalURLs:] to WKWebView; a WebKit client
+        can use this to load request that allows opening external URLs.
+
+        Reviewed by Tim Horton.
+
+        * UIProcess/API/Cocoa/WKWebView.mm:
+        (-[WKWebView _loadRequest:shouldOpenExternalURLs:]): When calling WebPageProxy::loadRequest, also
+            set ShouldOpenExternalURLsPolicy based on the value of shouldOpenExternalURLs.
+        * UIProcess/API/Cocoa/WKWebViewPrivate.h: Add [WKWebView _loadRequest:shouldOpenExternalURLs:].
+
 2017-05-22  Youenn Fablet  <youenn@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebView.mm

@@ -3703 +3703 @@
 }
 
+- (WKNavigation *)_loadRequest:(NSURLRequest *)request shouldOpenExternalURLs:(BOOL)shouldOpenExternalURLs
+{
+    auto navigation = _page->loadRequest(request, shouldOpenExternalURLs ? WebCore::ShouldOpenExternalURLsPolicy::ShouldAllow : WebCore::ShouldOpenExternalURLsPolicy::ShouldNotAllow);
+    if (!navigation)
+        return nil;
+
+    return [wrapper(*navigation.leakRef()) autorelease];
+}
+
 - (NSArray *)_certificateChain
 {

trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h

@@ -104 +104 @@
 - (void)_loadAlternateHTMLString:(NSString *)string baseURL:(NSURL *)baseURL forUnreachableURL:(NSURL *)unreachableURL;
 - (WKNavigation *)_loadData:(NSData *)data MIMEType:(NSString *)MIMEType characterEncodingName:(NSString *)characterEncodingName baseURL:(NSURL *)baseURL userData:(id)userData WK_API_AVAILABLE(macosx(10.12), ios(10.0));
+- (WKNavigation *)_loadRequest:(NSURLRequest *)request shouldOpenExternalURLs:(BOOL)shouldOpenExternalURLs WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
 
 @property (nonatomic, readonly) NSArray *_certificateChain WK_API_DEPRECATED_WITH_REPLACEMENT("certificateChain", macosx(10.10, 10.11), ios(8.0, 9.0));