diff options
| author | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@nokia.com> | 2012-03-12 14:11:15 +0100 |
| commit | dd91e772430dc294e3bf478c119ef8d43c0a3358 (patch) | |
| tree | 6f33ce4d5872a5691e0291eb45bf6ab373a5f567 /Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp | |
| parent | ad0d549d4cc13433f77c1ac8f0ab379c83d93f28 (diff) | |
| download | qtwebkit-dd91e772430dc294e3bf478c119ef8d43c0a3358.tar.gz | |
Imported WebKit commit 3db4eb1820ac8fb03065d7ea73a4d9db1e8fea1a (http://svn.webkit.org/repository/webkit/trunk@110422)
This includes build fixes for the latest qtbase/qtdeclarative as well as the final QML2 API.
Diffstat (limited to 'Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp')
| -rw-r--r-- | Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp index 521cf5320..db94d6f33 100644 --- a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp +++ b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp @@ -41,7 +41,6 @@ WebPopupMenuProxyGtk::WebPopupMenuProxyGtk(GtkWidget* webView, WebPopupMenuProxy : WebPopupMenuProxy(client) , m_webView(webView) , m_activeItem(-1) - , m_runLoop(0) { } @@ -96,14 +95,13 @@ void WebPopupMenuProxyGtk::showPopupMenu(const IntRect& rect, TextDirection text // WebPageProxy expects the menu to run in a nested run loop, since it invalidates the // menu right after calling WebPopupMenuProxy::showPopupMenu(). - m_runLoop = g_main_loop_new(0, FALSE); + m_runLoop = adoptGRef(g_main_loop_new(0, FALSE)); GDK_THREADS_LEAVE(); - g_main_loop_run(m_runLoop); + g_main_loop_run(m_runLoop.get()); GDK_THREADS_ENTER(); - g_main_loop_unref(m_runLoop); - m_runLoop = 0; + m_runLoop.clear(); g_signal_handler_disconnect(m_popup->platformMenu(), unmapHandler); @@ -120,8 +118,8 @@ void WebPopupMenuProxyGtk::hidePopupMenu() void WebPopupMenuProxyGtk::shutdownRunLoop() { - if (g_main_loop_is_running(m_runLoop)) - g_main_loop_quit(m_runLoop); + if (g_main_loop_is_running(m_runLoop.get())) + g_main_loop_quit(m_runLoop.get()); } void WebPopupMenuProxyGtk::menuItemActivated(GtkAction* action, WebPopupMenuProxyGtk* popupMenu) |