<!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>[214108] trunk</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/214108">214108</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-17 10:16:51 -0700 (Fri, 17 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>RealtimeIncomingAudioSource is not stopping properly
https://bugs.webkit.org/show_bug.cgi?id=169807
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-17
Reviewed by Eric Carlson.
Source/WebCore:
Test: webrtc/release-after-getting-track.html
* platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:
(WebCore::RealtimeIncomingAudioSource::~RealtimeIncomingAudioSource):
(WebCore::RealtimeIncomingAudioSource::stopProducingData):
LayoutTests:
* webrtc/release-after-getting-track-expected.txt: Added.
* webrtc/release-after-getting-track.html: Added.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreammacRealtimeIncomingAudioSourcecpp">trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtcreleaseaftergettingtrackexpectedtxt">trunk/LayoutTests/webrtc/release-after-getting-track-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcreleaseaftergettingtrackhtml">trunk/LayoutTests/webrtc/release-after-getting-track.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214107 => 214108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-17 17:09:00 UTC (rev 214107)
+++ trunk/LayoutTests/ChangeLog 2017-03-17 17:16:51 UTC (rev 214108)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-17 Youenn Fablet <youenn@apple.com>
+
+ RealtimeIncomingAudioSource is not stopping properly
+ https://bugs.webkit.org/show_bug.cgi?id=169807
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/release-after-getting-track-expected.txt: Added.
+ * webrtc/release-after-getting-track.html: Added.
+
</ins><span class="cx"> 2017-03-17 Miguel Gomez <magomez@igalia.com>
</span><span class="cx">
</span><span class="cx"> Follow-up (r213833): write a layout test for 169199
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcreleaseaftergettingtrackexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/release-after-getting-track-expected.txt (0 => 214108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/release-after-getting-track-expected.txt (rev 0)
+++ trunk/LayoutTests/webrtc/release-after-getting-track-expected.txt 2017-03-17 17:16:51 UTC (rev 214108)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Ensuring collecting tracks does not lead to crashing
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtcreleaseaftergettingtrackhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/release-after-getting-track.html (0 => 214108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/release-after-getting-track.html (rev 0)
+++ trunk/LayoutTests/webrtc/release-after-getting-track.html 2017-03-17 17:16:51 UTC (rev 214108)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Testing garbage collection after getting tracks</title>
+ <script src="../resources/testharness.js"></script>
+ <script src="../resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script src ="routines.js"></script>
+ <script>
+promise_test((test) => {
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ return navigator.mediaDevices.getUserMedia({ video: true, audio: true}).then((stream) => {
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
+ createConnections((firstConnection) => {
+ firstConnection.addStream(stream);
+ }, (secondConnection) => {
+ secondConnection.ontrack = resolve;
+ });
+ setTimeout(() => reject("Test timed out"), 5000);
+ });
+ }).then(() => {
+ if (window.GCController)
+ window.GCController.collect();
+ waitFor(1000);
+ });
+}, "Ensuring collecting tracks does not lead to crashing");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214107 => 214108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-17 17:09:00 UTC (rev 214107)
+++ trunk/Source/WebCore/ChangeLog 2017-03-17 17:16:51 UTC (rev 214108)
</span><span class="lines">@@ -1,3 +1,16 @@
</span><ins>+2017-03-17 Youenn Fablet <youenn@apple.com>
+
+ RealtimeIncomingAudioSource is not stopping properly
+ https://bugs.webkit.org/show_bug.cgi?id=169807
+
+ Reviewed by Eric Carlson.
+
+ Test: webrtc/release-after-getting-track.html
+
+ * platform/mediastream/mac/RealtimeIncomingAudioSource.cpp:
+ (WebCore::RealtimeIncomingAudioSource::~RealtimeIncomingAudioSource):
+ (WebCore::RealtimeIncomingAudioSource::stopProducingData):
+
</ins><span class="cx"> 2017-03-16 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><span class="cx"> Use completion handlers instead of return values for sending websocket data
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreammacRealtimeIncomingAudioSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp (214107 => 214108)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp 2017-03-17 17:09:00 UTC (rev 214107)
+++ trunk/Source/WebCore/platform/mediastream/mac/RealtimeIncomingAudioSource.cpp 2017-03-17 17:16:51 UTC (rev 214108)
</span><span class="lines">@@ -63,6 +63,7 @@
</span><span class="cx"> m_audioSourceProvider->unprepare();
</span><span class="cx"> m_audioSourceProvider = nullptr;
</span><span class="cx"> }
</span><ins>+ stopProducingData();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -121,7 +122,7 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeIncomingAudioSource::stopProducingData()
</span><span class="cx"> {
</span><del>- if (m_isProducingData)
</del><ins>+ if (!m_isProducingData)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_isProducingData = false;
</span></span></pre>
</div>
</div>
</body>
</html>