<!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>[212644] 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/212644">212644</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-02-20 09:24:12 -0800 (Mon, 20 Feb 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[WebRTC] Fix some memory leaks in libwebrtc binding code
https://bugs.webkit.org/show_bug.cgi?id=168596
Patch by Youenn Fablet <youenn@apple.com> on 2017-02-20
Reviewed by Eric Carlson.
Source/WebCore:
Covered by manual testing.
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
(WebCore::LibWebRTCMediaEndpoint::StatsCollector::StatsCollector): Using the libwebrtc way of creating such objects.
* Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
(WebCore::LibWebRTCMediaEndpoint::StatsCollector::create):
* platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:
(WebCore::PeerConnectionFactoryAndThreads::OnMessage):
Source/WebKit2:
* NetworkProcess/webrtc/NetworkRTCProvider.cpp:
(WebKit::NetworkRTCProvider::OnMessage):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh">trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercpp">trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidercpp">trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebCore/ChangeLog 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -1,3 +1,19 @@
</span><ins>+2017-02-20 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Fix some memory leaks in libwebrtc binding code
+ https://bugs.webkit.org/show_bug.cgi?id=168596
+
+ Reviewed by Eric Carlson.
+
+ Covered by manual testing.
+
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp:
+ (WebCore::LibWebRTCMediaEndpoint::StatsCollector::StatsCollector): Using the libwebrtc way of creating such objects.
+ * Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h:
+ (WebCore::LibWebRTCMediaEndpoint::StatsCollector::create):
+ * platform/mediastream/libwebrtc/LibWebRTCProvider.cpp:
+ (WebCore::PeerConnectionFactoryAndThreads::OnMessage):
+
</ins><span class="cx"> 2017-02-20 Alexey Proskuryakov <ap@apple.com>
</span><span class="cx">
</span><span class="cx"> Clean up how WebKit exports _WebCreateFragment
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.cpp 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -219,8 +219,8 @@
</span><span class="cx"> m_backend->GetStats(StatsCollector::create(*this, promise, track).get());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-LibWebRTCMediaEndpoint::StatsCollector::StatsCollector(LibWebRTCMediaEndpoint& endpoint, const DeferredPromise& promise, MediaStreamTrack* track)
- : m_endpoint(endpoint)
</del><ins>+LibWebRTCMediaEndpoint::StatsCollector::StatsCollector(Ref<LibWebRTCMediaEndpoint>&& endpoint, const DeferredPromise& promise, MediaStreamTrack* track)
+ : m_endpoint(WTFMove(endpoint))
</ins><span class="cx"> , m_promise(promise)
</span><span class="cx"> {
</span><span class="cx"> if (track)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamlibwebrtcLibWebRTCMediaEndpointh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebCore/Modules/mediastream/libwebrtc/LibWebRTCMediaEndpoint.h 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -143,19 +143,16 @@
</span><span class="cx"> LibWebRTCMediaEndpoint& m_endpoint;
</span><span class="cx"> };
</span><span class="cx">
</span><del>- class StatsCollector final : public webrtc::RTCStatsCollectorCallback {
</del><ins>+ class StatsCollector : public webrtc::RTCStatsCollectorCallback {
</ins><span class="cx"> public:
</span><del>- static rtc::scoped_refptr<StatsCollector> create(LibWebRTCMediaEndpoint& endpoint, const DeferredPromise& promise, MediaStreamTrack* track) { return new StatsCollector(endpoint, promise, track); }
</del><ins>+ static rtc::scoped_refptr<StatsCollector> create(Ref<LibWebRTCMediaEndpoint>&& endpoint, const DeferredPromise& promise, MediaStreamTrack* track) { return new rtc::RefCountedObject<StatsCollector>(WTFMove(endpoint), promise, track); }
</ins><span class="cx">
</span><del>- int AddRef() const { return m_endpoint.AddRef(); }
- int Release() const { return m_endpoint.Release(); }
</del><ins>+ StatsCollector(Ref<LibWebRTCMediaEndpoint>&&, const DeferredPromise&, MediaStreamTrack*);
</ins><span class="cx">
</span><span class="cx"> private:
</span><del>- StatsCollector(LibWebRTCMediaEndpoint&, const DeferredPromise&, MediaStreamTrack*);
-
</del><span class="cx"> void OnStatsDelivered(const rtc::scoped_refptr<const webrtc::RTCStatsReport>&) final;
</span><span class="cx">
</span><del>- LibWebRTCMediaEndpoint& m_endpoint;
</del><ins>+ Ref<LibWebRTCMediaEndpoint> m_endpoint;
</ins><span class="cx"> const DeferredPromise& m_promise;
</span><span class="cx"> String m_id;
</span><span class="cx"> };
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamlibwebrtcLibWebRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebCore/platform/mediastream/libwebrtc/LibWebRTCProvider.cpp 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -65,7 +65,9 @@
</span><span class="cx"> void PeerConnectionFactoryAndThreads::OnMessage(rtc::Message* message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(message->message_id == 1);
</span><del>- static_cast<ThreadMessageData*>(message->pdata)->callback();
</del><ins>+ auto* data = static_cast<ThreadMessageData*>(message->pdata);
+ data->callback();
+ delete data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void LibWebRTCProvider::callOnWebRTCNetworkThread(Function<void()>&& callback)
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebKit2/ChangeLog 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-02-20 Youenn Fablet <youenn@apple.com>
+
+ [WebRTC] Fix some memory leaks in libwebrtc binding code
+ https://bugs.webkit.org/show_bug.cgi?id=168596
+
+ Reviewed by Eric Carlson.
+
+ * NetworkProcess/webrtc/NetworkRTCProvider.cpp:
+ (WebKit::NetworkRTCProvider::OnMessage):
+
</ins><span class="cx"> 2017-02-20 Carlos Garcia Campos <cgarcia@igalia.com>
</span><span class="cx">
</span><span class="cx"> Remove code under USE(GRAPHICS_SURFACE)
</span></span></pre></div>
<a id="trunkSourceWebKit2NetworkProcesswebrtcNetworkRTCProvidercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp (212643 => 212644)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2017-02-20 17:24:06 UTC (rev 212643)
+++ trunk/Source/WebKit2/NetworkProcess/webrtc/NetworkRTCProvider.cpp 2017-02-20 17:24:12 UTC (rev 212644)
</span><span class="lines">@@ -173,7 +173,9 @@
</span><span class="cx"> void NetworkRTCProvider::OnMessage(rtc::Message* message)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(message->message_id == 1);
</span><del>- static_cast<NetworkMessageData*>(message->pdata)->callback();
</del><ins>+ auto* data = static_cast<NetworkMessageData*>(message->pdata);
+ data->callback();
+ delete data;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void NetworkRTCProvider::callOnRTCNetworkThread(Function<void()>&& callback)
</span></span></pre>
</div>
</div>
</body>
</html>