<!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>[247391] 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/247391">247391</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-07-12 10:27:53 -0700 (Fri, 12 Jul 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>Stopping a cloned MediaStream video track should not stop any other video track
https://bugs.webkit.org/show_bug.cgi?id=199635

Reviewed by Eric Carlson.

Source/WebCore:

In case a track is requesting its source to end, the
RealtimeVideoSource should request its own source to end and not stop it directly.

Also, if a track is removing itself as an observer to a RealtimeVideoSource, we should
stop the underlying source only if this one does not have any other observer.
Covered by updated test.

* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::removeObserver):
* platform/mediastream/RealtimeMediaSource.h:
* platform/mediastream/RealtimeVideoSource.cpp:
(WebCore::RealtimeVideoSource::requestToEnd):
(WebCore::RealtimeVideoSource::stopBeingObserved):
* platform/mediastream/RealtimeVideoSource.h:

LayoutTests:

* fast/mediastream/mediastreamtrack-video-clone-expected.txt:
* fast/mediastream/mediastreamtrack-video-clone.html:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreammediastreamtrackvideocloneexpectedtxt">trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreammediastreamtrackvideoclonehtml">trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeVideoSourceh">trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/LayoutTests/ChangeLog 2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-07-12  Youenn Fablet  <youenn@apple.com>
+
+        Stopping a cloned MediaStream video track should not stop any other video track
+        https://bugs.webkit.org/show_bug.cgi?id=199635
+
+        Reviewed by Eric Carlson.
+
+        * fast/mediastream/mediastreamtrack-video-clone-expected.txt:
+        * fast/mediastream/mediastreamtrack-video-clone.html:
+
</ins><span class="cx"> 2019-07-12  Timothy Hatcher  <timothy@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Drop DarkModeCSSEnabled as an experimental feature and always enable it.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreammediastreamtrackvideocloneexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone-expected.txt (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone-expected.txt     2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone-expected.txt        2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -3,6 +3,9 @@
</span><span class="cx"> PASS Setup for width test 
</span><span class="cx"> PASS Setup for height test 
</span><span class="cx"> PASS Setup for width+height test 
</span><ins>+PASS Stopping a track should not stop its clone 
+PASS Stopping a cloned track should not stop the original track 
+PASS Collecting a cloned track should not stop the original track 
</ins><span class="cx"> PASS Check cloned track settings after applying width constraints 
</span><span class="cx"> PASS Check cloned track settings after applying width constraint to original track 
</span><span class="cx"> PASS Check cloned track settings after applying height constraints 
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreammediastreamtrackvideoclonehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone.html (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone.html     2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/LayoutTests/fast/mediastream/mediastreamtrack-video-clone.html        2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -3,6 +3,7 @@
</span><span class="cx"> <head>
</span><span class="cx">     <meta charset="utf-8">
</span><span class="cx">     <title>Clone a video track.</title>
</span><ins>+    <script src="../../resources/gc.js"></script>
</ins><span class="cx">     <script src="../../resources/testharness.js"></script>
</span><span class="cx">     <script src="../../resources/testharnessreport.js"></script>
</span><span class="cx"> </head>
</span><span class="lines">@@ -105,6 +106,38 @@
</span><span class="cx">         }, "Check cloned track settings after applying width+height constraints to original track");
</span><span class="cx">     }, "Setup for width+height test");
</span><span class="cx"> 
</span><ins>+    promise_test(async (t) => {
+        const stream = await navigator.mediaDevices.getUserMedia({ video: { width: 100, height: 100 } });
+        const streamClone = stream.clone();
+
+        video1.srcObject = streamClone;
+        stream.getVideoTracks()[0].stop();
+
+        await video1.play();
+        assert_equals(video1.videoWidth, 100);
+    }, "Stopping a track should not stop its clone");
+
+    promise_test(async (t) => {
+        const stream = await navigator.mediaDevices.getUserMedia({ video: { width: 100, height: 100 } });
+        const streamClone = stream.clone();
+
+        video1.srcObject = stream;
+        streamClone.getVideoTracks()[0].stop();
+
+        await video1.play();
+        assert_equals(video1.videoWidth, 100);
+    }, "Stopping a cloned track should not stop the original track");
+
+    promise_test(async (t) => {
+        const stream = await navigator.mediaDevices.getUserMedia({ video: { width: 100, height: 100 } });
+        stream.clone().getVideoTracks()[0].stop();
+        gc();
+
+        video1.srcObject = stream;
+
+        await video1.play();
+        assert_equals(video1.videoWidth, 100);
+    }, "Collecting a cloned track should not stop the original track");
</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 (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/Source/WebCore/ChangeLog      2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2019-07-12  Youenn Fablet  <youenn@apple.com>
+
+        Stopping a cloned MediaStream video track should not stop any other video track
+        https://bugs.webkit.org/show_bug.cgi?id=199635
+
+        Reviewed by Eric Carlson.
+
+        In case a track is requesting its source to end, the
+        RealtimeVideoSource should request its own source to end and not stop it directly.
+
+        Also, if a track is removing itself as an observer to a RealtimeVideoSource, we should
+        stop the underlying source only if this one does not have any other observer.
+        Covered by updated test.
+
+        * platform/mediastream/RealtimeMediaSource.cpp:
+        (WebCore::RealtimeMediaSource::removeObserver):
+        * platform/mediastream/RealtimeMediaSource.h:
+        * platform/mediastream/RealtimeVideoSource.cpp:
+        (WebCore::RealtimeVideoSource::requestToEnd):
+        (WebCore::RealtimeVideoSource::stopBeingObserved):
+        * platform/mediastream/RealtimeVideoSource.h:
+
</ins><span class="cx"> 2019-07-12  Timothy Hatcher  <timothy@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Drop DarkModeCSSEnabled as an experimental feature and always enable it.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp        2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp   2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -69,10 +69,9 @@
</span><span class="cx"> void RealtimeMediaSource::removeObserver(RealtimeMediaSource::Observer& observer)
</span><span class="cx"> {
</span><span class="cx">     auto locker = holdLock(m_observersLock);
</span><del>-
</del><span class="cx">     m_observers.remove(&observer);
</span><span class="cx">     if (m_observers.isEmpty())
</span><del>-        stop();
</del><ins>+        stopBeingObserved();
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> void RealtimeMediaSource::setInterrupted(bool interrupted, bool pageMuted)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h  2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.h     2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">     bool isProducingData() const { return m_isProducingData; }
</span><span class="cx">     void start();
</span><span class="cx">     void stop();
</span><del>-    void requestToEnd(Observer& callingObserver);
</del><ins>+    virtual void requestToEnd(Observer& callingObserver);
</ins><span class="cx"> 
</span><span class="cx">     bool muted() const { return m_muted; }
</span><span class="cx">     void setMuted(bool);
</span><span class="lines">@@ -233,6 +233,8 @@
</span><span class="cx">     virtual void stopProducingData() { }
</span><span class="cx">     virtual void settingsDidChange(OptionSet<RealtimeMediaSourceSettings::Flag>) { }
</span><span class="cx"> 
</span><ins>+    virtual void stopBeingObserved() { stop(); }
+
</ins><span class="cx">     virtual void hasEnded() { }
</span><span class="cx"> 
</span><span class="cx"> #if !RELEASE_LOG_DISABLED
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp        2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.cpp   2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -118,6 +118,16 @@
</span><span class="cx">     return hasObserverPreventingStopping;
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+void RealtimeVideoSource::requestToEnd(RealtimeMediaSource::Observer&)
+{
+    m_source->requestToEnd(*this);
+}
+
+void RealtimeVideoSource::stopBeingObserved()
+{
+    m_source->requestToEnd(*this);
+}
+
</ins><span class="cx"> void RealtimeVideoSource::sourceStopped()
</span><span class="cx"> {
</span><span class="cx">     if (m_source->captureDidFail()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeVideoSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.h (247390 => 247391)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.h  2019-07-12 17:11:31 UTC (rev 247390)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeVideoSource.h     2019-07-12 17:27:53 UTC (rev 247391)
</span><span class="lines">@@ -46,6 +46,8 @@
</span><span class="cx">     bool supportsSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double> frameRate) final;
</span><span class="cx">     void setSizeAndFrameRate(Optional<int> width, Optional<int> height, Optional<double> frameRate) final;
</span><span class="cx">     Ref<RealtimeMediaSource> clone() final;
</span><ins>+    void requestToEnd(RealtimeMediaSource::Observer& callingObserver) final;
+    void stopBeingObserved() final;
</ins><span class="cx"> 
</span><span class="cx">     const RealtimeMediaSourceCapabilities& capabilities() final { return m_source->capabilities(); }
</span><span class="cx">     const RealtimeMediaSourceSettings& settings() final { return m_currentSettings; }
</span></span></pre>
</div>
</div>

</body>
</html>