<!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>[191412] 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/191412">191412</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-21 16:14:31 -0700 (Wed, 21 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move services menu handling out into a separate function
https://bugs.webkit.org/show_bug.cgi?id=150420
Reviewed by Tim Horton.
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::showServicesMenu):
(WebKit::WebContextMenuProxyMac::show):
(WebKit::WebContextMenuProxyMac::showContextMenu):
(WebKit::WebContextMenuProxyMac::populate): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (191411 => 191412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-21 23:10:45 UTC (rev 191411)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-21 23:14:31 UTC (rev 191412)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2015-10-21 Anders Carlsson <andersca@apple.com>
+
+ Move services menu handling out into a separate function
+ https://bugs.webkit.org/show_bug.cgi?id=150420
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::showServicesMenu):
+ (WebKit::WebContextMenuProxyMac::show):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+ (WebKit::WebContextMenuProxyMac::populate): Deleted.
+
</ins><span class="cx"> 2015-10-21 Wenson Hsieh <wenson_hsieh@apple.com>
</span><span class="cx">
</span><span class="cx"> Single tapping clickable elements in unscalable pages should show a tap highlight
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191411 => 191412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-21 23:10:45 UTC (rev 191411)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-21 23:14:31 UTC (rev 191412)
</span><span class="lines">@@ -59,9 +59,10 @@
</span><span class="cx"> private:
</span><span class="cx"> virtual void show() override;
</span><span class="cx">
</span><del>- void populate(const Vector<RefPtr<WebContextMenuItem>>&);
</del><ins>+ void showContextMenu();
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><ins>+ void showServicesMenu();
</ins><span class="cx"> void setupServicesMenu();
</span><span class="cx"> WebCore::ContextMenuItem shareMenuItem();
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191411 => 191412)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-21 23:10:45 UTC (rev 191411)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-21 23:14:31 UTC (rev 191412)
</span><span class="lines">@@ -318,6 +318,14 @@
</span><span class="cx"> ServicesController::singleton().refreshExistingServices();
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void WebContextMenuProxyMac::showServicesMenu()
+{
+ setupServicesMenu();
+
+ [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
+ [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
+}
+
</ins><span class="cx"> void WebContextMenuProxyMac::clearServicesMenu()
</span><span class="cx"> {
</span><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setPicker:nullptr];
</span><span class="lines">@@ -360,30 +368,22 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items)
</del><ins>+void WebContextMenuProxyMac::show()
</ins><span class="cx"> {
</span><ins>+ Ref<WebPageProxy> protect(m_page);
+
</ins><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> if (m_context.isServicesMenu()) {
</span><del>- setupServicesMenu();
</del><ins>+ showServicesMenu();
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- m_menu = [[NSMenu alloc] initWithTitle:@""];
- [m_menu setAutoenablesItems:NO];
-
- populateNSMenu(m_menu.get(), nsMenuItemVector(items));
</del><ins>+ showContextMenu();
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-void WebContextMenuProxyMac::show()
</del><ins>+void WebContextMenuProxyMac::showContextMenu()
</ins><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 (m_context.isServicesMenu() || m_context.controlledImage())
- askClientToChangeMenu = false;
-#endif
-
</del><span class="cx"> Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
</span><span class="cx"> for (auto& item : m_context.menuItems()) {
</span><span class="cx"> if (item.action() != ContextMenuItemTagShareMenu) {
</span><span class="lines">@@ -401,30 +401,20 @@
</span><span class="cx"> Vector<RefPtr<WebContextMenuItem>> clientItems;
</span><span class="cx"> bool useProposedItems = true;
</span><span class="cx">
</span><del>- if (askClientToChangeMenu && m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
</del><ins>+ if (m_page.contextMenuClient().getContextMenuFromProposedMenu(m_page, proposedAPIItems, clientItems, m_context.webHitTestResultData(), m_page.process().transformHandlesToObjects(m_userData.object()).get()))
</ins><span class="cx"> useProposedItems = false;
</span><span class="cx">
</span><span class="cx"> const Vector<RefPtr<WebContextMenuItem>>& items = useProposedItems ? proposedAPIItems : clientItems;
</span><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- if (items.isEmpty() && !m_context.isServicesMenu())
- return;
-#else
</del><span class="cx"> if (items.isEmpty())
</span><span class="cx"> return;
</span><del>-#endif
</del><span class="cx">
</span><del>- populate(items);
</del><ins>+ m_menu = [[NSMenu alloc] initWithTitle:@""];
+ [m_menu setAutoenablesItems:NO];
</ins><span class="cx">
</span><del>- [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
</del><ins>+ populateNSMenu(m_menu.get(), nsMenuItemVector(items));
</ins><span class="cx">
</span><del>-#if ENABLE(SERVICE_CONTROLS)
- if (m_context.isServicesMenu())
- [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
-#endif
-
- Ref<WebPageProxy> protect(m_page);
-
</del><ins>+ [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
</ins><span class="cx"> [m_menu popUpMenuPositioningItem:nil atLocation:m_context.menuLocation() inView:m_webView];
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>