<!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>[191144] 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/191144">191144</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 15:51:33 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Use the context inside WebContextMenuProxyMac
https://bugs.webkit.org/show_bug.cgi?id=150196
Reviewed by Tim Horton.
* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/mac/WebContextMenuProxyMac.h:
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::populate):
(WebKit::WebContextMenuProxyMac::showContextMenu):</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="#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 (191143 => 191144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 22:51:33 UTC (rev 191144)
</span><span class="lines">@@ -1,5 +1,20 @@
</span><span class="cx"> 2015-10-15 Anders Carlsson <andersca@apple.com>
</span><span class="cx">
</span><ins>+ Use the context inside WebContextMenuProxyMac
+ https://bugs.webkit.org/show_bug.cgi?id=150196
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/WebContextMenuProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::populate):
+ (WebKit::WebContextMenuProxyMac::showContextMenu):
+
+2015-10-15 Anders Carlsson <andersca@apple.com>
+
</ins><span class="cx"> Use the context menu location that's stored in the context data
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=150194
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191143 => 191144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 22:51:33 UTC (rev 191144)
</span><span class="lines">@@ -39,7 +39,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>>&, const ContextMenuContextData&) = 0;
</del><ins>+ virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) = 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 (191143 => 191144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 22:51:33 UTC (rev 191144)
</span><span class="lines">@@ -4236,7 +4236,7 @@
</span><span class="cx">
</span><span class="cx"> const Vector<RefPtr<WebContextMenuItem>>& itemsToShow = useProposedItems ? proposedAPIItems : clientItems;
</span><span class="cx"> if (!m_contextMenuClient->showContextMenu(*this, contextMenuContextData.menuLocation(), itemsToShow))
</span><del>- m_activeContextMenu->showContextMenu(itemsToShow, contextMenuContextData);
</del><ins>+ m_activeContextMenu->showContextMenu(itemsToShow);
</ins><span class="cx">
</span><span class="cx"> m_contextMenuClient->contextMenuDismissed(*this);
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191143 => 191144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 22:51:33 UTC (rev 191144)
</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>>&, const ContextMenuContextData&) override;
</del><ins>+ virtual void showContextMenu(const Vector<RefPtr<WebContextMenuItem>>&) 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">@@ -67,7 +67,7 @@
</span><span class="cx"> private:
</span><span class="cx"> WebContextMenuProxyMac(WKView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
</span><span class="cx">
</span><del>- void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
</del><ins>+ void populate(const Vector<RefPtr<WebContextMenuItem>>&);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><span class="cx"> void setupServicesMenu(const ContextMenuContextData&);
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191143 => 191144)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 22:34:20 UTC (rev 191143)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 22:51:33 UTC (rev 191144)
</span><span class="lines">@@ -324,11 +324,11 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items, const ContextMenuContextData& context)
</del><ins>+void WebContextMenuProxyMac::populate(const Vector<RefPtr<WebContextMenuItem>>& items)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- if (context.needsServicesMenu()) {
- setupServicesMenu(context);
</del><ins>+ if (m_context.needsServicesMenu()) {
+ setupServicesMenu(m_context);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="lines">@@ -346,17 +346,17 @@
</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, const ContextMenuContextData& context)
</del><ins>+void WebContextMenuProxyMac::showContextMenu(const Vector<RefPtr<WebContextMenuItem>>& items)
</ins><span class="cx"> {
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- if (items.isEmpty() && !context.needsServicesMenu())
</del><ins>+ if (items.isEmpty() && !m_context.needsServicesMenu())
</ins><span class="cx"> return;
</span><span class="cx"> #else
</span><span class="cx"> if (items.isEmpty())
</span><span class="cx"> return;
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- populate(items, context);
</del><ins>+ populate(items);
</ins><span class="cx">
</span><span class="cx"> [[WKMenuTarget sharedMenuTarget] setMenuProxy:this];
</span><span class="cx">
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> NSRect menuRect = NSMakeRect(menuLocation.x, menuLocation.y, 0, 0);
</span><span class="cx">
</span><span class="cx"> #if ENABLE(SERVICE_CONTROLS)
</span><del>- if (context.needsServicesMenu())
</del><ins>+ if (m_context.needsServicesMenu())
</ins><span class="cx"> [[WKSharingServicePickerDelegate sharedSharingServicePickerDelegate] setMenuProxy:this];
</span><span class="cx">
</span><span class="cx"> if (!m_servicesMenu)
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> // FIXME: That API is better than WKPopupContextMenu. In the future all menus should use either it
</span><span class="cx"> // or the [NSMenu popUpContextMenu:withEvent:forView:] API, depending on the menu type.
</span><span class="cx"> // Then we could get rid of NSPopUpButtonCell, custom metrics, and WKPopupContextMenu.
</span><del>- if (context.needsServicesMenu()) {
</del><ins>+ if (m_context.needsServicesMenu()) {
</ins><span class="cx"> [menu popUpMenuPositioningItem:nil atLocation:menuLocation inView:m_webView];
</span><span class="cx"> hideContextMenu();
</span><span class="cx"> return;
</span></span></pre>
</div>
</div>
</body>
</html>