Diff
Modified: trunk/Source/WebKit2/ChangeLog (191136 => 191137)
--- trunk/Source/WebKit2/ChangeLog 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-15 21:27:15 UTC (rev 191137)
@@ -1,5 +1,38 @@
2015-10-15 Anders Carlsson <ander...@apple.com>
+ CTTE menu proxies
+ https://bugs.webkit.org/show_bug.cgi?id=150187
+
+ Reviewed by Tim Horton.
+
+ * UIProcess/PageClient.h:
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::showPopupMenu):
+ (WebKit::WebPageProxy::internalShowContextMenu):
+ * UIProcess/WebPopupMenuProxy.h:
+ (WebKit::WebPopupMenuProxy::WebPopupMenuProxy):
+ * UIProcess/ios/PageClientImplIOS.h:
+ * UIProcess/ios/PageClientImplIOS.mm:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy): Deleted.
+ * UIProcess/mac/PageClientImpl.h:
+ * UIProcess/mac/PageClientImpl.mm:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ * UIProcess/mac/WebContextMenuProxyMac.h:
+ (WebKit::WebContextMenuProxyMac::create):
+ (WebKit::WebContextMenuProxyMac::page):
+ * UIProcess/mac/WebContextMenuProxyMac.mm:
+ (WebKit::WebContextMenuProxyMac::WebContextMenuProxyMac):
+ (WebKit::WebContextMenuProxyMac::~WebContextMenuProxyMac):
+ (WebKit::WebContextMenuProxyMac::contextMenuItemSelected):
+ * UIProcess/mac/WebPopupMenuProxyMac.h:
+ (WebKit::WebPopupMenuProxyMac::create):
+ * UIProcess/mac/WebPopupMenuProxyMac.mm:
+ (WebKit::WebPopupMenuProxyMac::WebPopupMenuProxyMac):
+
+2015-10-15 Anders Carlsson <ander...@apple.com>
+
Add -[WKFrameInfo _handle]
https://bugs.webkit.org/show_bug.cgi?id=150185
rdar://problem/23132371
Modified: trunk/Source/WebKit2/UIProcess/PageClient.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/PageClient.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -219,8 +219,8 @@
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) = 0;
#endif
- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) = 0;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) = 0;
+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) = 0;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) = 0;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& initialColor, const WebCore::IntRect&) = 0;
Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2015-10-15 21:27:15 UTC (rev 191137)
@@ -4148,7 +4148,7 @@
m_activePopupMenu = nullptr;
}
- m_activePopupMenu = m_pageClient.createPopupMenuProxy(this);
+ m_activePopupMenu = m_pageClient.createPopupMenuProxy(*this);
if (!m_activePopupMenu)
return;
@@ -4202,7 +4202,7 @@
m_activeContextMenu = nullptr;
}
- m_activeContextMenu = m_pageClient.createContextMenuProxy(this);
+ m_activeContextMenu = m_pageClient.createContextMenuProxy(*this);
if (!m_activeContextMenu)
return;
Modified: trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/WebPopupMenuProxy.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -71,8 +71,8 @@
void invalidate() { m_client = 0; }
protected:
- explicit WebPopupMenuProxy(Client* client)
- : m_client(client)
+ explicit WebPopupMenuProxy(Client& client)
+ : m_client(&client)
{
}
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -95,7 +95,7 @@
#if ENABLE(TOUCH_EVENTS)
virtual void doneWithTouchEvent(const NativeWebTouchEvent&, bool wasEventHandled) override;
#endif
- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
virtual void setTextIndicator(Ref<WebCore::TextIndicator>, WebCore::TextIndicatorWindowLifetime) override;
virtual void clearTextIndicator(WebCore::TextIndicatorWindowDismissalAnimation) override;
Modified: trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/ios/PageClientImplIOS.mm 2015-10-15 21:27:15 UTC (rev 191137)
@@ -430,15 +430,13 @@
}
#endif
-RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy*)
+RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy&)
{
- notImplemented();
return nullptr;
}
RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy*)
{
- notImplemented();
return nullptr;
}
Modified: trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -120,8 +120,8 @@
virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
- virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy*) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy*) override;
+ virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
+ virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&) 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 (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/PageClientImpl.mm 2015-10-15 21:27:15 UTC (rev 191137)
@@ -487,12 +487,12 @@
[m_wkView _doneWithKeyEvent:event.nativeEvent() eventWasHandled:eventWasHandled];
}
-RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy* page)
+RefPtr<WebPopupMenuProxy> PageClientImpl::createPopupMenuProxy(WebPageProxy& page)
{
return WebPopupMenuProxyMac::create(m_wkView, page);
}
-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy* page)
+RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page)
{
return WebContextMenuProxyMac::create(m_wkView, page);
}
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -43,7 +43,7 @@
class WebContextMenuProxyMac : public WebContextMenuProxy {
public:
- static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy* page)
+ static Ref<WebContextMenuProxyMac> create(WKView* webView, WebPageProxy& page)
{
return adoptRef(*new WebContextMenuProxyMac(webView, page));
}
@@ -60,11 +60,11 @@
void clearServicesMenu();
#endif
- WebPageProxy& page() const { return *m_page; }
+ WebPageProxy& page() const { return m_page; }
NSWindow *window() const;
private:
- WebContextMenuProxyMac(WKView*, WebPageProxy*);
+ WebContextMenuProxyMac(WKView*, WebPageProxy&);
void populate(const Vector<RefPtr<WebContextMenuItem>>&, const ContextMenuContextData&);
@@ -77,7 +77,7 @@
RetainPtr<NSMenu> m_servicesMenu;
#endif
WKView* m_webView;
- WebPageProxy* m_page;
+ WebPageProxy& m_page;
};
} // namespace WebKit
Modified: trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebContextMenuProxyMac.mm 2015-10-15 21:27:15 UTC (rev 191137)
@@ -150,17 +150,15 @@
namespace WebKit {
-WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy* page)
+WebContextMenuProxyMac::WebContextMenuProxyMac(WKView* webView, WebPageProxy& page)
: m_webView(webView)
, m_page(page)
{
- ASSERT(m_page);
}
WebContextMenuProxyMac::~WebContextMenuProxyMac()
{
- if (m_popup)
- [m_popup setControlView:nil];
+ [m_popup setControlView:nil];
}
void WebContextMenuProxyMac::contextMenuItemSelected(const WebContextMenuItemData& item)
@@ -169,7 +167,7 @@
clearServicesMenu();
#endif
- m_page->contextMenuItemSelected(item);
+ m_page.contextMenuItemSelected(item);
}
static void populateNSMenu(NSMenu* menu, const Vector<RetainPtr<NSMenuItem>>& menuItemVector)
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.h 2015-10-15 21:27:15 UTC (rev 191137)
@@ -40,7 +40,7 @@
class WebPopupMenuProxyMac : public WebPopupMenuProxy {
public:
- static Ref<WebPopupMenuProxyMac> create(WKView *webView, WebPopupMenuProxy::Client* client)
+ static Ref<WebPopupMenuProxyMac> create(WKView *webView, WebPopupMenuProxy::Client& client)
{
return adoptRef(*new WebPopupMenuProxyMac(webView, client));
}
@@ -51,7 +51,7 @@
virtual void cancelTracking() override;
private:
- WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client*);
+ WebPopupMenuProxyMac(WKView *, WebPopupMenuProxy::Client&);
void populate(const Vector<WebPopupItem>&, NSFont *, WebCore::TextDirection);
Modified: trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm (191136 => 191137)
--- trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2015-10-15 21:16:03 UTC (rev 191136)
+++ trunk/Source/WebKit2/UIProcess/mac/WebPopupMenuProxyMac.mm 2015-10-15 21:27:15 UTC (rev 191137)
@@ -40,7 +40,7 @@
namespace WebKit {
-WebPopupMenuProxyMac::WebPopupMenuProxyMac(WKView *webView, WebPopupMenuProxy::Client* client)
+WebPopupMenuProxyMac::WebPopupMenuProxyMac(WKView *webView, WebPopupMenuProxy::Client& client)
: WebPopupMenuProxy(client)
, m_webView(webView)
, m_wasCanceled(false)
