<!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>[214500] 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/214500">214500</a></dd>
<dt>Author</dt> <dd>ryanhaddad@apple.com</dd>
<dt>Date</dt> <dd>2017-03-28 15:32:43 -0700 (Tue, 28 Mar 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>Unreviewed, rolling out <a href="http://trac.webkit.org/projects/webkit/changeset/214485">r214485</a>.

This change caused LayoutTest crashes.

Reverted changeset:

&quot;Stop RTCDataChannel when closing page&quot;
https://bugs.webkit.org/show_bug.cgi?id=170166
http://trac.webkit.org/changeset/214485</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>Removed 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 (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/LayoutTests/ChangeLog        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-28  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
+
+        Unreviewed, rolling out r214485.
+
+        This change caused LayoutTest crashes.
+
+        Reverted changeset:
+
+        &quot;Stop RTCDataChannel when closing page&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=170166
+        http://trac.webkit.org/changeset/214485
+
</ins><span class="cx"> 2017-03-28  Brian Burg  &lt;bburg@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         Web Inspector: Add &quot;Disable Caches&quot; option that only applies to the inspected page while Web Inspector is open
</span></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelgcexpectedtxt"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-gc-expected.txt        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -1,3 +0,0 @@
</span><del>-
-PASS Losing local channel reference and closing it on the other side should still allow emitting the close event 
-
</del></span></pre></div>
<a id="trunkLayoutTestswebrtcdatachanneldatachannelgchtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/LayoutTests/webrtc/datachannel/datachannel-gc.html        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -1,35 +0,0 @@
</span><del>-&lt;!doctype html&gt;
-&lt;html&gt;
-  &lt;head&gt;
-    &lt;meta charset=&quot;utf-8&quot;&gt;
-    &lt;title&gt;Testing basic data channel and garbage collection&lt;/title&gt;
-    &lt;script src=&quot;../../resources/testharness.js&quot;&gt;&lt;/script&gt;
-    &lt;script src=&quot;../../resources/testharnessreport.js&quot;&gt;&lt;/script&gt;
-  &lt;/head&gt;
-  &lt;body&gt;
-    &lt;script src =&quot;../routines.js&quot;&gt;&lt;/script&gt;
-    &lt;script&gt;
-var finishTest;
-promise_test((test) =&gt; {
-    counter = 0;
-    return new Promise((resolve, reject) =&gt; {
-        if (window.internals)
-            internals.useMockRTCPeerConnectionFactory(&quot;TwoRealPeerConnections&quot;);
-
-        createConnections((localConnection) =&gt; {
-            localConnection.createDataChannel('sendDataChannel').onclose = resolve;
-        }, (remoteConnection) =&gt; {
-            remoteConnection.ondatachannel = (event) =&gt; {
-                var remoteChannel = event.channel;
-                remoteChannel.close();
-            };
-        });
-        if (window.GCController)
-            return GCController.collect();
-    }).then(() =&gt; {
-        closeConnections();
-    });
-}, &quot;Losing local channel reference and closing it on the other side should still allow emitting the close event&quot;);
-    &lt;/script&gt;
-  &lt;/body&gt;
-&lt;/html&gt;
</del></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/Source/WebCore/ChangeLog        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2017-03-28  Ryan Haddad  &lt;ryanhaddad@apple.com&gt;
+
+        Unreviewed, rolling out r214485.
+
+        This change caused LayoutTest crashes.
+
+        Reverted changeset:
+
+        &quot;Stop RTCDataChannel when closing page&quot;
+        https://bugs.webkit.org/show_bug.cgi?id=170166
+        http://trac.webkit.org/changeset/214485
+
</ins><span class="cx"> 2017-03-28  Anders Carlsson  &lt;andersca@apple.com&gt;
</span><span class="cx"> 
</span><span class="cx">         ApplePayShippingContactUpdate.idl shouldn't have status field
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.cpp        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -56,13 +56,12 @@
</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-&gt;m_handler-&gt;setClient(channel.ptr());
-    channel-&gt;setPendingActivity(channel.ptr());
</del><ins>+    channel-&gt;m_handler-&gt;setClient(&amp;channel.get());
</ins><span class="cx">     return channel;
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> RTCDataChannel::RTCDataChannel(ScriptExecutionContext&amp; context, std::unique_ptr&lt;RTCDataChannelHandler&gt;&amp;&amp; handler, String&amp;&amp; label, RTCDataChannelInit&amp;&amp; options)
</span><del>-    : ActiveDOMObject(&amp;context)
</del><ins>+    : m_scriptExecutionContext(&amp;context)
</ins><span class="cx">     , m_handler(WTFMove(handler))
</span><span class="cx">     , m_scheduledEventTimer(*this, &amp;RTCDataChannel::scheduledEventTimerFired)
</span><span class="cx">     , m_label(WTFMove(label))
</span><span class="lines">@@ -169,13 +168,7 @@
</span><span class="cx">     if (m_stopped)
</span><span class="cx">         return;
</span><span class="cx"> 
</span><del>-    m_stopped = true;
-    m_readyState = ReadyStateClosed;
-
</del><span class="cx">     m_handler-&gt;close();
</span><del>-    m_handler-&gt;setClient(nullptr);
-    m_handler = nullptr;
-    unsetPendingActivity(this);
</del><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RTCDataChannel::didChangeReadyState(ReadyState newState)
</span><span class="lines">@@ -241,7 +234,10 @@
</span><span class="cx"> 
</span><span class="cx"> void RTCDataChannel::stop()
</span><span class="cx"> {
</span><del>-    close();
</del><ins>+    m_stopped = true;
+    m_readyState = ReadyStateClosed;
+    m_handler-&gt;setClient(nullptr);
+    m_scriptExecutionContext = nullptr;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RTCDataChannel::scheduleDispatchEvent(Ref&lt;Event&gt;&amp;&amp; event)
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamRTCDataChannelh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.h        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -26,7 +26,6 @@
</span><span class="cx"> 
</span><span class="cx"> #if ENABLE(WEB_RTC)
</span><span class="cx"> 
</span><del>-#include &quot;ActiveDOMObject.h&quot;
</del><span class="cx"> #include &quot;Event.h&quot;
</span><span class="cx"> #include &quot;EventTarget.h&quot;
</span><span class="cx"> #include &quot;ExceptionOr.h&quot;
</span><span class="lines">@@ -45,7 +44,7 @@
</span><span class="cx"> class Blob;
</span><span class="cx"> class RTCPeerConnectionHandler;
</span><span class="cx"> 
</span><del>-class RTCDataChannel final : public ActiveDOMObject, public RTCDataChannelHandlerClient, public EventTargetWithInlineData {
</del><ins>+class RTCDataChannel final : public RTCDataChannelHandlerClient, public EventTargetWithInlineData {
</ins><span class="cx"> public:
</span><span class="cx">     static Ref&lt;RTCDataChannel&gt; create(ScriptExecutionContext&amp;, std::unique_ptr&lt;RTCDataChannelHandler&gt;&amp;&amp;, String&amp;&amp;, RTCDataChannelInit&amp;&amp;);
</span><span class="cx"> 
</span><span class="lines">@@ -72,6 +71,8 @@
</span><span class="cx"> 
</span><span class="cx">     void close();
</span><span class="cx"> 
</span><ins>+    void stop();
+
</ins><span class="cx">     using RTCDataChannelHandlerClient::ref;
</span><span class="cx">     using RTCDataChannelHandlerClient::deref;
</span><span class="cx"> 
</span><span class="lines">@@ -87,10 +88,7 @@
</span><span class="cx">     void refEventTarget() final { ref(); }
</span><span class="cx">     void derefEventTarget() final { deref(); }
</span><span class="cx"> 
</span><del>-    // ActiveDOMObject API
-    void stop() final;
-    const char* activeDOMObjectName() const final { return &quot;RTCDataChannel&quot;; }
-    bool canSuspendForDocumentSuspension() const final { return m_readyState == ReadyStateClosed; }
</del><ins>+    ScriptExecutionContext* m_scriptExecutionContext;
</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 (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/Source/WebCore/Modules/mediastream/RTCDataChannel.idl        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -23,7 +23,6 @@
</span><span class="cx">  */
</span><span class="cx"> 
</span><span class="cx"> [
</span><del>-    ActiveDOMObject,
</del><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 (214499 => 214500)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-28 22:26:25 UTC (rev 214499)
+++ trunk/Source/WebCore/Modules/mediastream/RTCPeerConnection.h        2017-03-28 22:32:43 UTC (rev 214500)
</span><span class="lines">@@ -178,6 +178,8 @@
</span><span class="cx"> 
</span><span class="cx">     std::unique_ptr&lt;RtpTransceiverSet&gt; m_transceiverSet { std::unique_ptr&lt;RtpTransceiverSet&gt;(new RtpTransceiverSet()) };
</span><span class="cx"> 
</span><ins>+    Vector&lt;RefPtr&lt;RTCDataChannel&gt;&gt; m_dataChannels;
+
</ins><span class="cx">     std::unique_ptr&lt;PeerConnectionBackend&gt; m_backend;
</span><span class="cx"> 
</span><span class="cx">     RTCConfiguration m_configuration;
</span></span></pre>
</div>
</div>

</body>
</html>