Changeset 166730 in webkit

Timestamp:

Apr 3, 2014 10:56:03 AM (10 years ago)

Author:

andersca@apple.com

Message:

Make actionsForElement a proper API::UIClient member function
​https://bugs.webkit.org/show_bug.cgi?id=131171

Reviewed by Sam Weinig.

• UIProcess/API/APIUIClient.h:

(API::UIClient::actionsForElement):

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

(WebKit::UIClient::actionsForElement):

• UIProcess/ios/WKActionSheetAssistant.mm:

(-[WKActionSheetAssistant showImageSheet]):
(-[WKActionSheetAssistant showLinkSheet]):

Location:

trunk/Source/WebKit2

Files:

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

trunk/Source/WebKit2/ChangeLog

@@ +1 @@
+2014-04-03  Anders Carlsson  <andersca@apple.com>
+
+        Make actionsForElement a proper API::UIClient member function
+        https://bugs.webkit.org/show_bug.cgi?id=131171
+
+        Reviewed by Sam Weinig.
+
+        * UIProcess/API/APIUIClient.h:
+        (API::UIClient::actionsForElement):
+        * UIProcess/Cocoa/UIDelegate.h:
+        * UIProcess/Cocoa/UIDelegate.mm:
+        (WebKit::UIClient::actionsForElement):
+        * UIProcess/ios/WKActionSheetAssistant.mm:
+        (-[WKActionSheetAssistant showImageSheet]):
+        (-[WKActionSheetAssistant showLinkSheet]):
+
 2014-04-03  Martin Hodovan  <mhodovan@inf.u-szeged.hu>
 

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

@@ -34 +34 @@
 #include <functional>
 #include <wtf/PassRefPtr.h>
+
+#if PLATFORM(IOS)
+OBJC_CLASS NSArray;
+OBJC_CLASS _WKActivatedElementInfo;
+#endif
 
 namespace WebCore {
@@ -137 +142 @@
 
     virtual bool shouldInterruptJavaScript(WebKit::WebPageProxy*) { return false; }
+
+#if PLATFORM(IOS)
+    virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return std::move(defaultActions); }
+#endif
 };
 

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

@@ -49 +49 @@
     void setDelegate(id <WKUIDelegate>);
 
-    NSArray *actionsForElement(_WKActivatedElementInfo *, NSArray *defaultActions);
-
 private:
     // API::UIClient
@@ -57 +55 @@
     virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
     virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) override;
+#if PLATFORM(IOS)
+    virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
+#endif
 
     WKWebView *m_webView;

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

@@ -63 +63 @@
     m_delegateMethods.webViewActionsForElementDefaultActions = [delegate respondsToSelector:@selector(_webView:actionsForElement:defaultActions:)];
 #endif
-}
-
-NSArray *UIClient::actionsForElement(_WKActivatedElementInfo *elementInfo, NSArray *defaultActions)
-{
-#if PLATFORM(IOS)
-    if (!m_delegateMethods.webViewRunJavaScriptTextInputPanelWithPromptDefaultTextInitiatedByFrameCompletionHandler)
-        return defaultActions;
-
-    auto delegate = m_delegate.get();
-    if (!delegate)
-        return defaultActions;
-
-    return [(id <WKUIDelegatePrivate>)delegate _webView:m_webView actionsForElement:elementInfo defaultActions:defaultActions];
-#endif
-    return defaultActions;
 }
 
@@ -164 +149 @@
 }
 
+#if PLATFORM(IOS)
+RetainPtr<NSArray> UIClient::actionsForElement(_WKActivatedElementInfo *elementInfo, RetainPtr<NSArray> defaultActions)
+{
+    if (!m_delegateMethods.webViewActionsForElementDefaultActions)
+        return std::move(defaultActions);
+
+    auto delegate = m_delegate.get();
+    if (!delegate)
+        return defaultActions;
+
+    return [(id <WKUIDelegatePrivate>)delegate _webView:m_webView actionsForElement:elementInfo defaultActions:defaultActions.get()];
+}
+#endif
+
 } // namespace WebKit
 

trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm

@@ -228 +228 @@
 
     NSURL *targetURL = [NSURL URLWithString:positionInformation.url];
-    NSMutableArray *defaultActions = [NSMutableArray array];
+    auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
     if (!positionInformation.url.isEmpty())
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
@@ -238 +238 @@
         [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeCopy]];
 
-    RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage
+    auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage
         URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds]);
 
-    RetainPtr<NSArray> actions = static_cast<UIClient&>(_view.page->uiClient()).actionsForElement(elementInfo.get(), [[defaultActions copy] autorelease]);
+    RetainPtr<NSArray> actions = _view.page->uiClient().actionsForElement(elementInfo.get(), std::move(defaultActions));
 
     if (![actions count])
@@ -267 +267 @@
         return;
 
-    NSMutableArray *defaultActions = [NSMutableArray array];
+    auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
     [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
     if ([getSSReadingListClass() supportsURL:targetURL])
@@ -277 +277 @@
         URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds]);
 
-    RetainPtr<NSArray> actions = static_cast<UIClient&>(_view.page->uiClient()).actionsForElement(elementInfo.get(), [[defaultActions copy] autorelease]);
+    RetainPtr<NSArray> actions = _view.page->uiClient().actionsForElement(elementInfo.get(), std::move(defaultActions));
 
     if (![actions count])