<!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>[182756] trunk/Source</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/182756">182756</a></dd>
<dt>Author</dt> <dd>beidson@apple.com</dd>
<dt>Date</dt> <dd>2015-04-13 14:23:09 -0700 (Mon, 13 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Share sheets from Share menus appear outside the browser window.
<rdar://problem/20455592> and https://bugs.webkit.org/show_bug.cgi?id=143620
Reviewed by Darin Adler.
Source/WebCore:
* page/ContextMenuController.h:
(WebCore::ContextMenuController::client):
Source/WebKit/mac:
Refactor existing Sharing Service Picker code to also be used for the Share menu NSMenuItem.
* Misc/WebSharingServicePickerController.h:
(WebSharingServicePickerClient::webView):
* Misc/WebSharingServicePickerController.mm:
(WebSharingServicePickerClient::WebSharingServicePickerClient):
(WebSharingServicePickerClient::sharingServicePickerWillBeDestroyed):
(WebSharingServicePickerClient::pageForSharingServicePicker):
(WebSharingServicePickerClient::windowForSharingServicePicker):
(WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem):
(WebSharingServicePickerClient::imageForCurrentSharingServicePickerItem):
(-[WebSharingServicePickerController initWithItems:includeEditorServices:client:style:]):
(-[WebSharingServicePickerController initWithSharingServicePicker:client:]):
(-[WebSharingServicePickerController sharingService:didShareItems:]):
* WebCoreSupport/WebContextMenuClient.h:
(WebContextMenuClient::webView): Deleted.
* WebCoreSupport/WebContextMenuClient.mm:
(WebContextMenuClient::WebContextMenuClient):
(WebContextMenuClient::pageForSharingServicePicker): Deleted.
(WebContextMenuClient::windowForSharingServicePicker): Deleted.
* WebCoreSupport/WebSelectionServiceController.h:
* WebCoreSupport/WebSelectionServiceController.mm:
(WebSelectionServiceController::WebSelectionServiceController):
(WebSelectionServiceController::handleSelectionServiceClick):
(WebSelectionServiceController::pageForSharingServicePicker): Deleted.
(WebSelectionServiceController::windowForSharingServicePicker): Deleted.
(WebSelectionServiceController::screenRectForCurrentSharingServicePickerItem): Deleted.
(WebSelectionServiceController::imageForCurrentSharingServicePickerItem): Deleted.
* WebView/WebHTMLView.mm:
(-[WebHTMLView menuForEvent:]):
* WebView/WebViewData.h:
Source/WebKit2:
Refactor existing Sharing Service Picker code to also be used for the Share menu NSMenuItem.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
(WebKit::WebPageProxy::platformInitializeShareMenuItem):
* UIProcess/WebPageProxy.h:
* UIProcess/mac/WKSharingServicePickerDelegate.h: Added.
* UIProcess/mac/WKSharingServicePickerDelegate.mm: Added.
(+[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]):
(-[WKSharingServicePickerDelegate menuProxy]):
(-[WKSharingServicePickerDelegate setMenuProxy:]):
(-[WKSharingServicePickerDelegate setPicker:]):
(-[WKSharingServicePickerDelegate setFiltersEditingServices:]):
(-[WKSharingServicePickerDelegate setHandlesEditingReplacement:]):
(-[WKSharingServicePickerDelegate sharingServicePicker:sharingServicesForItems:mask:proposedSharingServices:]):
(-[WKSharingServicePickerDelegate sharingServicePicker:delegateForSharingService:]):
(-[WKSharingServicePickerDelegate sharingService:willShareItems:]):
(-[WKSharingServicePickerDelegate sharingService:didShareItems:]):
(-[WKSharingServicePickerDelegate sharingService:sourceWindowForShareItems:sharingContentScope:]):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::setupServicesMenu):
(+[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]): Deleted.
(-[WKSharingServicePickerDelegate menuProxy]): Deleted.
(-[WKSharingServicePickerDelegate setMenuProxy:]): Deleted.
(-[WKSharingServicePickerDelegate setPicker:]): Deleted.
(-[WKSharingServicePickerDelegate setIncludeEditorServices:]): Deleted.
(-[WKSharingServicePickerDelegate sharingServicePicker:sharingServicesForItems:mask:proposedSharingServices:]): Deleted.
(-[WKSharingServicePickerDelegate sharingServicePicker:delegateForSharingService:]): Deleted.
(-[WKSharingServicePickerDelegate sharingService:willShareItems:]): Deleted.
(-[WKSharingServicePickerDelegate sharingService:didShareItems:]): Deleted.
(-[WKSharingServicePickerDelegate sharingService:sourceWindowForShareItems:sharingContentScope:]): Deleted.
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::platformInitializeShareMenuItem):
* WebKit2.xcodeproj/project.pbxproj:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorepageContextMenuControllerh">trunk/Source/WebCore/page/ContextMenuController.h</a></li>
<li><a href="#trunkSourceWebKitmacChangeLog">trunk/Source/WebKit/mac/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllerh">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h</a></li>
<li><a href="#trunkSourceWebKitmacMiscWebSharingServicePickerControllermm">trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClienth">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm">trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSelectionServiceControllerh">trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.h</a></li>
<li><a href="#trunkSourceWebKitmacWebCoreSupportWebSelectionServiceControllermm">trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebHTMLViewmm">trunk/Source/WebKit/mac/WebView/WebHTMLView.mm</a></li>
<li><a href="#trunkSourceWebKitmacWebViewWebViewDatah">trunk/Source/WebKit/mac/WebView/WebViewData.h</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWebPageProxyMacmm">trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm</a></li>
<li><a href="#trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj">trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2UIProcessmacWKSharingServicePickerDelegateh">trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacWKSharingServicePickerDelegatemm">trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebCore/ChangeLog 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-13 Brady Eidson <beidson@apple.com>
+
+ Share sheets from Share menus appear outside the browser window.
+ <rdar://problem/20455592> and https://bugs.webkit.org/show_bug.cgi?id=143620
+
+ Reviewed by Darin Adler.
+
+ * page/ContextMenuController.h:
+ (WebCore::ContextMenuController::client):
+
</ins><span class="cx"> 2015-04-13 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Rebaseline bindings tests.
</span></span></pre></div>
<a id="trunkSourceWebCorepageContextMenuControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/ContextMenuController.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/ContextMenuController.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebCore/page/ContextMenuController.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -49,6 +49,7 @@
</span><span class="cx"> ~ContextMenuController();
</span><span class="cx">
</span><span class="cx"> Page& page() { return m_page; }
</span><ins>+ ContextMenuClient& client() { return m_client; }
</ins><span class="cx">
</span><span class="cx"> ContextMenu* contextMenu() const { return m_contextMenu.get(); }
</span><span class="cx"> WEBCORE_EXPORT void clearContextMenu();
</span></span></pre></div>
<a id="trunkSourceWebKitmacChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/ChangeLog (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/ChangeLog 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/ChangeLog 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2015-04-13 Brady Eidson <beidson@apple.com>
+
+ Share sheets from Share menus appear outside the browser window.
+ <rdar://problem/20455592> and https://bugs.webkit.org/show_bug.cgi?id=143620
+
+ Reviewed by Darin Adler.
+
+ Refactor existing Sharing Service Picker code to also be used for the Share menu NSMenuItem.
+
+ * Misc/WebSharingServicePickerController.h:
+ (WebSharingServicePickerClient::webView):
+ * Misc/WebSharingServicePickerController.mm:
+ (WebSharingServicePickerClient::WebSharingServicePickerClient):
+ (WebSharingServicePickerClient::sharingServicePickerWillBeDestroyed):
+ (WebSharingServicePickerClient::pageForSharingServicePicker):
+ (WebSharingServicePickerClient::windowForSharingServicePicker):
+ (WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem):
+ (WebSharingServicePickerClient::imageForCurrentSharingServicePickerItem):
+ (-[WebSharingServicePickerController initWithItems:includeEditorServices:client:style:]):
+ (-[WebSharingServicePickerController initWithSharingServicePicker:client:]):
+ (-[WebSharingServicePickerController sharingService:didShareItems:]):
+
+ * WebCoreSupport/WebContextMenuClient.h:
+ (WebContextMenuClient::webView): Deleted.
+ * WebCoreSupport/WebContextMenuClient.mm:
+ (WebContextMenuClient::WebContextMenuClient):
+ (WebContextMenuClient::pageForSharingServicePicker): Deleted.
+ (WebContextMenuClient::windowForSharingServicePicker): Deleted.
+
+ * WebCoreSupport/WebSelectionServiceController.h:
+ * WebCoreSupport/WebSelectionServiceController.mm:
+ (WebSelectionServiceController::WebSelectionServiceController):
+ (WebSelectionServiceController::handleSelectionServiceClick):
+ (WebSelectionServiceController::pageForSharingServicePicker): Deleted.
+ (WebSelectionServiceController::windowForSharingServicePicker): Deleted.
+ (WebSelectionServiceController::screenRectForCurrentSharingServicePickerItem): Deleted.
+ (WebSelectionServiceController::imageForCurrentSharingServicePickerItem): Deleted.
+
+ * WebView/WebHTMLView.mm:
+ (-[WebHTMLView menuForEvent:]):
+ * WebView/WebViewData.h:
+
</ins><span class="cx"> 2015-04-13 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Add force property to MouseEvents
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -26,10 +26,14 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx">
</span><span class="cx"> #import <wtf/RetainPtr.h>
</span><ins>+
+#if PLATFORM(MAC)
</ins><span class="cx"> #import <WebCore/NSSharingServicePickerSPI.h>
</span><span class="cx"> #import <WebCore/NSSharingServiceSPI.h>
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> @class WebSharingServicePickerController;
</span><ins>+@class WebView;
</ins><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> class FloatRect;
</span><span class="lines">@@ -42,21 +46,29 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebSharingServicePickerClient() { }
</span><span class="cx">
</span><del>- virtual void sharingServicePickerWillBeDestroyed(WebSharingServicePickerController &) = 0;
- virtual WebCore::Page* pageForSharingServicePicker(WebSharingServicePickerController &) = 0;
- virtual RetainPtr<NSWindow> windowForSharingServicePicker(WebSharingServicePickerController &) = 0;
</del><ins>+ virtual void sharingServicePickerWillBeDestroyed(WebSharingServicePickerController &);
+ virtual WebCore::Page* pageForSharingServicePicker(WebSharingServicePickerController &);
+ virtual RetainPtr<NSWindow> windowForSharingServicePicker(WebSharingServicePickerController &);
</ins><span class="cx">
</span><del>- virtual WebCore::FloatRect screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &) = 0;
- virtual RetainPtr<NSImage> imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &) = 0;
</del><ins>+ virtual WebCore::FloatRect screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &);
+ virtual RetainPtr<NSImage> imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &);
+
+ WebView *webView() { return m_webView; }
+
+protected:
+ explicit WebSharingServicePickerClient(WebView *);
+ WebView *m_webView;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> @interface WebSharingServicePickerController : NSObject <NSSharingServiceDelegate, NSSharingServicePickerDelegate> {
</span><span class="cx"> WebSharingServicePickerClient* _pickerClient;
</span><span class="cx"> RetainPtr<NSSharingServicePicker> _picker;
</span><span class="cx"> BOOL _includeEditorServices;
</span><ins>+ BOOL _handleEditingReplacement;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> - (instancetype)initWithItems:(NSArray *)items includeEditorServices:(BOOL)includeEditorServices client:(WebSharingServicePickerClient*)pickerClient style:(NSSharingServicePickerStyle)style;
</span><ins>+- (instancetype)initWithSharingServicePicker:(NSSharingServicePicker *)sharingServicePicker client:(WebSharingServicePickerClient&)pickerClient;
</ins><span class="cx"> - (NSMenu *)menu;
</span><span class="cx"> - (void)didShareImageData:(NSData *)data confirmDataIsValidTIFFData:(BOOL)confirmData;
</span><span class="cx"> - (void)clear;
</span></span></pre></div>
<a id="trunkSourceWebKitmacMiscWebSharingServicePickerControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/Misc/WebSharingServicePickerController.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -42,8 +42,38 @@
</span><span class="cx">
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><ins>+WebSharingServicePickerClient::WebSharingServicePickerClient(WebView *webView)
+ : m_webView(webView)
+{
+}
+
+void WebSharingServicePickerClient::sharingServicePickerWillBeDestroyed(WebSharingServicePickerController &)
+{
+}
+
+Page* WebSharingServicePickerClient::pageForSharingServicePicker(WebSharingServicePickerController &)
+{
+ return [m_webView page];
+}
+
+RetainPtr<NSWindow> WebSharingServicePickerClient::windowForSharingServicePicker(WebSharingServicePickerController &)
+{
+ return [m_webView window];
+}
+
+FloatRect WebSharingServicePickerClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
+{
+ return FloatRect();
+}
+
+RetainPtr<NSImage> WebSharingServicePickerClient::imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
+{
+ return nil;
+}
+
</ins><span class="cx"> @implementation WebSharingServicePickerController
</span><span class="cx">
</span><ins>+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> - (instancetype)initWithItems:(NSArray *)items includeEditorServices:(BOOL)includeEditorServices client:(WebSharingServicePickerClient*)pickerClient style:(NSSharingServicePickerStyle)style
</span><span class="cx"> {
</span><span class="cx"> #ifndef __LP64__
</span><span class="lines">@@ -57,12 +87,33 @@
</span><span class="cx"> [_picker setDelegate:self];
</span><span class="cx">
</span><span class="cx"> _includeEditorServices = includeEditorServices;
</span><ins>+ _handleEditingReplacement = includeEditorServices;
</ins><span class="cx"> _pickerClient = pickerClient;
</span><span class="cx">
</span><span class="cx"> return self;
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+- (instancetype)initWithSharingServicePicker:(NSSharingServicePicker *)sharingServicePicker client:(WebSharingServicePickerClient&)pickerClient
+{
+#ifndef __LP64__
+ return nil;
+#else
+ if (!(self = [super init]))
+ return nil;
+
+ _picker = sharingServicePicker;
+ [_picker setDelegate:self];
+
+ _includeEditorServices = YES;
+ _pickerClient = &pickerClient;
+
+ return self;
+#endif
+}
+#endif // ENABLE(SERVICE_CONTROLS)
+
+
</ins><span class="cx"> - (void)clear
</span><span class="cx"> {
</span><span class="cx"> // Protect self from being dealloc'ed partway through this method.
</span><span class="lines">@@ -140,9 +191,7 @@
</span><span class="cx">
</span><span class="cx"> - (void)sharingService:(NSSharingService *)sharingService didShareItems:(NSArray *)items
</span><span class="cx"> {
</span><del>- // We only care about what item was shared if we were interested in editor services
- // (i.e., if we plan on replacing the selection with the returned item)
- if (!_includeEditorServices)
</del><ins>+ if (!_handleEditingReplacement)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> // We only send one item, so we should only get one item back.
</span><span class="lines">@@ -211,4 +260,4 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#endif
</del><ins>+#endif // ENABLE(SERVICE_CONTROLS)
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -26,6 +26,8 @@
</span><span class="cx"> * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
</span><span class="cx"> */
</span><span class="cx">
</span><ins>+#if ENABLE(CONTEXT_MENUS)
+
</ins><span class="cx"> #import "WebSharingServicePickerController.h"
</span><span class="cx"> #import <WebCore/ContextMenuClient.h>
</span><span class="cx"> #import <WebCore/IntRect.h>
</span><span class="lines">@@ -39,7 +41,7 @@
</span><span class="cx">
</span><span class="cx"> class WebContextMenuClient : public WebCore::ContextMenuClient
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>-, public WebSharingServicePickerClient
</del><ins>+ , public WebSharingServicePickerClient
</ins><span class="cx"> #endif
</span><span class="cx"> {
</span><span class="cx"> public:
</span><span class="lines">@@ -64,21 +66,21 @@
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> // WebSharingServicePickerClient
</span><span class="cx"> virtual void sharingServicePickerWillBeDestroyed(WebSharingServicePickerController &) override;
</span><del>- virtual WebCore::Page* pageForSharingServicePicker(WebSharingServicePickerController &) override;
- virtual RetainPtr<NSWindow> windowForSharingServicePicker(WebSharingServicePickerController &) override;
</del><span class="cx"> virtual WebCore::FloatRect screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &) override;
</span><span class="cx"> virtual RetainPtr<NSImage> imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &) override;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- WebView *webView() { return m_webView; }
-
</del><span class="cx"> private:
</span><span class="cx"> NSMenu *contextMenuForEvent(NSEvent *, NSView *, bool& isServicesMenu);
</span><span class="cx">
</span><span class="cx"> bool clientFloatRectForNode(WebCore::Node&, WebCore::FloatRect&) const;
</span><span class="cx">
</span><del>- WebView *m_webView;
</del><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> RetainPtr<WebSharingServicePickerController> m_sharingServicePickerController;
</span><ins>+#else
+ WebView* m_webView;
</ins><span class="cx"> #endif
</span><span class="cx"> };
</span><ins>+
+#endif // ENABLE(CONTEXT_MENUS)
+
</ins></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebContextMenuClientmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebContextMenuClient.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -67,8 +67,12 @@
</span><span class="cx"> - (void)speakString:(NSString *)string;
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-WebContextMenuClient::WebContextMenuClient(WebView *webView)
</del><ins>+WebContextMenuClient::WebContextMenuClient(WebView *webView)
+#if ENABLE(SERVICE_CONTROLS)
+ : WebSharingServicePickerClient(webView)
+#else
</ins><span class="cx"> : m_webView(webView)
</span><ins>+#endif
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -412,16 +416,6 @@
</span><span class="cx"> m_sharingServicePickerController = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::Page* WebContextMenuClient::pageForSharingServicePicker(WebSharingServicePickerController &)
-{
- return [m_webView page];
-}
-
-RetainPtr<NSWindow> WebContextMenuClient::windowForSharingServicePicker(WebSharingServicePickerController &)
-{
- return [m_webView window];
-}
-
</del><span class="cx"> WebCore::FloatRect WebContextMenuClient::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
</span><span class="cx"> {
</span><span class="cx"> Page* page = [m_webView page];
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSelectionServiceControllerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -51,14 +51,8 @@
</span><span class="cx">
</span><span class="cx"> // WebSharingServicePickerClient
</span><span class="cx"> virtual void sharingServicePickerWillBeDestroyed(WebSharingServicePickerController &) override;
</span><del>- virtual WebCore::Page* pageForSharingServicePicker(WebSharingServicePickerController &) override;
- virtual RetainPtr<NSWindow> windowForSharingServicePicker(WebSharingServicePickerController &) override;
- virtual WebCore::FloatRect screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &) override;
- virtual RetainPtr<NSImage> imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &) override;
</del><span class="cx">
</span><span class="cx"> private:
</span><del>- WebView *m_webView;
-
</del><span class="cx"> RetainPtr<WebSharingServicePickerController> m_sharingServicePickerController;
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebCoreSupportWebSelectionServiceControllermm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebCoreSupport/WebSelectionServiceController.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -37,7 +37,7 @@
</span><span class="cx"> using namespace WebCore;
</span><span class="cx">
</span><span class="cx"> WebSelectionServiceController::WebSelectionServiceController(WebView *webView)
</span><del>- : m_webView(webView)
</del><ins>+ : WebSharingServicePickerClient(webView)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -58,6 +58,7 @@
</span><span class="cx"> NSArray *items = @[ attributedSelection.get() ];
</span><span class="cx">
</span><span class="cx"> bool isEditable = selection.selection().isContentEditable();
</span><ins>+
</ins><span class="cx"> m_sharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithItems:items includeEditorServices:isEditable client:this style:NSSharingServicePickerStyleTextSelection]);
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSMenu> menu = adoptNS([[m_sharingServicePickerController menu] copy]);
</span><span class="lines">@@ -96,24 +97,4 @@
</span><span class="cx"> m_sharingServicePickerController = nil;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-WebCore::Page* WebSelectionServiceController::pageForSharingServicePicker(WebSharingServicePickerController &)
-{
- return [m_webView page];
-}
-
-RetainPtr<NSWindow> WebSelectionServiceController::windowForSharingServicePicker(WebSharingServicePickerController &)
-{
- return [m_webView window];
-}
-
-FloatRect WebSelectionServiceController::screenRectForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
-{
- return FloatRect();
-}
-
-RetainPtr<NSImage> WebSelectionServiceController::imageForCurrentSharingServicePickerItem(WebSharingServicePickerController &)
-{
- return nil;
-}
-
</del><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebHTMLViewmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebHTMLView.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebView/WebHTMLView.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -38,6 +38,7 @@
</span><span class="cx"> #import "WebActionMenuController.h"
</span><span class="cx"> #import "WebArchive.h"
</span><span class="cx"> #import "WebClipView.h"
</span><ins>+#import "WebContextMenuClient.h"
</ins><span class="cx"> #import "WebDOMOperationsInternal.h"
</span><span class="cx"> #import "WebDataSourceInternal.h"
</span><span class="cx"> #import "WebDefaultUIDelegate.h"
</span><span class="lines">@@ -67,6 +68,7 @@
</span><span class="cx"> #import "WebPreferences.h"
</span><span class="cx"> #import "WebPreferencesPrivate.h"
</span><span class="cx"> #import "WebResourcePrivate.h"
</span><ins>+#import "WebSharingServicePickerController.h"
</ins><span class="cx"> #import "WebTextCompletionController.h"
</span><span class="cx"> #import "WebTypesInternal.h"
</span><span class="cx"> #import "WebUIDelegatePrivate.h"
</span><span class="lines">@@ -624,6 +626,10 @@
</span><span class="cx"> #ifndef NDEBUG
</span><span class="cx"> BOOL enumeratingSubviews;
</span><span class="cx"> #endif
</span><ins>+
+#if ENABLE(SERVICE_CONTROLS)
+ RetainPtr<WebSharingServicePickerController> currentSharingServicePickerController;
+#endif
</ins><span class="cx"> }
</span><span class="cx"> - (void)clear;
</span><span class="cx"> @end
</span><span class="lines">@@ -3358,6 +3364,21 @@
</span><span class="cx"> if (!coreMenu)
</span><span class="cx"> return nil;
</span><span class="cx">
</span><ins>+ auto menuItemVector = contextMenuItemVector(coreMenu->platformDescription());
+ for (auto& menuItem : menuItemVector) {
+ if (menuItem.action() != ContextMenuItemTagShareMenu)
+ continue;
+
+ NSMenuItem *nsItem = menuItem.platformDescription();
+ if (![nsItem.representedObject isKindOfClass:[NSSharingServicePicker class]]) {
+ ASSERT_NOT_REACHED();
+ continue;
+ }
+#if ENABLE(SERVICE_CONTROLS)
+ _private->currentSharingServicePickerController = adoptNS([[WebSharingServicePickerController alloc] initWithSharingServicePicker:nsItem.representedObject client:static_cast<WebContextMenuClient&>(page->contextMenuController().client())]);
+#endif
+ }
+
</ins><span class="cx"> NSArray* menuItems = coreMenu->platformDescription();
</span><span class="cx"> if (!menuItems)
</span><span class="cx"> return nil;
</span></span></pre></div>
<a id="trunkSourceWebKitmacWebViewWebViewDatah"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/mac/WebView/WebViewData.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/mac/WebView/WebViewData.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit/mac/WebView/WebViewData.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -93,7 +93,10 @@
</span><span class="cx">
</span><span class="cx"> class LayerFlushController;
</span><span class="cx"> class WebViewGroup;
</span><ins>+
+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> class WebSelectionServiceController;
</span><ins>+#endif
</ins><span class="cx">
</span><span class="cx"> class WebViewLayerFlushScheduler : public WebCore::LayerFlushScheduler {
</span><span class="cx"> public:
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/ChangeLog 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -1,3 +1,49 @@
</span><ins>+2015-04-13 Brady Eidson <beidson@apple.com>
+
+ Share sheets from Share menus appear outside the browser window.
+ <rdar://problem/20455592> and https://bugs.webkit.org/show_bug.cgi?id=143620
+
+ Reviewed by Darin Adler.
+
+ Refactor existing Sharing Service Picker code to also be used for the Share menu NSMenuItem.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ (WebKit::WebPageProxy::platformInitializeShareMenuItem):
+ * UIProcess/WebPageProxy.h:
+
+ * UIProcess/mac/WKSharingServicePickerDelegate.h: Added.
+ * UIProcess/mac/WKSharingServicePickerDelegate.mm: Added.
+ (+[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]):
+ (-[WKSharingServicePickerDelegate menuProxy]):
+ (-[WKSharingServicePickerDelegate setMenuProxy:]):
+ (-[WKSharingServicePickerDelegate setPicker:]):
+ (-[WKSharingServicePickerDelegate setFiltersEditingServices:]):
+ (-[WKSharingServicePickerDelegate setHandlesEditingReplacement:]):
+ (-[WKSharingServicePickerDelegate sharingServicePicker:sharingServicesForItems:mask:proposedSharingServices:]):
+ (-[WKSharingServicePickerDelegate sharingServicePicker:delegateForSharingService:]):
+ (-[WKSharingServicePickerDelegate sharingService:willShareItems:]):
+ (-[WKSharingServicePickerDelegate sharingService:didShareItems:]):
+ (-[WKSharingServicePickerDelegate sharingService:sourceWindowForShareItems:sharingContentScope:]):
+
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::setupServicesMenu):
+ (+[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]): Deleted.
+ (-[WKSharingServicePickerDelegate menuProxy]): Deleted.
+ (-[WKSharingServicePickerDelegate setMenuProxy:]): Deleted.
+ (-[WKSharingServicePickerDelegate setPicker:]): Deleted.
+ (-[WKSharingServicePickerDelegate setIncludeEditorServices:]): Deleted.
+ (-[WKSharingServicePickerDelegate sharingServicePicker:sharingServicesForItems:mask:proposedSharingServices:]): Deleted.
+ (-[WKSharingServicePickerDelegate sharingServicePicker:delegateForSharingService:]): Deleted.
+ (-[WKSharingServicePickerDelegate sharingService:willShareItems:]): Deleted.
+ (-[WKSharingServicePickerDelegate sharingService:didShareItems:]): Deleted.
+ (-[WKSharingServicePickerDelegate sharingService:sourceWindowForShareItems:sharingContentScope:]): Deleted.
+
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::platformInitializeShareMenuItem):
+
+ * WebKit2.xcodeproj/project.pbxproj:
+
</ins><span class="cx"> 2015-04-13 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><span class="cx"> Begin cleaning up the shared memory interface
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -4064,8 +4064,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> ContextMenuItem coreItem = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), contextMenuContextData.selectedText());
</span><del>- if (!coreItem.isNull())
</del><ins>+ if (!coreItem.isNull()) {
+ platformInitializeShareMenuItem(coreItem);
</ins><span class="cx"> proposedAPIItems.append(WebContextMenuItem::create(coreItem));
</span><ins>+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> clientItems;
</span><span class="lines">@@ -4081,6 +4083,12 @@
</span><span class="cx"> m_contextMenuClient->contextMenuDismissed(*this);
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+#if !PLATFORM(MAC)
+void WebPageProxy::platformInitializeShareMenuItem(ContextMenuItem&)
+{
+}
+#endif
+
</ins><span class="cx"> void WebPageProxy::contextMenuItemSelected(const WebContextMenuItemData& item)
</span><span class="cx"> {
</span><span class="cx"> // Application custom items don't need to round-trip through to WebCore in the WebProcess.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -1233,6 +1233,8 @@
</span><span class="cx"> };
</span><span class="cx"> void showContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, const UserData&);
</span><span class="cx"> void internalShowContextMenu(const WebCore::IntPoint& menuLocation, const ContextMenuContextData&, const Vector<WebContextMenuItemData>&, ContextMenuClientEligibility, const UserData&);
</span><ins>+
+ void platformInitializeShareMenuItem(WebCore::ContextMenuItem&);
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKSharingServicePickerDelegateh"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.h (0 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.h (rev 0)
+++ trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.h 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -0,0 +1,55 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#ifndef WKSharingServicePickerDelegate_h
+#define WKSharingServicePickerDelegate_h
+
+#if ENABLE(SERVICE_CONTROLS)
+
+#include <wtf/RetainPtr.h>
+
+namespace WebKit {
+class WebContextMenuProxyMac;
+}
+
+@class NSSharingServicePicker;
+
+@interface WKSharingServicePickerDelegate : NSObject <NSSharingServiceDelegate, NSSharingServicePickerDelegate> {
+ WebKit::WebContextMenuProxyMac* _menuProxy;
+ RetainPtr<NSSharingServicePicker> _picker;
+ BOOL _filterEditingServices;
+ BOOL _handleEditingReplacement;
+}
+
++ (WKSharingServicePickerDelegate *)sharedSharingServicePickerDelegate;
+- (WebKit::WebContextMenuProxyMac*)menuProxy;
+- (void)setMenuProxy:(WebKit::WebContextMenuProxyMac*)menuProxy;
+- (void)setPicker:(NSSharingServicePicker *)picker;
+- (void)setFiltersEditingServices:(BOOL)filtersEditingServices;
+- (void)setHandlesEditingReplacement:(BOOL)handlesEditingReplacement;
+@end
+
+#endif // ENABLE(SERVICE_CONTROLS)
+#endif // WKSharingServicePickerDelegate_h
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWKSharingServicePickerDelegatemm"></a>
<div class="addfile"><h4>Added: trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm (0 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm (rev 0)
+++ trunk/Source/WebKit2/UIProcess/mac/WKSharingServicePickerDelegate.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -0,0 +1,142 @@
</span><ins>+/*
+ * Copyright (C) 2015 Apple Inc. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS''
+ * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
+ * THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS
+ * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
+ * THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "config.h"
+#import "WKSharingServicePickerDelegate.h"
+
+#if ENABLE(SERVICE_CONTROLS)
+
+#import "DataReference.h"
+#import "WebContextMenuProxyMac.h"
+#import "WebPageProxy.h"
+#import <WebCore/NSSharingServicePickerSPI.h>
+#import <WebCore/NSSharingServiceSPI.h>
+#import <wtf/text/WTFString.h>
+
+// FIXME: We probably need to hang on the picker itself until the context menu operation is done, and this object will probably do that.
+@implementation WKSharingServicePickerDelegate
+
++ (WKSharingServicePickerDelegate*)sharedSharingServicePickerDelegate
+{
+ static WKSharingServicePickerDelegate* delegate = [[WKSharingServicePickerDelegate alloc] init];
+ return delegate;
+}
+
+- (WebKit::WebContextMenuProxyMac*)menuProxy
+{
+ return _menuProxy;
+}
+
+- (void)setMenuProxy:(WebKit::WebContextMenuProxyMac*)menuProxy
+{
+ _menuProxy = menuProxy;
+}
+
+- (void)setPicker:(NSSharingServicePicker *)picker
+{
+ _picker = picker;
+}
+
+- (void)setFiltersEditingServices:(BOOL)filtersEditingServices
+{
+ _filterEditingServices = filtersEditingServices;
+}
+
+- (void)setHandlesEditingReplacement:(BOOL)handlesEditingReplacement
+{
+ _handleEditingReplacement = handlesEditingReplacement;
+}
+
+- (NSArray *)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker sharingServicesForItems:(NSArray *)items mask:(NSSharingServiceMask)mask proposedSharingServices:(NSArray *)proposedServices
+{
+ if (!_filterEditingServices)
+ return proposedServices;
+
+ NSMutableArray *services = [[NSMutableArray alloc] initWithCapacity:[proposedServices count]];
+
+ for (NSSharingService *service in proposedServices) {
+ if (service.type != NSSharingServiceTypeEditor)
+ [services addObject:service];
+ }
+
+ return services;
+}
+
+- (id <NSSharingServiceDelegate>)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker delegateForSharingService:(NSSharingService *)sharingService
+{
+ return self;
+}
+
+- (void)sharingService:(NSSharingService *)sharingService willShareItems:(NSArray *)items
+{
+ _menuProxy->clearServicesMenu();
+}
+
+- (void)sharingService:(NSSharingService *)sharingService didShareItems:(NSArray *)items
+{
+ // We only care about what item was shared if we were interested in editor services
+ // (i.e., if we plan on replacing the selection with the returned item)
+ if (!_handleEditingReplacement)
+ return;
+
+ Vector<String> types;
+ IPC::DataReference dataReference;
+
+ id item = [items objectAtIndex:0];
+
+ if ([item isKindOfClass:[NSAttributedString class]]) {
+ NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:nil];
+ dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
+
+ types.append(NSPasteboardTypeRTFD);
+ types.append(NSRTFDPboardType);
+ } else if ([item isKindOfClass:[NSData class]]) {
+ NSData *data = (NSData *)item;
+ RetainPtr<CGImageSourceRef> source = adoptCF(CGImageSourceCreateWithData((CFDataRef)data, NULL));
+ RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(source.get(), 0, NULL));
+
+ if (!image)
+ return;
+
+ dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
+ types.append(NSPasteboardTypeTIFF);
+ } else {
+ LOG_ERROR("sharingService:didShareItems: - Unknown item type returned\n");
+ return;
+ }
+
+ // FIXME: We should adopt replaceSelectionWithAttributedString instead of bouncing through the (fake) pasteboard.
+ _menuProxy->page().replaceSelectionWithPasteboardData(types, dataReference);
+}
+
+- (NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
+{
+ return _menuProxy->window();
+}
+
+@end
+
+#endif // ENABLE(SERVICE_CONTROLS)
+
</ins></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -34,10 +34,11 @@
</span><span class="cx"> #import "ServicesController.h"
</span><span class="cx"> #import "ShareableBitmap.h"
</span><span class="cx"> #import "StringUtilities.h"
</span><ins>+#import "WKSharingServicePickerDelegate.h"
+#import "WKView.h"
</ins><span class="cx"> #import "WebContextMenuItem.h"
</span><span class="cx"> #import "WebContextMenuItemData.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><del>-#import "WKView.h"
</del><span class="cx"> #import <WebCore/GraphicsContext.h>
</span><span class="cx"> #import <WebCore/IntRect.h>
</span><span class="cx"> #import <WebCore/NSSharingServicePickerSPI.h>
</span><span class="lines">@@ -147,119 +148,6 @@
</span><span class="cx">
</span><span class="cx"> @end
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
-@interface WKSharingServicePickerDelegate : NSObject <NSSharingServiceDelegate, NSSharingServicePickerDelegate> {
- WebKit::WebContextMenuProxyMac* _menuProxy;
- RetainPtr<NSSharingServicePicker> _picker;
- BOOL _includeEditorServices;
-}
-
-+ (WKSharingServicePickerDelegate *)sharedSharingServicePickerDelegate;
-- (WebKit::WebContextMenuProxyMac*)menuProxy;
-- (void)setMenuProxy:(WebKit::WebContextMenuProxyMac*)menuProxy;
-- (void)setPicker:(NSSharingServicePicker *)picker;
-- (void)setIncludeEditorServices:(BOOL)includeEditorServices;
-@end
-
-// FIXME: We probably need to hang on the picker itself until the context menu operation is done, and this object will probably do that.
-@implementation WKSharingServicePickerDelegate
-+ (WKSharingServicePickerDelegate*)sharedSharingServicePickerDelegate
-{
- static WKSharingServicePickerDelegate* delegate = [[WKSharingServicePickerDelegate alloc] init];
- return delegate;
-}
-
-- (WebKit::WebContextMenuProxyMac*)menuProxy
-{
- return _menuProxy;
-}
-
-- (void)setMenuProxy:(WebKit::WebContextMenuProxyMac*)menuProxy
-{
- _menuProxy = menuProxy;
-}
-
-- (void)setPicker:(NSSharingServicePicker *)picker
-{
- _picker = picker;
-}
-
-- (void)setIncludeEditorServices:(BOOL)includeEditorServices
-{
- _includeEditorServices = includeEditorServices;
-}
-
-- (NSArray *)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker sharingServicesForItems:(NSArray *)items mask:(NSSharingServiceMask)mask proposedSharingServices:(NSArray *)proposedServices
-{
- if (_includeEditorServices)
- return proposedServices;
-
- NSMutableArray *services = [[NSMutableArray alloc] initWithCapacity:[proposedServices count]];
-
- for (NSSharingService *service in proposedServices) {
- if (service.type != NSSharingServiceTypeEditor)
- [services addObject:service];
- }
-
- return services;
-}
-
-- (id <NSSharingServiceDelegate>)sharingServicePicker:(NSSharingServicePicker *)sharingServicePicker delegateForSharingService:(NSSharingService *)sharingService
-{
- return self;
-}
-
-- (void)sharingService:(NSSharingService *)sharingService willShareItems:(NSArray *)items
-{
- _menuProxy->clearServicesMenu();
-}
-
-- (void)sharingService:(NSSharingService *)sharingService didShareItems:(NSArray *)items
-{
- // We only care about what item was shared if we were interested in editor services
- // (i.e., if we plan on replacing the selection with the returned item)
- if (!_includeEditorServices)
- return;
-
- Vector<String> types;
- IPC::DataReference dataReference;
-
- id item = [items objectAtIndex:0];
-
- if ([item isKindOfClass:[NSAttributedString class]]) {
- NSData *data = [item RTFDFromRange:NSMakeRange(0, [item length]) documentAttributes:nil];
- dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
-
- types.append(NSPasteboardTypeRTFD);
- types.append(NSRTFDPboardType);
- } else if ([item isKindOfClass:[NSData class]]) {
- NSData *data = (NSData *)item;
- RetainPtr<CGImageSourceRef> source = adoptCF(CGImageSourceCreateWithData((CFDataRef)data, NULL));
- RetainPtr<CGImageRef> image = adoptCF(CGImageSourceCreateImageAtIndex(source.get(), 0, NULL));
-
- if (!image)
- return;
-
- dataReference = IPC::DataReference(static_cast<const uint8_t*>([data bytes]), [data length]);
- types.append(NSPasteboardTypeTIFF);
- } else {
- LOG_ERROR("sharingService:didShareItems: - Unknown item type returned\n");
- return;
- }
-
- // FIXME: We should adopt replaceSelectionWithAttributedString instead of bouncing through the (fake) pasteboard.
- _menuProxy->page().replaceSelectionWithPasteboardData(types, dataReference);
-}
-
-- (NSWindow *)sharingService:(NSSharingService *)sharingService sourceWindowForShareItems:(NSArray *)items sharingContentScope:(NSSharingContentScope *)sharingContentScope
-{
- return _menuProxy->window();
-}
-
-@end
-
-#endif
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy* page)
</span><span class="lines">@@ -392,7 +280,8 @@
</span><span class="cx"> [picker setStyle:hasControlledImage ? NSSharingServicePickerStyleRollover : NSSharingServicePickerStyleTextSelection];
</span><span class="cx"> [picker setDelegate:[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate]];
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:picker.get()];
</span><del>- [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setIncludeEditorServices:includeEditorServices];
</del><ins>+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:!includeEditorServices];
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:includeEditorServices];
</ins><span class="cx">
</span><span class="cx"> m_servicesMenu = adoptNS([[picker menu] copy]);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -43,6 +43,8 @@
</span><span class="cx"> #import "StringUtilities.h"
</span><span class="cx"> #import "TextChecker.h"
</span><span class="cx"> #import "WKBrowsingContextControllerInternal.h"
</span><ins>+#import "WKSharingServicePickerDelegate.h"
+#import "WebContextMenuProxyMac.h"
</ins><span class="cx"> #import "WebPageMessages.h"
</span><span class="cx"> #import "WebProcessProxy.h"
</span><span class="cx"> #import <WebCore/DictationAlternative.h>
</span><span class="lines">@@ -745,7 +747,24 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><ins>+
+void WebPageProxy::platformInitializeShareMenuItem(ContextMenuItem& item)
+{
+#if ENABLE(SERVICE_CONTROLS)
+ NSMenuItem *nsItem = item.platformDescription();
+
+ NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
+ sharingServicePicker.delegate = [WKSharingServicePickerDelegate sharedSharingServicePickerDelegate];
</ins><span class="cx">
</span><ins>+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:NO];
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:NO];
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:static_cast<WebContextMenuProxyMac*>(m_activeContextMenu.get())];
+
+ // Setting the picker lets the delegate retain it to keep it alive, but this picker is kept alive by the menu item.
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nil];
+#endif
+}
+
</ins><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre></div>
<a id="trunkSourceWebKit2WebKit2xcodeprojprojectpbxproj"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj (182755 => 182756)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-13 21:18:29 UTC (rev 182755)
+++ trunk/Source/WebKit2/WebKit2.xcodeproj/project.pbxproj 2015-04-13 21:23:09 UTC (rev 182756)
</span><span class="lines">@@ -926,6 +926,8 @@
</span><span class="cx"> 513A163D163088F6005D7D22 /* NetworkProcessProxyMessages.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A163B163088F6005D7D22 /* NetworkProcessProxyMessages.h */; };
</span><span class="cx"> 513A164C1630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 513A16491630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp */; };
</span><span class="cx"> 513A164D1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h in Headers */ = {isa = PBXBuildFile; fileRef = 513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */; };
</span><ins>+ 513E462D1AD837560016234A /* WKSharingServicePickerDelegate.h in Headers */ = {isa = PBXBuildFile; fileRef = 513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */; };
+ 513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */; };
</ins><span class="cx"> 514BDED316C98EDD00E4E25E /* StatisticsRequest.h in Headers */ = {isa = PBXBuildFile; fileRef = 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */; };
</span><span class="cx"> 514D9F5719119D35000063A7 /* ServicesController.h in Headers */ = {isa = PBXBuildFile; fileRef = 514D9F5519119D35000063A7 /* ServicesController.h */; };
</span><span class="cx"> 514D9F5819119D35000063A7 /* ServicesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 514D9F5619119D35000063A7 /* ServicesController.mm */; };
</span><span class="lines">@@ -3117,6 +3119,8 @@
</span><span class="cx"> 513A16491630A9BF005D7D22 /* NetworkConnectionToWebProcess.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = NetworkConnectionToWebProcess.cpp; path = NetworkProcess/NetworkConnectionToWebProcess.cpp; sourceTree = "<group>"; };
</span><span class="cx"> 513A164A1630A9BF005D7D22 /* NetworkConnectionToWebProcess.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = NetworkConnectionToWebProcess.h; path = NetworkProcess/NetworkConnectionToWebProcess.h; sourceTree = "<group>"; };
</span><span class="cx"> 513A164B1630A9BF005D7D22 /* NetworkConnectionToWebProcess.messages.in */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; name = NetworkConnectionToWebProcess.messages.in; path = NetworkProcess/NetworkConnectionToWebProcess.messages.in; sourceTree = "<group>"; };
</span><ins>+ 513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WKSharingServicePickerDelegate.h; sourceTree = "<group>"; };
+ 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = WKSharingServicePickerDelegate.mm; sourceTree = "<group>"; };
</ins><span class="cx"> 514BDED216C98EDD00E4E25E /* StatisticsRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = StatisticsRequest.h; sourceTree = "<group>"; };
</span><span class="cx"> 514D9F5519119D35000063A7 /* ServicesController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServicesController.h; sourceTree = "<group>"; };
</span><span class="cx"> 514D9F5619119D35000063A7 /* ServicesController.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = ServicesController.mm; sourceTree = "<group>"; };
</span><span class="lines">@@ -7066,6 +7070,8 @@
</span><span class="cx"> 0FCB4E5D18BBE3D9000FCFC9 /* WKPrintingView.mm */,
</span><span class="cx"> 0FCB4E5E18BBE3D9000FCFC9 /* WKTextInputWindowController.h */,
</span><span class="cx"> 0FCB4E5F18BBE3D9000FCFC9 /* WKTextInputWindowController.mm */,
</span><ins>+ 513E462B1AD837560016234A /* WKSharingServicePickerDelegate.h */,
+ 513E462C1AD837560016234A /* WKSharingServicePickerDelegate.mm */,
</ins><span class="cx"> );
</span><span class="cx"> path = mac;
</span><span class="cx"> sourceTree = "<group>";
</span><span class="lines">@@ -7939,6 +7945,7 @@
</span><span class="cx"> 1A5E4DA412D3BD3D0099A2BB /* TextCheckerState.h in Headers */,
</span><span class="cx"> CE1A0BD71A48E6C60054EF74 /* TextInputSPI.h in Headers */,
</span><span class="cx"> 1AAF263914687C39004A1E8A /* TiledCoreAnimationDrawingArea.h in Headers */,
</span><ins>+ 513E462D1AD837560016234A /* WKSharingServicePickerDelegate.h in Headers */,
</ins><span class="cx"> 1AF05D8714688348008B1E81 /* TiledCoreAnimationDrawingAreaProxy.h in Headers */,
</span><span class="cx"> 1AFE436618B6C081009C7A48 /* UIDelegate.h in Headers */,
</span><span class="cx"> CEE4AE2B1A5DCF430002F49B /* UIKitSPI.h in Headers */,
</span><span class="lines">@@ -9868,6 +9875,7 @@
</span><span class="cx"> 31A2EC48148997C200810D71 /* WebNotification.cpp in Sources */,
</span><span class="cx"> 31099973146C75A20029DEB9 /* WebNotificationClient.cpp in Sources */,
</span><span class="cx"> 31312620148FF82C00BA2A39 /* WebNotificationManager.cpp in Sources */,
</span><ins>+ 513E462E1AD837560016234A /* WKSharingServicePickerDelegate.mm in Sources */,
</ins><span class="cx"> 31BA924D148831260062EDB5 /* WebNotificationManagerMessageReceiver.cpp in Sources */,
</span><span class="cx"> 31A2EC4A148997C200810D71 /* WebNotificationManagerProxy.cpp in Sources */,
</span><span class="cx"> 31A2EC4D148997C200810D71 /* WebNotificationProvider.cpp in Sources */,
</span></span></pre>
</div>
</div>
</body>
</html>