- Revision
- 191447
- Author
- carlo...@webkit.org
- Date
- 2015-10-22 01:08:23 -0700 (Thu, 22 Oct 2015)
Log Message
[GTK] Try to fix the build after r191402.
https://bugs.webkit.org/show_bug.cgi?id=150435
Patch by Hunseop Jeong <hs85.je...@samsung.com> on 2015-10-22
Reviewed by Carlos Garcia Campos.
* UIProcess/API/gtk/PageClientImpl.cpp:
(WebKit::PageClientImpl::createPopupMenuProxy):
(WebKit::PageClientImpl::createContextMenuProxy):
(WebKit::PageClientImpl::createColorPicker):
* UIProcess/API/gtk/PageClientImpl.h:
* UIProcess/gtk/WebContextMenuProxyGtk.cpp:
(WebKit::WebContextMenuProxyGtk::populate):
(WebKit::WebContextMenuProxyGtk::show):
(WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
(WebKit::WebContextMenuProxyGtk::menuPositionFunction):
(WebKit::WebContextMenuProxyGtk::showContextMenu): Deleted.
(WebKit::WebContextMenuProxyGtk::hideContextMenu): Deleted.
(WebKit::WebContextMenuProxyGtk::cancelTracking): Deleted.
* UIProcess/gtk/WebContextMenuProxyGtk.h:
(WebKit::WebContextMenuProxyGtk::gtkMenu):
(WebKit::WebContextMenuProxyGtk::create): Deleted.
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (191446 => 191447)
--- trunk/Source/WebKit2/ChangeLog 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/ChangeLog 2015-10-22 08:08:23 UTC (rev 191447)
@@ -1,3 +1,28 @@
+2015-10-22 Hunseop Jeong <hs85.je...@samsung.com>
+
+ [GTK] Try to fix the build after r191402.
+ https://bugs.webkit.org/show_bug.cgi?id=150435
+
+ Reviewed by Carlos Garcia Campos.
+
+ * UIProcess/API/gtk/PageClientImpl.cpp:
+ (WebKit::PageClientImpl::createPopupMenuProxy):
+ (WebKit::PageClientImpl::createContextMenuProxy):
+ (WebKit::PageClientImpl::createColorPicker):
+ * UIProcess/API/gtk/PageClientImpl.h:
+ * UIProcess/gtk/WebContextMenuProxyGtk.cpp:
+ (WebKit::WebContextMenuProxyGtk::populate):
+ (WebKit::WebContextMenuProxyGtk::show):
+ (WebKit::WebContextMenuProxyGtk::WebContextMenuProxyGtk):
+ (WebKit::WebContextMenuProxyGtk::~WebContextMenuProxyGtk):
+ (WebKit::WebContextMenuProxyGtk::menuPositionFunction):
+ (WebKit::WebContextMenuProxyGtk::showContextMenu): Deleted.
+ (WebKit::WebContextMenuProxyGtk::hideContextMenu): Deleted.
+ (WebKit::WebContextMenuProxyGtk::cancelTracking): Deleted.
+ * UIProcess/gtk/WebContextMenuProxyGtk.h:
+ (WebKit::WebContextMenuProxyGtk::gtkMenu):
+ (WebKit::WebContextMenuProxyGtk::create): Deleted.
+
2015-10-21 Gyuyoung Kim <gyuyoung....@webkit.org>
Unreviewed EFL build fix. Remove customizeMenu implementation.
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp (191446 => 191447)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.cpp 2015-10-22 08:08:23 UTC (rev 191447)
@@ -211,9 +211,9 @@
return WebPopupMenuProxyGtk::create(m_viewWidget, page);
}
-RefPtr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
+std::unique_ptr<WebContextMenuProxy> PageClientImpl::createContextMenuProxy(WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
{
- return WebContextMenuProxyGtk::create(m_viewWidget, page, context, userData);
+ return std::make_unique<WebContextMenuProxyGtk>(m_viewWidget, page, context, userData);
}
RefPtr<WebColorPicker> PageClientImpl::createColorPicker(WebPageProxy* page, const WebCore::Color& color, const WebCore::IntRect& rect)
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h (191446 => 191447)
--- trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/PageClientImpl.h 2015-10-22 08:08:23 UTC (rev 191447)
@@ -83,7 +83,7 @@
virtual WebCore::IntRect rootViewToScreen(const WebCore::IntRect&) override;
virtual void doneWithKeyEvent(const NativeWebKeyboardEvent&, bool wasEventHandled) override;
virtual RefPtr<WebPopupMenuProxy> createPopupMenuProxy(WebPageProxy&) override;
- virtual RefPtr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
+ virtual std::unique_ptr<WebContextMenuProxy> createContextMenuProxy(WebPageProxy&, const ContextMenuContextData&, const UserData&) override;
#if ENABLE(INPUT_TYPE_COLOR)
virtual RefPtr<WebColorPicker> createColorPicker(WebPageProxy*, const WebCore::Color& intialColor, const WebCore::IntRect&) override;
#endif
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp (191446 => 191447)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.cpp 2015-10-22 08:08:23 UTC (rev 191447)
@@ -141,7 +141,7 @@
}
}
-void WebContextMenuProxyGtk::showContextMenu()
+void WebContextMenuProxyGtk::show()
{
Vector<RefPtr<WebContextMenuItem>> proposedAPIItems;
for (auto& item : m_context.menuItems()) {
@@ -173,11 +173,6 @@
event ? event->button.button : 3, event ? event->button.time : GDK_CURRENT_TIME);
}
-void WebContextMenuProxyGtk::hideContextMenu()
-{
- gtk_menu_popdown(m_menu.platformDescription());
-}
-
WebContextMenuProxyGtk::WebContextMenuProxyGtk(GtkWidget* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
: WebContextMenuProxy(context, userData)
, m_webView(webView)
@@ -188,7 +183,14 @@
WebContextMenuProxyGtk::~WebContextMenuProxyGtk()
{
- cancelTracking();
+ gtk_menu_popdown(m_menu.platformDescription());
+
+ for (auto& handler : m_signalHandlers)
+ g_signal_handler_disconnect(handler.value, handler.key);
+ m_signalHandlers.clear();
+
+ webkitWebViewBaseSetActiveContextMenuProxy(WEBKIT_WEB_VIEW_BASE(m_webView), nullptr);
+ m_menu.setPlatformDescription(nullptr);
}
void WebContextMenuProxyGtk::menuPositionFunction(GtkMenu* menu, gint* x, gint* y, gboolean* pushIn, WebContextMenuProxyGtk* popupMenu)
@@ -208,15 +210,5 @@
*pushIn = FALSE;
}
-void WebContextMenuProxyGtk::cancelTracking()
-{
- for (auto iter = m_signalHandlers.begin(); iter != m_signalHandlers.end(); ++iter)
- g_signal_handler_disconnect(iter->value, iter->key);
- m_signalHandlers.clear();
-
- webkitWebViewBaseSetActiveContextMenuProxy(WEBKIT_WEB_VIEW_BASE(m_webView), nullptr);
- m_menu.setPlatformDescription(nullptr);
-}
-
} // namespace WebKit
#endif // ENABLE(CONTEXT_MENUS)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h (191446 => 191447)
--- trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-10-22 07:51:08 UTC (rev 191446)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebContextMenuProxyGtk.h 2015-10-22 08:08:23 UTC (rev 191447)
@@ -41,22 +41,14 @@
class WebContextMenuProxyGtk : public WebContextMenuProxy {
public:
- static Ref<WebContextMenuProxyGtk> create(GtkWidget* webView, WebPageProxy& page, const ContextMenuContextData& context, const UserData& userData)
- {
- return adoptRef(*new WebContextMenuProxyGtk(webView, page, context, userData));
- }
+ WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
~WebContextMenuProxyGtk();
- virtual void showContextMenu() override;
- virtual void hideContextMenu() override;
- virtual void cancelTracking() override;
-
void populate(Vector<WebCore::ContextMenuItem>&);
GtkMenu* gtkMenu() const { return m_menu.platformDescription(); }
private:
- WebContextMenuProxyGtk(GtkWidget*, WebPageProxy&, const ContextMenuContextData&, const UserData&);
-
+ virtual void show() override;
void append(WebCore::ContextMenuItem&);
void populate(const Vector<RefPtr<WebContextMenuItem>>&);
static void menuPositionFunction(GtkMenu*, gint*, gint*, gboolean*, WebContextMenuProxyGtk*);
