<!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>[213982] 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/213982">213982</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-15 09:35:18 -0700 (Wed, 15 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Preventive clean-up: ensure RTCPeerConnection stays valid when calling postTask
https://bugs.webkit.org/show_bug.cgi?id=169661
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-15
Reviewed by Alex Christensen.
Source/WebCore:
Protecting the RTCPeerConnection object when calling postTask since it might get collected between the task post
and task run. Also do not send negotiationNeeded event if RTCPeerConnection is closed (covered by added test).
* Modules/mediastream/RTCPeerConnection.cpp:
(WebCore::RTCPeerConnection::updateIceGatheringState):
(WebCore::RTCPeerConnection::updateIceConnectionState):
(WebCore::RTCPeerConnection::scheduleNegotiationNeededEvent):
LayoutTests:
* webrtc/negotiatedneeded-event-addStream-expected.txt:
* webrtc/negotiatedneeded-event-addStream.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestswebrtcnegotiatedneededeventaddStreamexpectedtxt">trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcnegotiatedneededeventaddStreamhtml">trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213981 => 213982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-15 15:58:18 UTC (rev 213981)
+++ trunk/LayoutTests/ChangeLog 2017-03-15 16:35:18 UTC (rev 213982)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-15 Youenn Fablet <youenn@apple.com>
+
+ Preventive clean-up: ensure RTCPeerConnection stays valid when calling postTask
+ https://bugs.webkit.org/show_bug.cgi?id=169661
+
+ Reviewed by Alex Christensen.
+
+ * webrtc/negotiatedneeded-event-addStream-expected.txt:
+ * webrtc/negotiatedneeded-event-addStream.html:
+
</ins><span class="cx"> 2017-03-14 Ryan Haddad <ryanhaddad@apple.com>
</span><span class="cx">
</span><span class="cx"> Mark media/modern-media-controls/volume-down-support/volume-down-support.html as flaky.
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcnegotiatedneededeventaddStreamexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream-expected.txt (213981 => 213982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream-expected.txt 2017-03-15 15:58:18 UTC (rev 213981)
+++ trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream-expected.txt 2017-03-15 16:35:18 UTC (rev 213982)
</span><span class="lines">@@ -1,4 +1,5 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> PASS on negotiation needed in case of adding a stream
</span><ins>+PASS on negotiation needed not called if pc is closed
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcnegotiatedneededeventaddStreamhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html (213981 => 213982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html 2017-03-15 15:58:18 UTC (rev 213981)
+++ trunk/LayoutTests/webrtc/negotiatedneeded-event-addStream.html 2017-03-15 16:35:18 UTC (rev 213982)
</span><span class="lines">@@ -26,6 +26,23 @@
</span><span class="cx"> });
</span><span class="cx"> });
</span><span class="cx"> }, "on negotiation needed in case of adding a stream");
</span><ins>+
+promise_test((test) => {
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ return navigator.mediaDevices.getUserMedia({ video: true}).then((stream) => {
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("OneRealPeerConnection");
+ var pc = new RTCPeerConnection();
+ pc.onnegotiationneeded = () => { reject(); };
+ pc.addStream(stream);
+ pc.close();
+ setTimeout(resolve, 500);
+ });
+ });
+}, "on negotiation needed not called if pc is closed");
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213981 => 213982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-03-15 15:58:18 UTC (rev 213981)
+++ trunk/Source/WebCore/ChangeLog 2017-03-15 16:35:18 UTC (rev 213982)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2017-03-15 Youenn Fablet <youenn@apple.com>
+
+ Preventive clean-up: ensure RTCPeerConnection stays valid when calling postTask
+ https://bugs.webkit.org/show_bug.cgi?id=169661
+
+ Reviewed by Alex Christensen.
+
+ Protecting the RTCPeerConnection object when calling postTask since it might get collected between the task post
+ and task run. Also do not send negotiationNeeded event if RTCPeerConnection is closed (covered by added test).
+
+ * Modules/mediastream/RTCPeerConnection.cpp:
+ (WebCore::RTCPeerConnection::updateIceGatheringState):
+ (WebCore::RTCPeerConnection::updateIceConnectionState):
+ (WebCore::RTCPeerConnection::scheduleNegotiationNeededEvent):
+
</ins><span class="cx"> 2017-03-15 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> [Modern Media Controls] Always use six digits to display time when overall media duration is an hour or more
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectioncpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp (213981 => 213982)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-15 15:58:18 UTC (rev 213981)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp 2017-03-15 16:35:18 UTC (rev 213982)
</span><span class="lines">@@ -477,33 +477,35 @@
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::updateIceGatheringState(IceGatheringState newState)
</span><span class="cx"> {
</span><del>- scriptExecutionContext()->postTask([=](ScriptExecutionContext&) {
- if (m_signalingState == SignalingState::Closed || m_iceGatheringState == newState)
</del><ins>+ scriptExecutionContext()->postTask([protectedThis = makeRef(*this), newState](ScriptExecutionContext&) {
+ if (protectedThis->m_signalingState == SignalingState::Closed || protectedThis->m_iceGatheringState == newState)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_iceGatheringState = newState;
- dispatchEvent(Event::create(eventNames().icegatheringstatechangeEvent, false, false));
</del><ins>+ protectedThis->m_iceGatheringState = newState;
+ protectedThis->dispatchEvent(Event::create(eventNames().icegatheringstatechangeEvent, false, false));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::updateIceConnectionState(IceConnectionState newState)
</span><span class="cx"> {
</span><del>- scriptExecutionContext()->postTask([=](ScriptExecutionContext&) {
- if (m_signalingState == SignalingState::Closed || m_iceConnectionState == newState)
</del><ins>+ scriptExecutionContext()->postTask([protectedThis = makeRef(*this), newState](ScriptExecutionContext&) {
+ if (protectedThis->m_signalingState == SignalingState::Closed || protectedThis->m_iceConnectionState == newState)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_iceConnectionState = newState;
- dispatchEvent(Event::create(eventNames().iceconnectionstatechangeEvent, false, false));
</del><ins>+ protectedThis->m_iceConnectionState = newState;
+ protectedThis->dispatchEvent(Event::create(eventNames().iceconnectionstatechangeEvent, false, false));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCPeerConnection::scheduleNegotiationNeededEvent()
</span><span class="cx"> {
</span><del>- scriptExecutionContext()->postTask([=](ScriptExecutionContext&) {
- if (m_backend->isNegotiationNeeded()) {
- m_backend->clearNegotiationNeededState();
- dispatchEvent(Event::create(eventNames().negotiationneededEvent, false, false));
- }
</del><ins>+ scriptExecutionContext()->postTask([protectedThis = makeRef(*this)](ScriptExecutionContext&) {
+ if (protectedThis->m_signalingState == SignalingState::Closed)
+ return;
+ if (!protectedThis->m_backend->isNegotiationNeeded())
+ return;
+ protectedThis->m_backend->clearNegotiationNeededState();
+ protectedThis->dispatchEvent(Event::create(eventNames().negotiationneededEvent, false, false));
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>