<!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>[191141] 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/191141">191141</a></dd>
<dt>Author</dt> <dd>andersca@apple.com</dd>
<dt>Date</dt> <dd>2015-10-15 15:15:45 -0700 (Thu, 15 Oct 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Store the context menu data and user data in the WebContextMenuProxy object
https://bugs.webkit.org/show_bug.cgi?id=150191
Reviewed by Tim Horton.
* UIProcess/PageClient.h:
* UIProcess/WebContextMenuProxy.cpp:
(WebKit::WebContextMenuProxy::WebContextMenuProxy):
* UIProcess/WebContextMenuProxy.h:
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::internalShowContextMenu):
* UIProcess/ios/PageClientImplIOS.h:
* UIProcess/ios/PageClientImplIOS.mm:
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/PageClientImpl.h:
* UIProcess/mac/PageClientImpl.mm:
(WebKit::PageClientImpl::createContextMenuProxy):
* UIProcess/mac/WebContextMenuProxyMac.h:
(WebKit::WebContextMenuProxyMac::create):
* UIProcess/mac/WebContextMenuProxyMac.mm:
(WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessPageClienth">trunk/Source/WebKit2/UIProcess/PageClient.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebContextMenuProxycpp">trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp</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="#trunkSourceWebKit2UIProcessiosPageClientImplIOSh">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessiosPageClientImplIOSmm">trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplh">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessmacPageClientImplmm">trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm</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 (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2015-10-15 Anders Carlsson <andersca@apple.com>
+
+ Store the context menu data and user data in the WebContextMenuProxy object
+ https://bugs.webkit.org/show_bug.cgi?id=150191
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebContextMenuProxy.cpp:
+ (WebKit::WebContextMenuProxy::WebContextMenuProxy):
+ * UIProcess/WebContextMenuProxy.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ (WebKit::WebContextMenuProxyMac::create):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
+
</ins><span class="cx"> 2015-10-15 Dan Bernstein <mitz@apple.com>
</span><span class="cx">
</span><span class="cx"> [Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessPageClienth"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -220,7 +220,7 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) = 0;
</span><del>- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) = 0;
</del><ins>+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextMenuProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -28,7 +28,9 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebContextMenuProxy::WebContextMenuProxy()
</del><ins>+WebContextMenuProxy::WebContextMenuProxy(const ContextMenuContextData& context, const UserData& userData)
+ : m_context(context)
+ , m_userData(userData)
</ins><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebContextMenuProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -26,14 +26,10 @@
</span><span class="cx"> #ifndef WebContextMenuProxy_h
</span><span class="cx"> #define WebContextMenuProxy_h
</span><span class="cx">
</span><del>-#include <wtf/PassRefPtr.h>
</del><ins>+#include "ContextMenuContextData.h"
+#include "UserData.h"
</ins><span class="cx"> #include <wtf/RefCounted.h>
</span><del>-#include <wtf/Vector.h>
</del><span class="cx">
</span><del>-namespace WebCore {
- class IntPoint;
-}
-
</del><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ContextMenuContextData;
</span><span class="lines">@@ -48,7 +44,10 @@
</span><span class="cx"> virtual void cancelTracking() { }
</span><span class="cx">
</span><span class="cx"> protected:
</span><del>- WebContextMenuProxy();
</del><ins>+ WebContextMenuProxy(const ContextMenuContextData&, const UserData&);
+
+ const ContextMenuContextData m_context;
+ const UserData m_userData;
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebKit
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -4202,7 +4202,7 @@
</span><span class="cx"> m_activeContextMenu = nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- m_activeContextMenu = m_pageClient.createContextMenuProxy(*this);
</del><ins>+ m_activeContextMenu = m_pageClient.createContextMenuProxy(*this, contextMenuContextData, userData);
</ins><span class="cx"> if (!m_activeContextMenu)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -96,7 +96,7 @@
</span><span class="cx"> virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
</span><span class="cx"> #endif
</span><span class="cx"> virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
</span><del>- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
</del><ins>+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
</ins><span class="cx"> virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) override;
</span><span class="cx"> virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
</span><span class="cx"> virtual void setTextIndicatorAnimationProgress(float) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessiosPageClientImplIOSmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy*)
</del><ins>+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy&, const UserData&)
</ins><span class="cx"> {
</span><span class="cx"> return nullptr;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -121,7 +121,7 @@
</span><span class="cx"> virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
</span><span class="cx">
</span><span class="cx"> virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
</span><del>- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) override;
</del><ins>+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span><span class="cx"> virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacPageClientImplmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -492,9 +492,9 @@
</span><span class="cx"> return WebPopupMenuProxyMac::create(m_wkView, page);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page)
</del><ins>+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
</ins><span class="cx"> {
</span><del>- return WebContextMenuProxyMac::create(m_wkView, page);
</del><ins>+ return WebContextMenuProxyMac::create(m_wkView, page, context, userData);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(INPUT_TYPE_COLOR)
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMach"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -38,14 +38,15 @@
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><span class="cx"> class ShareableBitmap;
</span><ins>+class UserData;
</ins><span class="cx"> class WebContextMenuItemData;
</span><span class="cx"> class WebPageProxy;
</span><span class="cx">
</span><span class="cx"> class WebContextMenuProxyMac : public WebContextMenuProxy {
</span><span class="cx"> public:
</span><del>- static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page)
</del><ins>+ static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
</ins><span class="cx"> {
</span><del>- return adoptRef(*new WebContextMenuProxyMac(webView, page));
</del><ins>+ return adoptRef(*new WebContextMenuProxyMac(webView, page, context, userData));
</ins><span class="cx"> }
</span><span class="cx"> ~WebContextMenuProxyMac();
</span><span class="cx">
</span><span class="lines">@@ -64,7 +65,7 @@
</span><span class="cx"> NSWindow *window() const;
</span><span class="cx">
</span><span class="cx"> private:
</span><del>- WebContextMenuProxyMac(WKView*, WebPageProxy&);
</del><ins>+ WebContextMenuProxyMac(WKView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
</ins><span class="cx">
</span><span class="cx"> void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessmacWebContextMenuProxyMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191140 => 191141)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 21:59:24 UTC (rev 191140)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 22:15:45 UTC (rev 191141)
</span><span class="lines">@@ -150,8 +150,10 @@
</span><span class="cx">
</span><span class="cx"> namespace WebKit {
</span><span class="cx">
</span><del>-WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page)
- : m_webView(webView)
</del><ins>+WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
+ : WebContextMenuProxy(context, userData)
+
+ , m_webView(webView)
</ins><span class="cx"> , m_page(page)
</span><span class="cx"> {
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>