<!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>[191194] 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/191194">191194</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-16 12:52:42 -0700 (Fri, 16 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move more code to WebContextMenuProxyMac
https://bugs.webkit.org/show_bug.cgi?id=150240
Reviewed by Tim Horton.
* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/WebPageProxy.h:
(WebKit::WebPageProxy::contextMenuClient):
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::initializeShareMenuItem):
(WebKit::WebContextMenuProxyMac::showContextMenu):
* UIProcess/mac/WebPageProxyMac.mm:
(WebKit::WebPageProxy::platformInitializeShareMenuItem): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextMenuProxyh">trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h</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="#trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach">trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2015-10-16 Anders Carlsson <andersca@apple.com>
+
+ Move more code to WebContextMenuProxyMac
+ https://bugs.webkit.org/show_bug.cgi?id=150240
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebContextMenuProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPageProxy.h:
+ (WebKit::WebPageProxy::contextMenuClient):
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::initializeShareMenuItem):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ * UIProcess/mac/WebPageProxyMac.mm:
+ (WebKit::WebPageProxy::platformInitializeShareMenuItem): Deleted.
+
</ins><span class="cx"> 2015-10-16 Tim Horton <timothy_horton@apple.com>
</span><span class="cx">
</span><span class="cx"> Hook up autolayout intrinsic sizing for WKWebView
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -40,7 +40,7 @@
</span><span class="cx"> public:
</span><span class="cx"> virtual ~WebContextMenuProxy();
</span><span class="cx">
</span><del>- virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) = 0;
</del><ins>+ virtual void showContextMenu() = 0;
</ins><span class="cx"> virtual void hideContextMenu() = 0;
</span><span class="cx"> virtual void cancelTracking() { }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -4209,45 +4209,9 @@
</span><span class="cx"> // Since showContextMenu() can spin a nested run loop we need to turn off the responsiveness timer.
</span><span class="cx"> m_process->responsivenessTimer()->stop();
</span><span class="cx">
</span><del>- // Unless this is an image control, give the PageContextMenuClient one last swipe at changing the menu.
- bool askClientToChangeMenu = true;
-#if ENABLE(SERVICE_CONTROLS)
- if (contextMenuContextData.isServicesMenu() || contextMenuContextData.controlledImage())
- askClientToChangeMenu = false;
-#endif
-
- Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
- for (auto& item : contextMenuContextData.menuItems()) {
- if (item.action() != ContextMenuItemTagShareMenu) {
- proposedAPIItems.append(WebContextMenuItem::create(item));
- continue;
- }
-
- ContextMenuItem coreItem = platformInitializeShareMenuItem(contextMenuContextData);
- if (!coreItem.isNull())
- proposedAPIItems.append(WebContextMenuItem::create(coreItem));
- }
-
- Vector<RefPtr<WebContextMenuItem>> clientItems;
- bool useProposedItems = true;
-
- if (askClientToChangeMenu && m_contextMenuClient->getContextMenuFromProposedMenu(*this, proposedAPIItems, clientItems, contextMenuContextData.webHitTestResultData(), m_process->transformHandlesToObjects(userData.object()).get()))
- useProposedItems = false;
-
- const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
- if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
- m_activeContextMenu->showContextMenu(itemsToShow);
-
- m_contextMenuClient->contextMenuDismissed(*this);
</del><ins>+ m_activeContextMenu->showContextMenu();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-#if !ENABLE(SERVICE_CONTROLS)
-ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData&)
-{
- return ContextMenuItem();
-}
-#endif
-
</del><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 (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -326,6 +326,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><ins>+ API::ContextMenuClient& contextMenuClient() { return *m_contextMenuClient; }
</ins><span class="cx"> void setContextMenuClient(std::unique_ptr<API::ContextMenuClient>);
</span><span class="cx"> #endif
</span><span class="cx"> API::FindClient& findClient() { return *m_findClient; }
</span><span class="lines">@@ -1264,7 +1265,6 @@
</span><span class="cx"> #if ENABLE(CONTEXT_MENUS)
</span><span class="cx"> void showContextMenu(const ContextMenuContextData&, const UserData&);
</span><span class="cx"> void internalShowContextMenu(const ContextMenuContextData&, const UserData&);
</span><del>- WebCore::ContextMenuItem platformInitializeShareMenuItem(const ContextMenuContextData&);
</del><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> #if ENABLE(TELEPHONE_NUMBER_DETECTION)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> }
</span><span class="cx"> ~WebContextMenuProxyMac();
</span><span class="cx">
</span><del>- virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) override;
</del><ins>+ virtual void showContextMenu() override;
</ins><span class="cx">
</span><span class="cx"> virtual void hideContextMenu() override;
</span><span class="cx"> virtual void cancelTracking() override;
</span><span class="lines">@@ -71,6 +71,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void setupServicesMenu(const ContextMenuContextData&);
</span><ins>+ WebCore::ContextMenuItem shareMenuItem();
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> RetainPtr<NSPopUpButtonCell> m_popup;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -28,6 +28,7 @@
</span><span class="cx">
</span><span class="cx"> #if PLATFORM(MAC)
</span><span class="cx">
</span><ins>+#import "APIContextMenuClient.h"
</ins><span class="cx"> #import "DataReference.h"
</span><span class="cx"> #import "MenuUtilities.h"
</span><span class="cx"> #import "PageClientImpl.h"
</span><span class="lines">@@ -251,7 +252,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>-
</del><span class="cx"> void WebContextMenuProxyMac::setupServicesMenu(const ContextMenuContextData& context)
</span><span class="cx"> {
</span><span class="cx"> bool includeEditorServices = context.controlledDataIsEditable();
</span><span class="lines">@@ -321,6 +321,39 @@
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nullptr];
</span><span class="cx"> m_servicesMenu = nullptr;
</span><span class="cx"> }
</span><ins>+
+ContextMenuItem WebContextMenuProxyMac::shareMenuItem()
+{
+ const WebHitTestResultData& hitTestData = m_context.webHitTestResultData();
+
+ URL absoluteLinkURL;
+ if (!hitTestData.absoluteLinkURL.isEmpty())
+ absoluteLinkURL = URL(ParsedURLString, hitTestData.absoluteLinkURL);
+
+ URL downloadableMediaURL;
+ if (!hitTestData.absoluteMediaURL.isEmpty() && hitTestData.isDownloadableMedia)
+ downloadableMediaURL = URL(ParsedURLString, hitTestData.absoluteMediaURL);
+
+ RetainPtr<NSImage> image;
+ if (hitTestData.imageSharedMemory && hitTestData.imageSize)
+ image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
+
+ ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), m_context.selectedText());
+
+ NSMenuItem *nsItem = item.platformDescription();
+
+ NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
+ sharingServicePicker.delegate = [WKSharingServicePickerDelegate sharedSharingServicePickerDelegate];
+
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setFiltersEditingServices:NO];
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setHandlesEditingReplacement:NO];
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
+
+ // 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];
+
+ return item;
+}
</ins><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items)
</span><span class="lines">@@ -345,9 +378,36 @@
</span><span class="cx"> populateNSMenu(menu, nsMenuItemVector(items));
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContextMenuProxyMac::showContextMenu(const Vector<RefPtr<WebContextMenuItem>>& items)
</del><ins>+void WebContextMenuProxyMac::showContextMenu()
</ins><span class="cx"> {
</span><ins>+ // Unless this is an image control, give the PageContextMenuClient one last swipe at changing the menu.
+ bool askClientToChangeMenu = true;
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><ins>+ if (m_context.isServicesMenu() || m_context.controlledImage())
+ askClientToChangeMenu = false;
+#endif
+
+ Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
+ for (auto& item : m_context.menuItems()) {
+ if (item.action() != ContextMenuItemTagShareMenu) {
+ proposedAPIItems.append(WebContextMenuItem::create(item));
+ continue;
+ }
+
+#if ENABLE(SERVICE_CONTROLS)
+ proposedAPIItems.append(WebContextMenuItem::create(shareMenuItem()));
+#endif
+ }
+
+ Vector<RefPtr<WebContextMenuItem>> clientItems;
+ bool useProposedItems = true;
+
+ if (askClientToChangeMenu && m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
+ useProposedItems = false;
+
+ const Vector<RefPtr<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
+
+#if ENABLE(SERVICE_CONTROLS)
</ins><span class="cx"> if (items.isEmpty() && !m_context.isServicesMenu())
</span><span class="cx"> return;
</span><span class="cx"> #else
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebPageProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm (191193 => 191194)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-10-16 19:47:04 UTC (rev 191193)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPageProxyMac.mm 2015-10-16 19:52:42 UTC (rev 191194)
</span><span class="lines">@@ -738,41 +738,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
-ContextMenuItem WebPageProxy::platformInitializeShareMenuItem(const ContextMenuContextData& contextMenuContextData)
-{
- const WebHitTestResultData& hitTestData = contextMenuContextData.webHitTestResultData();
-
- URL absoluteLinkURL;
- if (!hitTestData.absoluteLinkURL.isEmpty())
- absoluteLinkURL = URL(ParsedURLString, hitTestData.absoluteLinkURL);
-
- URL downloadableMediaURL;
- if (!hitTestData.absoluteMediaURL.isEmpty() && hitTestData.isDownloadableMedia)
- downloadableMediaURL = URL(ParsedURLString, hitTestData.absoluteMediaURL);
-
- RetainPtr<NSImage> image;
- if (hitTestData.imageSharedMemory && hitTestData.imageSize)
- image = adoptNS([[NSImage alloc] initWithData:[NSData dataWithBytes:(unsigned char*)hitTestData.imageSharedMemory->data() length:hitTestData.imageSize]]);
-
- ContextMenuItem item = ContextMenuItem::shareMenuItem(absoluteLinkURL, downloadableMediaURL, image.get(), contextMenuContextData.selectedText());
-
- NSMenuItem *nsItem = item.platformDescription();
-
- NSSharingServicePicker *sharingServicePicker = [nsItem representedObject];
- sharingServicePicker.delegate = [WKSharingServicePickerDelegate sharedSharingServicePickerDelegate];
-
- [[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];
-
- return item;
-}
-#endif
-
</del><span class="cx"> } // namespace WebKit
</span><span class="cx">
</span><span class="cx"> #endif // PLATFORM(MAC)
</span></span></pre>
</div>
</div>
</body>
</html>