Changeset 195623 in webkit

Timestamp:

Jan 26, 2016 2:22:14 PM (8 years ago)

Author:

andersca@apple.com

Message:

Add a private WKUIDelegate method for getting a presenting view controller for a WKWebView on iOS
​https://bugs.webkit.org/show_bug.cgi?id=153510

Reviewed by Dan Bernstein.

• UIProcess/API/APIUIClient.h:

(API::UIClient::presentingViewController):

• UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
• UIProcess/Cocoa/UIDelegate.h:
• UIProcess/Cocoa/UIDelegate.mm:

(WebKit::UIDelegate::setDelegate):
(WebKit::UIDelegate::UIClient::presentingViewController):

Location:

trunk/Source/WebKit2

Files:

• ChangeLog (modified) (1 diff)
• UIProcess/API/APIUIClient.h (modified) (2 diffs)
• UIProcess/API/Cocoa/WKUIDelegatePrivate.h (modified) (1 diff)
• UIProcess/Cocoa/UIDelegate.h (modified) (2 diffs)
• UIProcess/Cocoa/UIDelegate.mm (modified) (2 diffs)

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2016-01-26  Anders Carlsson  <andersca@apple.com>
+
+        Add a private WKUIDelegate method for getting a presenting view controller for a WKWebView on iOS
+        https://bugs.webkit.org/show_bug.cgi?id=153510
+
+        Reviewed by Dan Bernstein.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::presentingViewController):
+        * UIProcess/API/Cocoa/WKUIDelegatePrivate.h:
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIDelegate::setDelegate):
+        (WebKit::UIDelegate::UIClient::presentingViewController):
+
 2016-01-26  Dean Jackson  <dino@apple.com>
 

trunk/Source/WebKit2/UIProcess/API/APIUIClient.h

@@ -38 +38 @@
 OBJC_CLASS NSArray;
 OBJC_CLASS _WKActivatedElementInfo;
+OBJC_CLASS UIViewController;
 #endif
 
@@ -162 +163 @@
     virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return defaultActions; }
     virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) { }
+    virtual UIViewController *presentingViewController() { return nullptr; }
 #endif
 

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

@@ -84 +84 @@
 - (UIViewController *)_webView:(WKWebView *)webView previewingViewControllerForElement:(_WKPreviewElementInfo *)elementInfo defaultActions:(NSArray<UIPreviewActionItem *> *)previewActions WK_AVAILABLE(NA, WK_IOS_TBA);
 - (void)_webView:(WKWebView *)webView commitPreviewingViewController:(UIViewController *)previewingViewController WK_AVAILABLE(NA, WK_IOS_TBA);
+
+- (UIViewController *)_presentingViewControllerForWebView:(WKWebView *)webView WK_AVAILABLE(NA, WK_IOS_TBA);
 #else
 - (NSMenu *)_webView:(WKWebView *)webView contextMenu:(NSMenu *)menu forElement:(_WKContextMenuElementInfo *)element WK_AVAILABLE(WK_MAC_TBA, NA);

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h

@@ -94 +94 @@
         virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
         virtual void didNotHandleTapAsClick(const WebCore::IntPoint&) override;
+        virtual UIViewController *presentingViewController() override;
 #endif
         virtual void imageOrMediaDocumentSizeChanged(const WebCore::IntSize&) override;
@@ -122 +123 @@
         bool webViewActionsForElementDefaultActions : 1;
         bool webViewDidNotHandleTapAsClickAtPoint : 1;
+        bool presentingViewControllerForWebView : 1;
 #endif
         bool webViewImageOrMediaDocumentSizeChanged : 1;

trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm

@@ -93 +93 @@
     m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
     m_delegateMethods.webViewDidNotHandleTapAsClickAtPoint = [delegate respondsToSelector:@selector(_webView:didNotHandleTapAsClickAtPoint:)];
+    m_delegateMethods.presentingViewControllerForWebView = [delegate respondsToSelector:@selector(_presentingViewControllerForWebView:)];
 #endif
     m_delegateMethods.webViewImageOrMediaDocumentSizeChanged = [delegate respondsToSelector:@selector(_webView:imageOrMediaDocumentSizeChanged:)];
@@ -381 +382 @@
     [static_cast<id <WKUIDelegatePrivate>>(delegate) _webView:m_uiDelegate.m_webView didNotHandleTapAsClickAtPoint:point];
 }
+
+UIViewController *UIDelegate::UIClient::presentingViewController()
+{
+    if (!m_uiDelegate.m_delegateMethods.presentingViewControllerForWebView)
+        return nullptr;
+
+    auto delegate = m_uiDelegate.m_delegate.get();
+    if (!delegate)
+        return nullptr;
+
+    return [static_cast<id <WKUIDelegatePrivate>>(delegate) _presentingViewControllerForWebView:m_uiDelegate.m_webView];
+}
+
 #endif