<!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>[214485] 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/214485">214485</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-28 12:03:21 -0700 (Tue, 28 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Stop RTCDataChannel when closing page
https://bugs.webkit.org/show_bug.cgi?id=170166
Patch by Youenn Fablet <youenn@apple.com> on 2017-03-28
Reviewed by Eric Carlson.
Source/WebCore:
Test: webrtc/datachannel/datachannel-gc.html
Making RTCDataChannel an ActiveDOMObject.
Closing the data channel backend and freeing upon close and stop.
* Modules/mediastream/RTCDataChannel.cpp:
(WebCore::RTCDataChannel::create):
(WebCore::RTCDataChannel::RTCDataChannel):
(WebCore::RTCDataChannel::close):
(WebCore::RTCDataChannel::stop):
* Modules/mediastream/RTCDataChannel.h:
* Modules/mediastream/RTCDataChannel.idl:
* Modules/mediastream/RTCPeerConnection.h:
LayoutTests:
* webrtc/datachannel/datachannel-gc-expected.txt: Added.
* webrtc/datachannel/datachannel-gc.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="#trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelh">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCDataChannelidl">trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh">trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestswebrtcdatachanneldatachannelgcexpectedtxt">trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt</a></li>
<li><a href="#trunkLayoutTestswebrtcdatachanneldatachannelgchtml">trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/LayoutTests/ChangeLog        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2017-03-28 Youenn Fablet <youenn@apple.com>
+
+ Stop RTCDataChannel when closing page
+ https://bugs.webkit.org/show_bug.cgi?id=170166
+
+ Reviewed by Eric Carlson.
+
+ * webrtc/datachannel/datachannel-gc-expected.txt: Added.
+ * webrtc/datachannel/datachannel-gc.html: Added.
+
</ins><span class="cx"> 2017-03-28 Antoine Quint <graouts@apple.com>
</span><span class="cx">
</span><span class="cx"> REGRESSION (r214386): [ios-simulator] LayoutTest media/modern-media-controls/media-controller/media-controller-scale-factor-audio.html is failing
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelgcexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt (0 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt         (rev 0)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+
+PASS Losing local channel reference and closing it on the other side should still allow emitting the close event
+
</ins></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelgchtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html (0 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html         (rev 0)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -0,0 +1,35 @@
</span><ins>+<!doctype html>
+<html>
+ <head>
+ <meta charset="utf-8">
+ <title>Testing basic data channel and garbage collection</title>
+ <script src="../../resources/testharness.js"></script>
+ <script src="../../resources/testharnessreport.js"></script>
+ </head>
+ <body>
+ <script src ="../routines.js"></script>
+ <script>
+var finishTest;
+promise_test((test) => {
+ counter = 0;
+ return new Promise((resolve, reject) => {
+ if (window.internals)
+ internals.useMockRTCPeerConnectionFactory("TwoRealPeerConnections");
+
+ createConnections((localConnection) => {
+ localConnection.createDataChannel('sendDataChannel').onclose = resolve;
+ }, (remoteConnection) => {
+ remoteConnection.ondatachannel = (event) => {
+ var remoteChannel = event.channel;
+ remoteChannel.close();
+ };
+ });
+ if (window.GCController)
+ return GCController.collect();
+ }).then(() => {
+ closeConnections();
+ });
+}, "Losing local channel reference and closing it on the other side should still allow emitting the close event");
+ </script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/Source/WebCore/ChangeLog        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2017-03-28 Youenn Fablet <youenn@apple.com>
+
+ Stop RTCDataChannel when closing page
+ https://bugs.webkit.org/show_bug.cgi?id=170166
+
+ Reviewed by Eric Carlson.
+
+ Test: webrtc/datachannel/datachannel-gc.html
+
+ Making RTCDataChannel an ActiveDOMObject.
+ Closing the data channel backend and freeing upon close and stop.
+
+ * Modules/mediastream/RTCDataChannel.cpp:
+ (WebCore::RTCDataChannel::create):
+ (WebCore::RTCDataChannel::RTCDataChannel):
+ (WebCore::RTCDataChannel::close):
+ (WebCore::RTCDataChannel::stop):
+ * Modules/mediastream/RTCDataChannel.h:
+ * Modules/mediastream/RTCDataChannel.idl:
+ * Modules/mediastream/RTCPeerConnection.h:
+
</ins><span class="cx"> 2017-03-27 Simon Fraser <simon.fraser@apple.com>
</span><span class="cx">
</span><span class="cx"> Enhance the touch region debug overlay to show regions for the different events
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -56,12 +56,13 @@
</span><span class="cx"> {
</span><span class="cx"> ASSERT(handler);
</span><span class="cx"> auto channel = adoptRef(*new RTCDataChannel(context, WTFMove(handler), WTFMove(label), WTFMove(options)));
</span><del>- channel->m_handler->setClient(&channel.get());
</del><ins>+ channel->m_handler->setClient(channel.ptr());
+ channel->setPendingActivity(channel.ptr());
</ins><span class="cx"> return channel;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> RTCDataChannel::RTCDataChannel(ScriptExecutionContext& context, std::unique_ptr<RTCDataChannelHandler>&& handler, String&& label, RTCDataChannelInit&& options)
</span><del>- : m_scriptExecutionContext(&context)
</del><ins>+ : ActiveDOMObject(&context)
</ins><span class="cx"> , m_handler(WTFMove(handler))
</span><span class="cx"> , m_scheduledEventTimer(*this, &RTCDataChannel::scheduledEventTimerFired)
</span><span class="cx"> , m_label(WTFMove(label))
</span><span class="lines">@@ -168,7 +169,13 @@
</span><span class="cx"> if (m_stopped)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ m_stopped = true;
+ m_readyState = ReadyStateClosed;
+
</ins><span class="cx"> m_handler->close();
</span><ins>+ m_handler->setClient(nullptr);
+ m_handler = nullptr;
+ unsetPendingActivity(this);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCDataChannel::didChangeReadyState(ReadyState newState)
</span><span class="lines">@@ -234,10 +241,7 @@
</span><span class="cx">
</span><span class="cx"> void RTCDataChannel::stop()
</span><span class="cx"> {
</span><del>- m_stopped = true;
- m_readyState = ReadyStateClosed;
- m_handler->setClient(nullptr);
- m_scriptExecutionContext = nullptr;
</del><ins>+ close();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void RTCDataChannel::scheduleDispatchEvent(Ref<Event>&& event)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx">
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx">
</span><ins>+#include "ActiveDOMObject.h"
</ins><span class="cx"> #include "Event.h"
</span><span class="cx"> #include "EventTarget.h"
</span><span class="cx"> #include "ExceptionOr.h"
</span><span class="lines">@@ -44,7 +45,7 @@
</span><span class="cx"> class Blob;
</span><span class="cx"> class RTCPeerConnectionHandler;
</span><span class="cx">
</span><del>-class RTCDataChannel final : public RTCDataChannelHandlerClient, public EventTargetWithInlineData {
</del><ins>+class RTCDataChannel final : public ActiveDOMObject, public RTCDataChannelHandlerClient, public EventTargetWithInlineData {
</ins><span class="cx"> public:
</span><span class="cx"> static Ref<RTCDataChannel> create(ScriptExecutionContext&, std::unique_ptr<RTCDataChannelHandler>&&, String&&, RTCDataChannelInit&&);
</span><span class="cx">
</span><span class="lines">@@ -71,8 +72,6 @@
</span><span class="cx">
</span><span class="cx"> void close();
</span><span class="cx">
</span><del>- void stop();
-
</del><span class="cx"> using RTCDataChannelHandlerClient::ref;
</span><span class="cx"> using RTCDataChannelHandlerClient::deref;
</span><span class="cx">
</span><span class="lines">@@ -88,7 +87,10 @@
</span><span class="cx"> void refEventTarget() final { ref(); }
</span><span class="cx"> void derefEventTarget() final { deref(); }
</span><span class="cx">
</span><del>- ScriptExecutionContext* m_scriptExecutionContext;
</del><ins>+ // ActiveDOMObject API
+ void stop() final;
+ const char* activeDOMObjectName() const final { return "RTCDataChannel"; }
+ bool canSuspendForDocumentSuspension() const final { return m_readyState == ReadyStateClosed; }
</ins><span class="cx">
</span><span class="cx"> // RTCDataChannelHandlerClient API
</span><span class="cx"> void didChangeReadyState(ReadyState) final;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> [
</span><ins>+ ActiveDOMObject,
</ins><span class="cx"> Conditional=WEB_RTC,
</span><span class="cx"> NoInterfaceObject,
</span><span class="cx"> ] interface RTCDataChannel : EventTarget {
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCPeerConnectionh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h (214484 => 214485)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-28 18:41:53 UTC (rev 214484)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-28 19:03:21 UTC (rev 214485)
</span><span class="lines">@@ -178,8 +178,6 @@
</span><span class="cx">
</span><span class="cx"> std::unique_ptr<RtpTransceiverSet> m_transceiverSet { std::unique_ptr<RtpTransceiverSet>(new RtpTransceiverSet()) };
</span><span class="cx">
</span><del>- Vector<RefPtr<RTCDataChannel>> m_dataChannels;
-
</del><span class="cx"> std::unique_ptr<PeerConnectionBackend> m_backend;
</span><span class="cx">
</span><span class="cx"> RTCConfiguration m_configuration;
</span></span></pre>
</div>
</div>
</body>
</html>