From ad5215c18a103f5955ebf3df272fc40718a64814 Mon Sep 17 00:00:00 2001 From: "commit-queue@webkit.org" Date: Wed, 4 Sep 2013 15:43:34 +0000 Subject: [PATCH] Unreviewed, rolling out r154989. http://trac.webkit.org/changeset/154989 https://bugs.webkit.org/show_bug.cgi?id=120678 This patch might broke apps using webkitgtk not from the main thread (Requested by msanchez on #webkit). * UIProcess/API/gtk/WebKitWebView.cpp: (webkitWebViewRunAsModal): * UIProcess/gtk/WebPopupMenuProxyGtk.cpp: (WebKit::WebPopupMenuProxyGtk::showPopupMenu): git-svn-id: https://svn.webkit.org/repository/webkit/trunk@155044 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WebKit2/ChangeLog | 14 ++++++++++++++ Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp | 2 ++ .../WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp | 2 ++ 3 files changed, 18 insertions(+) diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog index fd70c691c6ab..aeaf52eb55c7 100644 --- a/Source/WebKit2/ChangeLog +++ b/Source/WebKit2/ChangeLog @@ -1,3 +1,17 @@ +2013-09-04 Commit Queue + + Unreviewed, rolling out r154989. + http://trac.webkit.org/changeset/154989 + https://bugs.webkit.org/show_bug.cgi?id=120678 + + This patch might broke apps using webkitgtk not from the main + thread (Requested by msanchez on #webkit). + + * UIProcess/API/gtk/WebKitWebView.cpp: + (webkitWebViewRunAsModal): + * UIProcess/gtk/WebPopupMenuProxyGtk.cpp: + (WebKit::WebPopupMenuProxyGtk::showPopupMenu): + 2013-09-04 Zan Dobersek [GTK] Add support for the Wayland build target diff --git a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp index 31871624ae92..72fe66a42ead 100644 --- a/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp +++ b/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp @@ -1560,7 +1560,9 @@ 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 1114a1840572..a41839a3eb97 100644 --- a/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp +++ b/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp @@ -97,7 +97,9 @@ 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(); -- 2.36.0