[GTK] gdk threads deprecated functions calls should be refactored

https://bugs.webkit.org/show_bug.cgi?id=120070

Patch by Anton Obzhirov <a.obzhirov@samsung.com> on 2013-09-03
Reviewed by Mario Sanchez Prada.

Removed deprecated functions gdk_threads_leave()/gdk_threads_enter() functions since
there is no more checks for threads lock in GTK 3.6.

* UIProcess/API/gtk/WebKitWebView.cpp:
(webkitWebViewRunAsModal):
* UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
(WebKit::WebPopupMenuProxyGtk::showPopupMenu):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154989 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 3970d08aeb656c8250ef0435fcf2a2991bd2dc33..35a787425d9b0df9982104ab2386d26f4fb08912 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,18 @@
+2013-09-03  Anton Obzhirov  <a.obzhirov@samsung.com>
+
+        [GTK] gdk threads deprecated functions calls should be refactored
+        https://bugs.webkit.org/show_bug.cgi?id=120070
+
+        Reviewed by Mario Sanchez Prada.
+
+        Removed deprecated functions gdk_threads_leave()/gdk_threads_enter() functions since
+        there is no more checks for threads lock in GTK 3.6.
+
+        * UIProcess/API/gtk/WebKitWebView.cpp:
+        (webkitWebViewRunAsModal):
+        * UIProcess/gtk/WebPopupMenuProxyGtk.cpp:
+        (WebKit::WebPopupMenuProxyGtk::showPopupMenu):
+
 2013-09-03  Brian Holt  <brian.holt@samsung.com>
 
         [GTK] [WK2] TestContextMenu default-menu fails

diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
index 72fe66a42ead22faf2d9a485a99122532622fed2..31871624ae92f9720200f72e66b7a2406b490c78 100644 (file)
--- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
+++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp
@@ -1560,9 +1560,7 @@ void webkitWebViewRunAsModal(WebKitWebView* webView)
     g_signal_emit(webView, signals[RUN_AS_MODAL], 0, NULL);
 
     webView->priv->modalLoop = adoptGRef(g_main_loop_new(0, FALSE));
-    gdk_threads_leave();
     g_main_loop_run(webView->priv->modalLoop.get());
-    gdk_threads_enter();
 }
 
 void webkitWebViewClosePage(WebKitWebView* webView)

diff --git a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
index a41839a3eb9764ed4734af2e9768477e90ef3427..1114a1840572e4b1f210f9858855a3b42f15d2fb 100644 (file)
--- a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
+++ b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp
@@ -97,9 +97,7 @@ void WebPopupMenuProxyGtk::showPopupMenu(const IntRect& rect, TextDirection text
     // menu right after calling WebPopupMenuProxy::showPopupMenu().
     m_runLoop = adoptGRef(g_main_loop_new(0, FALSE));
 
-    gdk_threads_leave();
     g_main_loop_run(m_runLoop.get());
-    gdk_threads_enter();
 
     m_runLoop.clear();