<!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>[165467] trunk/Source</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/165467">165467</a></dd>
<dt>Author</dt> <dd>carlosgc@webkit.org</dd>
<dt>Date</dt> <dd>2014-03-12 07:01:26 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>[GTK] [Stable] deadlock in gobject introspection
https://bugs.webkit.org/show_bug.cgi?id=125651
Reviewed by Sergio Villar Senin.
Source/WebCore:
Make the default SoupNetworkSession a destroyable object to ensure
the wrapped SoupSession is finalized when the process finishes. This
is important because soup cancels any ongoing connection when finalized.
* platform/network/soup/SoupNetworkSession.cpp:
(WebCore::SoupNetworkSession::defaultSession): Do not use NeverDestroyed.
* platform/network/soup/SoupNetworkSession.h:
Source/WebKit/gtk:
* webkit/webkitglobals.cpp:
(webkitExit): Dot not try to unref the default network session, it
will be finalized automatically when the process finishes.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh">trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h</a></li>
<li><a href="#trunkSourceWebKitgtkChangeLog">trunk/Source/WebKit/gtk/ChangeLog</a></li>
<li><a href="#trunkSourceWebKitgtkwebkitwebkitglobalscpp">trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (165466 => 165467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2014-03-12 11:11:06 UTC (rev 165466)
+++ trunk/Source/WebCore/ChangeLog 2014-03-12 14:01:26 UTC (rev 165467)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2014-03-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] [Stable] deadlock in gobject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=125651
+
+ Reviewed by Sergio Villar Senin.
+
+ Make the default SoupNetworkSession a destroyable object to ensure
+ the wrapped SoupSession is finalized when the process finishes. This
+ is important because soup cancels any ongoing connection when finalized.
+
+ * platform/network/soup/SoupNetworkSession.cpp:
+ (WebCore::SoupNetworkSession::defaultSession): Do not use NeverDestroyed.
+ * platform/network/soup/SoupNetworkSession.h:
+
</ins><span class="cx"> 2014-03-12 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> Don't use NodeRenderingTraversal for pseudo elements
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp (165466 => 165467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-03-12 11:11:06 UTC (rev 165466)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.cpp 2014-03-12 14:01:26 UTC (rev 165467)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx">
</span><span class="cx"> SoupNetworkSession& SoupNetworkSession::defaultSession()
</span><span class="cx"> {
</span><del>- static NeverDestroyed<SoupNetworkSession> networkSession(soupCookieJar());
</del><ins>+ static SoupNetworkSession networkSession(soupCookieJar());
</ins><span class="cx"> return networkSession;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSoupNetworkSessionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h (165466 => 165467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2014-03-12 11:11:06 UTC (rev 165466)
+++ trunk/Source/WebCore/platform/network/soup/SoupNetworkSession.h 2014-03-12 14:01:26 UTC (rev 165467)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> #ifndef SoupNetworkSession_h
</span><span class="cx"> #define SoupNetworkSession_h
</span><span class="cx">
</span><del>-#include <wtf/NeverDestroyed.h>
</del><span class="cx"> #include <wtf/Noncopyable.h>
</span><span class="cx"> #include <wtf/Vector.h>
</span><span class="cx"> #include <wtf/gobject/GRefPtr.h>
</span><span class="lines">@@ -40,7 +39,6 @@
</span><span class="cx">
</span><span class="cx"> class SoupNetworkSession {
</span><span class="cx"> WTF_MAKE_NONCOPYABLE(SoupNetworkSession); WTF_MAKE_FAST_ALLOCATED;
</span><del>- friend class NeverDestroyed<SoupNetworkSession>;
</del><span class="cx"> public:
</span><span class="cx"> ~SoupNetworkSession();
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKitgtkChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/ChangeLog (165466 => 165467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/ChangeLog 2014-03-12 11:11:06 UTC (rev 165466)
+++ trunk/Source/WebKit/gtk/ChangeLog 2014-03-12 14:01:26 UTC (rev 165467)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+2014-03-12 Carlos Garcia Campos <cgarcia@igalia.com>
+
+ [GTK] [Stable] deadlock in gobject introspection
+ https://bugs.webkit.org/show_bug.cgi?id=125651
+
+ Reviewed by Sergio Villar Senin.
+
+ * webkit/webkitglobals.cpp:
+ (webkitExit): Dot not try to unref the default network session, it
+ will be finalized automatically when the process finishes.
+
</ins><span class="cx"> 2014-03-07 Zan Dobersek <zdobersek@igalia.com>
</span><span class="cx">
</span><span class="cx"> Move GTK WebKit1 code to std::unique_ptr
</span></span></pre></div>
<a id="trunkSourceWebKitgtkwebkitwebkitglobalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp (165466 => 165467)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-03-12 11:11:06 UTC (rev 165466)
+++ trunk/Source/WebKit/gtk/webkit/webkitglobals.cpp 2014-03-12 14:01:26 UTC (rev 165467)
</span><span class="lines">@@ -251,7 +251,6 @@
</span><span class="cx">
</span><span class="cx"> static void webkitExit()
</span><span class="cx"> {
</span><del>- g_object_unref(webkit_get_default_session());
</del><span class="cx"> #if ENABLE(ICONDATABASE)
</span><span class="cx"> g_object_unref(webkit_get_favicon_database());
</span><span class="cx"> #endif
</span></span></pre>
</div>
</div>
</body>
</html>