Diff
Modified: trunk/Source/WebKit2/ChangeLog (191140 => 191141)
--- 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)
@@ -1,3 +1,27 @@
+2015-10-15 Anders Carlsson <ander...@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):
+
2015-10-15 Dan Bernstein <m...@apple.com>
[Cocoa] Stop using WKSetNSURLConnectionDefersCallbacks
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191140 => 191141)
--- 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)
@@ -220,7 +220,7 @@
#endif
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) = 0;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) = 0;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) = 0;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.cpp (191140 => 191141)
--- 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)
@@ -28,7 +28,9 @@
namespace WebKit {
-WebContextMenuProxy::WebContextMenuProxy()
+WebContextMenuProxy::WebContextMenuProxy(const ContextMenuContextData& context, const UserData& userData)
+ : m_context(context)
+ , m_userData(userData)
{
}
Modified: trunk/Source/WebKit2/UIProcess/WebContextMenuProxy.h (191140 => 191141)
--- 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)
@@ -26,14 +26,10 @@
#ifndef WebContextMenuProxy_h
#define WebContextMenuProxy_h
-#include <wtf/PassRefPtr.h>
+#include "ContextMenuContextData.h"
+#include "UserData.h"
#include <wtf/RefCounted.h>
-#include <wtf/Vector.h>
-namespace WebCore {
- class IntPoint;
-}
-
namespace WebKit {
class ContextMenuContextData;
@@ -48,7 +44,10 @@
virtual void cancelTracking() { }
protected:
- WebContextMenuProxy();
+ WebContextMenuProxy(const ContextMenuContextData&, const UserData&);
+
+ const ContextMenuContextData m_context;
+ const UserData m_userData;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191140 => 191141)
--- 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)
@@ -4202,7 +4202,7 @@
m_activeContextMenu = nullptr;
}
- m_activeContextMenu = m_pageClient.createContextMenuProxy(*this);
+ m_activeContextMenu = m_pageClient.createContextMenuProxy(*this, contextMenuContextData, userData);
if (!m_activeContextMenu)
return;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191140 => 191141)
--- 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)
@@ -96,7 +96,7 @@
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
#endif
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) override;
virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
virtual void setTextIndicatorAnimationProgress(float) override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191140 => 191141)
--- 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)
@@ -435,7 +435,7 @@
return nullptr;
}
-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy*)
+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy&, const UserData&)
{
return nullptr;
}
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (191140 => 191141)
--- 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)
@@ -121,7 +121,7 @@
virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) override;
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm (191140 => 191141)
--- 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)
@@ -492,9 +492,9 @@
return WebPopupMenuProxyMac::create(m_wkView, page);
}
-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page)
+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return WebContextMenuProxyMac::create(m_wkView, page);
+ return WebContextMenuProxyMac::create(m_wkView, page, context, userData);
}
#if ENABLE(INPUT_TYPE_COLOR)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191140 => 191141)
--- 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)
@@ -38,14 +38,15 @@
namespace WebKit {
class ShareableBitmap;
+class UserData;
class WebContextMenuItemData;
class WebPageProxy;
class WebContextMenuProxyMac : public WebContextMenuProxy {
public:
- static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page)
+ static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return adoptRef(*new WebContextMenuProxyMac(webView, page));
+ return adoptRef(*new WebContextMenuProxyMac(webView, page, context, userData));
}
~WebContextMenuProxyMac();
@@ -64,7 +65,7 @@
NSWindow *window() const;
private:
- WebContextMenuProxyMac(WKView*, WebPageProxy&);
+ WebContextMenuProxyMac(WKView*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191140 => 191141)
--- 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)
@@ -150,8 +150,10 @@
namespace WebKit {
-WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page)
- : m_webView(webView)
+WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
+ : WebContextMenuProxy(context, userData)
+
+ , m_webView(webView)
, m_page(page)
{
}
