Title: [169374] releases/WebKitGTK/webkit-2.4
- Revision
- 169374
- Author
- carlo...@webkit.org
- Date
- 2014-05-27 02:06:11 -0700 (Tue, 27 May 2014)
Log Message
Rollout r166161 - Unreviewed. Race condition when closing pages with network process enabled
Modified Paths
Diff
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (169373 => 169374)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-27 08:08:24 UTC (rev 169373)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog 2014-05-27 09:06:11 UTC (rev 169374)
@@ -188,26 +188,6 @@
(webkit_web_view_load_uri): Create an URL out of a SoupURI and
use that to create a ResourceRequest to pass to loadRequest().
-2014-03-24 Carlos Garcia Campos <cgar...@igalia.com>
-
- Unreviewed. Race condition when closing pages with network process enabled
- https://bugs.webkit.org/show_bug.cgi?id=129684
-
- When the last page of a web process is closed with the network
- process enabled, the UI process checks if the web process can be
- terminated and closes the connection with that web process. But
- right before that the Close message has been sent which also
- enables the process termination in the web process. Sometimes
- there's a race condition in the web process between the process
- termination triggered by the Close message and the one triggered
- by the socket being closed by the UI process.
-
- * WebProcess/WebProcess.cpp:
- (WebKit::WebProcess::shouldTerminate): Use a 1 second timeout so
- that if the message is sent right the before the connection is
- closed, we don't wait indefinitely for the sync reply keeping the
- web process alive.
-
2014-03-24 Zan Dobersek <zdober...@igalia.com>
[GTK][WK2] Guard NetscapePluginModule methods used in PluginInfoCache that are specific to X11 architecture
Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebProcess.cpp (169373 => 169374)
--- releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-27 08:08:24 UTC (rev 169373)
+++ releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebProcess.cpp 2014-05-27 09:06:11 UTC (rev 169374)
@@ -590,7 +590,7 @@
// FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
bool shouldTerminate = false;
- if (parentProcessConnection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0, std::chrono::seconds(1))
+ if (parentProcessConnection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0)
&& !shouldTerminate)
return false;
Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (169373 => 169374)
--- releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-27 08:08:24 UTC (rev 169373)
+++ releases/WebKitGTK/webkit-2.4/Tools/ChangeLog 2014-05-27 09:06:11 UTC (rev 169374)
@@ -62,16 +62,6 @@
* TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
(testWebContextURIScheme): Update the test.
-2014-03-24 Carlos Garcia Campos <cgar...@igalia.com>
-
- Unreviewed. Race condition when closing pages with network process enabled
- https://bugs.webkit.org/show_bug.cgi?id=129684
-
- Enable the test to check that web processes finish when the web
- view is destroyed.
-
- * TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp:
-
2014-03-06 Carlos Garcia Campos <cgar...@igalia.com>
[GTK] Close the page when the view is disposed instead of when finalized
Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp (169373 => 169374)
--- releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp 2014-05-27 08:08:24 UTC (rev 169373)
+++ releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp 2014-05-27 09:06:11 UTC (rev 169374)
@@ -88,6 +88,9 @@
void destroyWebViewAndWaitUntilWebProcessFinishes(unsigned index)
{
+ // FIXME: This test is disabled because the web processed don't actually die
+ // due to bug https://bugs.webkit.org/show_bug.cgi?id=129684.
+#if 0
g_assert_cmpuint(index, <, numViews);
unsigned watcherID = g_bus_watch_name_on_connection(bus->connection(), m_webViewBusNames[index].get(), G_BUS_NAME_WATCHER_FLAGS_NONE,
@@ -95,6 +98,7 @@
gtk_widget_destroy(GTK_WIDGET(m_webViews[index].get()));
g_main_loop_run(m_mainLoop);
g_bus_unwatch_name(watcherID);
+#endif
}
GMainLoop* m_mainLoop;
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
