<!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>[203813] trunk/Source/WebCore</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/203813">203813</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-07-27 23:28:11 -0700 (Wed, 27 Jul 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[soup] Incorrect usage of relaxAdoptionRequirement in the constructor of SocketStreamHandle
https://bugs.webkit.org/show_bug.cgi?id=160281
Patch by Fujii Hironori <Hironori.Fujii@sony.com> on 2016-07-27
Reviewed by Carlos Garcia Campos.
No new tests (No behavior change).
Incrementing refcount in a constructor causes an assertion failure
that it's not adopted yet. So, relaxAdoptionRequirement() was
used to avoid the problem in the constructors of
SocketStreamHandle. This is a incorrect solution. The correct
solution is to make SocketStreamHandle::create() increment the
refcount after calling the constructor.
* platform/network/soup/SocketStreamHandle.h: Removed the second
constructor of SocketStreamHandle which is not used anymore.
Uninlined create() because this is not trivial anymore.
* platform/network/soup/SocketStreamHandleSoup.cpp:
(WebCore::SocketStreamHandle::create): Do the rest of jobs which
was done by the constructors.
(WebCore::SocketStreamHandle::SocketStreamHandle): Move the jobs
after initialization to create().
Removed the second constructor.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh">trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp">trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (203812 => 203813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-07-28 05:59:33 UTC (rev 203812)
+++ trunk/Source/WebCore/ChangeLog 2016-07-28 06:28:11 UTC (rev 203813)
</span><span class="lines">@@ -1,3 +1,29 @@
</span><ins>+2016-07-27 Fujii Hironori <Hironori.Fujii@sony.com>
+
+ [soup] Incorrect usage of relaxAdoptionRequirement in the constructor of SocketStreamHandle
+ https://bugs.webkit.org/show_bug.cgi?id=160281
+
+ Reviewed by Carlos Garcia Campos.
+
+ No new tests (No behavior change).
+
+ Incrementing refcount in a constructor causes an assertion failure
+ that it's not adopted yet. So, relaxAdoptionRequirement() was
+ used to avoid the problem in the constructors of
+ SocketStreamHandle. This is a incorrect solution. The correct
+ solution is to make SocketStreamHandle::create() increment the
+ refcount after calling the constructor.
+
+ * platform/network/soup/SocketStreamHandle.h: Removed the second
+ constructor of SocketStreamHandle which is not used anymore.
+ Uninlined create() because this is not trivial anymore.
+ * platform/network/soup/SocketStreamHandleSoup.cpp:
+ (WebCore::SocketStreamHandle::create): Do the rest of jobs which
+ was done by the constructors.
+ (WebCore::SocketStreamHandle::SocketStreamHandle): Move the jobs
+ after initialization to create().
+ Removed the second constructor.
+
</ins><span class="cx"> 2016-07-27 Chris Dumez <cdumez@apple.com>
</span><span class="cx">
</span><span class="cx"> First parameter to HTMLMediaElement.canPlayType() should be mandatory
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h (203812 => 203813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-07-28 05:59:33 UTC (rev 203812)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandle.h 2016-07-28 06:28:11 UTC (rev 203813)
</span><span class="lines">@@ -49,14 +49,13 @@
</span><span class="cx">
</span><span class="cx"> class SocketStreamHandle final : public RefCounted<SocketStreamHandle>, public SocketStreamHandleBase {
</span><span class="cx"> public:
</span><del>- static Ref<SocketStreamHandle> create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, SessionID) { return adoptRef(*new SocketStreamHandle(url, client)); }
- static Ref<SocketStreamHandle> create(GSocketConnection* socketConnection, SocketStreamHandleClient& client) { return adoptRef(*new SocketStreamHandle(socketConnection, client)); }
</del><ins>+ static Ref<SocketStreamHandle> create(const URL&, SocketStreamHandleClient&, NetworkingContext&, SessionID);
+ static Ref<SocketStreamHandle> create(GSocketConnection*, SocketStreamHandleClient&);
</ins><span class="cx">
</span><span class="cx"> virtual ~SocketStreamHandle();
</span><span class="cx">
</span><span class="cx"> private:
</span><span class="cx"> SocketStreamHandle(const URL&, SocketStreamHandleClient&);
</span><del>- SocketStreamHandle(GSocketConnection*, SocketStreamHandleClient&);
</del><span class="cx">
</span><span class="cx"> int platformSend(const char* data, int length) override;
</span><span class="cx"> void platformClose() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworksoupSocketStreamHandleSoupcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp (203812 => 203813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-07-28 05:59:33 UTC (rev 203812)
+++ trunk/Source/WebCore/platform/network/soup/SocketStreamHandleSoup.cpp 2016-07-28 06:28:11 UTC (rev 203813)
</span><span class="lines">@@ -48,30 +48,34 @@
</span><span class="cx">
</span><span class="cx"> namespace WebCore {
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
- : SocketStreamHandleBase(url, client)
- , m_cancellable(adoptGRef(g_cancellable_new()))
</del><ins>+Ref<SocketStreamHandle> SocketStreamHandle::create(const URL& url, SocketStreamHandleClient& client, NetworkingContext&, SessionID)
</ins><span class="cx"> {
</span><del>- LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</del><ins>+ Ref<SocketStreamHandle> socket = adoptRef(*new SocketStreamHandle(url, client));
+
</ins><span class="cx"> unsigned port = url.hasPort() ? url.port() : (url.protocolIs("wss") ? 443 : 80);
</span><del>-
</del><span class="cx"> GRefPtr<GSocketClient> socketClient = adoptGRef(g_socket_client_new());
</span><span class="cx"> if (url.protocolIs("wss"))
</span><span class="cx"> g_socket_client_set_tls(socketClient.get(), TRUE);
</span><del>- relaxAdoptionRequirement();
- RefPtr<SocketStreamHandle> protectedThis(this);
- g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, m_cancellable.get(),
- reinterpret_cast<GAsyncReadyCallback>(connectedCallback), protectedThis.leakRef());
</del><ins>+ Ref<SocketStreamHandle> protectedSocketStreamHandle = socket.copyRef();
+ g_socket_client_connect_to_host_async(socketClient.get(), url.host().utf8().data(), port, socket->m_cancellable.get(),
+ reinterpret_cast<GAsyncReadyCallback>(connectedCallback), &protectedSocketStreamHandle.leakRef());
+ return socket;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>-SocketStreamHandle::SocketStreamHandle(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
- : SocketStreamHandleBase(URL(), client)
</del><ins>+Ref<SocketStreamHandle> SocketStreamHandle::create(GSocketConnection* socketConnection, SocketStreamHandleClient& client)
+{
+ Ref<SocketStreamHandle> socket = adoptRef(*new SocketStreamHandle(URL(), client));
+
+ GRefPtr<GSocketConnection> connection = socketConnection;
+ socket->connected(WTFMove(connection));
+ return socket;
+}
+
+SocketStreamHandle::SocketStreamHandle(const URL& url, SocketStreamHandleClient& client)
+ : SocketStreamHandleBase(url, client)
</ins><span class="cx"> , m_cancellable(adoptGRef(g_cancellable_new()))
</span><span class="cx"> {
</span><span class="cx"> LOG(Network, "SocketStreamHandle %p new client %p", this, &m_client);
</span><del>- GRefPtr<GSocketConnection> connection = socketConnection;
- relaxAdoptionRequirement();
- connected(WTFMove(connection));
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> SocketStreamHandle::~SocketStreamHandle()
</span></span></pre>
</div>
</div>
</body>
</html>