<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[169374] releases/WebKitGTK/webkit-2.4</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/169374">169374</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-05-27 02:06:11 -0700 (Tue, 27 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Rollout <a href="http://trac.webkit.org/projects/webkit/changeset/166161">r166161</a> - Unreviewed. Race condition when closing pages with network process enabled</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2ChangeLog">releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebProcesscpp">releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebProcess.cpp</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsChangeLog">releases/WebKitGTK/webkit-2.4/Tools/ChangeLog</a></li>
<li><a href="#releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestMultiprocesscpp">releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="releasesWebKitGTKwebkit24SourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/ChangeLog (169373 => 169374)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -188,26 +188,6 @@
</span><span class="cx"> (webkit_web_view_load_uri): Create an URL out of a SoupURI and
</span><span class="cx"> use that to create a ResourceRequest to pass to loadRequest().
</span><span class="cx">
</span><del>-2014-03-24 Carlos Garcia Campos <cgarcia@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.
-
</del><span class="cx"> 2014-03-24 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK][WK2] Guard NetscapePluginModule methods used in PluginInfoCache that are specific to X11 architecture
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24SourceWebKit2WebProcessWebProcesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Source/WebKit2/WebProcess/WebProcess.cpp (169373 => 169374)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx">
</span><span class="cx"> // FIXME: the ShouldTerminate message should also send termination parameters, such as any session cookies that need to be preserved.
</span><span class="cx"> bool shouldTerminate = false;
</span><del>- if (parentProcessConnection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0, std::chrono::seconds(1))
</del><ins>+ if (parentProcessConnection()->sendSync(Messages::WebProcessProxy::ShouldTerminate(), Messages::WebProcessProxy::ShouldTerminate::Reply(shouldTerminate), 0)
</ins><span class="cx"> && !shouldTerminate)
</span><span class="cx"> return false;
</span><span class="cx">
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsChangeLog"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/ChangeLog (169373 => 169374)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -62,16 +62,6 @@
</span><span class="cx"> * TestWebKitAPI/Tests/WebKit2Gtk/TestWebKitWebContext.cpp:
</span><span class="cx"> (testWebContextURIScheme): Update the test.
</span><span class="cx">
</span><del>-2014-03-24 Carlos Garcia Campos <cgarcia@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:
-
</del><span class="cx"> 2014-03-06 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> [GTK] Close the page when the view is disposed instead of when finalized
</span></span></pre></div>
<a id="releasesWebKitGTKwebkit24ToolsTestWebKitAPITestsWebKit2GtkTestMultiprocesscpp"></a>
<div class="modfile"><h4>Modified: releases/WebKitGTK/webkit-2.4/Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestMultiprocess.cpp (169373 => 169374)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -88,6 +88,9 @@
</span><span class="cx">
</span><span class="cx"> void destroyWebViewAndWaitUntilWebProcessFinishes(unsigned index)
</span><span class="cx"> {
</span><ins>+ // 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
</ins><span class="cx"> g_assert_cmpuint(index, <, numViews);
</span><span class="cx">
</span><span class="cx"> unsigned watcherID = g_bus_watch_name_on_connection(bus->connection(), m_webViewBusNames[index].get(), G_BUS_NAME_WATCHER_FLAGS_NONE,
</span><span class="lines">@@ -95,6 +98,7 @@
</span><span class="cx"> gtk_widget_destroy(GTK_WIDGET(m_webViews[index].get()));
</span><span class="cx"> g_main_loop_run(m_mainLoop);
</span><span class="cx"> g_bus_unwatch_name(watcherID);
</span><ins>+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> GMainLoop* m_mainLoop;
</span></span></pre>
</div>
</div>
</body>
</html>