<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[166730] trunk/Source/WebKit2</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/166730">166730</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2014-04-03 10:56:03 -0700 (Thu, 03 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>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]):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPIAPIUIClienth">trunk/Source/WebKit2/UIProcess/API/APIUIClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegateh">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm">trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (166729 => 166730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2014-04-03 17:54:45 UTC (rev 166729)
+++ trunk/Source/WebKit2/ChangeLog 2014-04-03 17:56:03 UTC (rev 166730)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+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]):
+
</ins><span class="cx"> 2014-04-03 Martin Hodovan <mhodovan@inf.u-szeged.hu>
</span><span class="cx">
</span><span class="cx"> [WK2] Fix !ENABLE(BLOB) build
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPIAPIUIClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/APIUIClient.h (166729 => 166730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-04-03 17:54:45 UTC (rev 166729)
+++ trunk/Source/WebKit2/UIProcess/API/APIUIClient.h 2014-04-03 17:56:03 UTC (rev 166730)
</span><span class="lines">@@ -34,6 +34,11 @@
</span><span class="cx"> #include <functional>
</span><span class="cx"> #include <wtf/PassRefPtr.h>
</span><span class="cx">
</span><ins>+#if PLATFORM(IOS)
+OBJC_CLASS NSArray;
+OBJC_CLASS _WKActivatedElementInfo;
+#endif
+
</ins><span class="cx"> namespace WebCore {
</span><span class="cx"> class ResourceRequest;
</span><span class="cx"> struct WindowFeatures;
</span><span class="lines">@@ -136,6 +141,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> virtual bool shouldInterruptJavaScript(WebKit::WebPageProxy*) { return false; }
</span><ins>+
+#if PLATFORM(IOS)
+ virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) { return std::move(defaultActions); }
+#endif
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace API
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h (166729 => 166730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-04-03 17:54:45 UTC (rev 166729)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.h 2014-04-03 17:56:03 UTC (rev 166730)
</span><span class="lines">@@ -48,14 +48,15 @@
</span><span class="cx"> RetainPtr<id <WKUIDelegate> > delegate();
</span><span class="cx"> void setDelegate(id <WKUIDelegate>);
</span><span class="cx">
</span><del>- NSArray *actionsForElement(_WKActivatedElementInfo *, NSArray *defaultActions);
-
</del><span class="cx"> private:
</span><span class="cx"> // API::UIClient
</span><span class="cx"> virtual PassRefPtr<WebKit::WebPageProxy> createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy*, const WebCore::ResourceRequest&, const WebCore::WindowFeatures&, WebKit::WebEvent::Modifiers, WebKit::WebMouseEvent::Button) override;
</span><span class="cx"> virtual void runJavaScriptAlert(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void ()> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptConfirm(WebKit::WebPageProxy*, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (bool)> completionHandler) override;
</span><span class="cx"> virtual void runJavaScriptPrompt(WebKit::WebPageProxy*, const WTF::String&, const WTF::String&, WebKit::WebFrameProxy*, std::function<void (const WTF::String&)> completionHandler) override;
</span><ins>+#if PLATFORM(IOS)
+ virtual RetainPtr<NSArray> actionsForElement(_WKActivatedElementInfo *, RetainPtr<NSArray> defaultActions) override;
+#endif
</ins><span class="cx">
</span><span class="cx"> WKWebView *m_webView;
</span><span class="cx"> WeakObjCPtr<id <WKUIDelegate> > m_delegate;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (166729 => 166730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-04-03 17:54:45 UTC (rev 166729)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2014-04-03 17:56:03 UTC (rev 166730)
</span><span class="lines">@@ -64,21 +64,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-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;
-}
-
</del><span class="cx"> PassRefPtr<WebKit::WebPageProxy> UIClient::createNewPage(WebKit::WebPageProxy*, WebKit::WebFrameProxy* initiatingFrame, const WebCore::ResourceRequest& request, const WebCore::WindowFeatures& windowFeatures, WebKit::WebEvent::Modifiers, WebKit::WebMouseEvent::Button)
</span><span class="cx"> {
</span><span class="cx"> if (!m_delegateMethods.webViewCreateWebViewWithConfigurationForNavigationActionWindowFeatures)
</span><span class="lines">@@ -163,6 +148,20 @@
</span><span class="cx"> }];
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#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
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // WK_API_ENABLED
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosWKActionSheetAssistantmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm (166729 => 166730)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2014-04-03 17:54:45 UTC (rev 166729)
+++ trunk/Source/WebKit2/UIProcess/ios/WKActionSheetAssistant.mm 2014-04-03 17:56:03 UTC (rev 166730)
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> const auto& positionInformation = _view.positionInformation;
</span><span class="cx">
</span><span class="cx"> NSURL *targetURL = [NSURL URLWithString:positionInformation.url];
</span><del>- NSMutableArray *defaultActions = [NSMutableArray array];
</del><ins>+ auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
</ins><span class="cx"> if (!positionInformation.url.isEmpty())
</span><span class="cx"> [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
</span><span class="cx"> if ([getSSReadingListClass() supportsURL:targetURL])
</span><span class="lines">@@ -237,10 +237,10 @@
</span><span class="cx"> if (!targetURL.scheme.length || [targetURL.scheme caseInsensitiveCompare:@"javascript"] != NSOrderedSame)
</span><span class="cx"> [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeCopy]];
</span><span class="cx">
</span><del>- RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage
</del><ins>+ auto elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeImage
</ins><span class="cx"> URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds]);
</span><span class="cx">
</span><del>- RetainPtr<NSArray> actions = static_cast<UIClient&>(_view.page->uiClient()).actionsForElement(elementInfo.get(), [[defaultActions copy] autorelease]);
</del><ins>+ RetainPtr<NSArray> actions = _view.page->uiClient().actionsForElement(elementInfo.get(), std::move(defaultActions));
</ins><span class="cx">
</span><span class="cx"> if (![actions count])
</span><span class="cx"> return;
</span><span class="lines">@@ -266,7 +266,7 @@
</span><span class="cx"> if (!targetURL)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- NSMutableArray *defaultActions = [NSMutableArray array];
</del><ins>+ auto defaultActions = adoptNS([[NSMutableArray alloc] init]);
</ins><span class="cx"> [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeOpen]];
</span><span class="cx"> if ([getSSReadingListClass() supportsURL:targetURL])
</span><span class="cx"> [defaultActions addObject:[_WKElementAction elementActionWithType:_WKElementActionTypeAddToReadingList]];
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> RetainPtr<_WKActivatedElementInfo> elementInfo = adoptNS([[_WKActivatedElementInfo alloc] _initWithType:_WKActivatedElementTypeLink
</span><span class="cx"> URL:targetURL location:positionInformation.point title:positionInformation.title rect:positionInformation.bounds]);
</span><span class="cx">
</span><del>- RetainPtr<NSArray> actions = static_cast<UIClient&>(_view.page->uiClient()).actionsForElement(elementInfo.get(), [[defaultActions copy] autorelease]);
</del><ins>+ RetainPtr<NSArray> actions = _view.page->uiClient().actionsForElement(elementInfo.get(), std::move(defaultActions));
</ins><span class="cx">
</span><span class="cx"> if (![actions count])
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>