Title: [155044] trunk/Source/WebKit2
- Revision
- 155044
- Author
- [email protected]
- Date
- 2013-09-04 08:43:34 -0700 (Wed, 04 Sep 2013)
Log Message
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):
Modified Paths
Diff
Modified: trunk/Source/WebKit2/ChangeLog (155043 => 155044)
--- trunk/Source/WebKit2/ChangeLog 2013-09-04 15:43:30 UTC (rev 155043)
+++ trunk/Source/WebKit2/ChangeLog 2013-09-04 15:43:34 UTC (rev 155044)
@@ -1,3 +1,17 @@
+2013-09-04 Commit Queue <[email protected]>
+
+ 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 <[email protected]>
[GTK] Add support for the Wayland build target
Modified: trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp (155043 => 155044)
--- trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-09-04 15:43:30 UTC (rev 155043)
+++ trunk/Source/WebKit2/UIProcess/API/gtk/WebKitWebView.cpp 2013-09-04 15:43:34 UTC (rev 155044)
@@ -1560,7 +1560,9 @@
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)
Modified: trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp (155043 => 155044)
--- trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2013-09-04 15:43:30 UTC (rev 155043)
+++ trunk/Source/WebKit2/UIProcess/gtk/WebPopupMenuProxyGtk.cpp 2013-09-04 15:43:34 UTC (rev 155044)
@@ -97,7 +97,9 @@
// 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();
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
