<!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>[214980] trunk/Source/WebCore</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/214980">214980</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 17:03:44 -0700 (Wed, 05 Apr 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Host application should be able to mute and unmute media streams
https://bugs.webkit.org/show_bug.cgi?id=170519
<rdar://problem/31174326>
Unreviewed, address review comments missed in the initial checkin.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::MediaStream): Mute the private stream if the page doesn't allow
capture.
(WebCore::MediaStream::pageMutedStateDidChange): setMuted -> setCaptureTracksMuted.
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::addTrack): Don't track muted state, the capture source already does.
(WebCore::MediaStreamPrivate::startProducingData): Ditto.
(WebCore::MediaStreamPrivate::setCaptureTracksMuted): Renamed from setMuted.
(WebCore::MediaStreamPrivate::setMuted): Deleted.
* platform/mediastream/MediaStreamPrivate.h:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesmediastreamMediaStreamcpp">trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh">trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214979 => 214980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/ChangeLog 2017-04-06 00:03:44 UTC (rev 214980)
</span><span class="lines">@@ -4,6 +4,26 @@
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=170519
</span><span class="cx"> <rdar://problem/31174326>
</span><span class="cx">
</span><ins>+ Unreviewed, address review comments missed in the initial checkin.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::MediaStream): Mute the private stream if the page doesn't allow
+ capture.
+ (WebCore::MediaStream::pageMutedStateDidChange): setMuted -> setCaptureTracksMuted.
+
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::addTrack): Don't track muted state, the capture source already does.
+ (WebCore::MediaStreamPrivate::startProducingData): Ditto.
+ (WebCore::MediaStreamPrivate::setCaptureTracksMuted): Renamed from setMuted.
+ (WebCore::MediaStreamPrivate::setMuted): Deleted.
+ * platform/mediastream/MediaStreamPrivate.h:
+
+2017-04-05 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Host application should be able to mute and unmute media streams
+ https://bugs.webkit.org/show_bug.cgi?id=170519
+ <rdar://problem/31174326>
+
</ins><span class="cx"> Reviewed by Youenn Fablet.
</span><span class="cx">
</span><span class="cx"> No new tests, fast/mediastream/MediaStream-page-muted.html was updated.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (214979 => 214980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-06 00:03:44 UTC (rev 214980)
</span><span class="lines">@@ -90,7 +90,10 @@
</span><span class="cx"> , m_activityEventTimer(*this, &MediaStream::activityEventTimerFired)
</span><span class="cx"> {
</span><span class="cx"> ASSERT(m_private);
</span><ins>+
</ins><span class="cx"> setIsActive(m_private->active());
</span><ins>+ if (document()->page()->isMediaCaptureMuted())
+ m_private->setCaptureTracksMuted(true);
</ins><span class="cx"> m_private->addObserver(*this);
</span><span class="cx"> MediaStreamRegistry::shared().registerStream(*this);
</span><span class="cx">
</span><span class="lines">@@ -300,7 +303,7 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_private->setMuted(document->page()->isMediaCaptureMuted());
</del><ins>+ m_private->setCaptureTracksMuted(document->page()->isMediaCaptureMuted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags MediaStream::mediaState() const
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (214979 => 214980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-06 00:03:44 UTC (rev 214980)
</span><span class="lines">@@ -134,9 +134,6 @@
</span><span class="cx"> if (m_trackSet.contains(track->id()))
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- if (m_muted)
- track->stopProducingData();
-
</del><span class="cx"> track->addObserver(*this);
</span><span class="cx"> m_trackSet.add(track->id(), track);
</span><span class="cx">
</span><span class="lines">@@ -165,9 +162,6 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::startProducingData()
</span><span class="cx"> {
</span><del>- if (m_muted)
- return;
-
</del><span class="cx"> for (auto& track : m_trackSet.values())
</span><span class="cx"> track->startProducingData();
</span><span class="cx"> }
</span><span class="lines">@@ -187,12 +181,8 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void MediaStreamPrivate::setMuted(bool muted)
</del><ins>+void MediaStreamPrivate::setCaptureTracksMuted(bool muted)
</ins><span class="cx"> {
</span><del>- if (m_muted == muted)
- return;
-
- m_muted = muted;
</del><span class="cx"> for (auto& track : m_trackSet.values()) {
</span><span class="cx"> if (track->isCaptureTrack())
</span><span class="cx"> track->setMuted(muted);
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (214979 => 214980)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-05 23:59:11 UTC (rev 214979)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-06 00:03:44 UTC (rev 214980)
</span><span class="lines">@@ -95,12 +95,11 @@
</span><span class="cx">
</span><span class="cx"> bool hasVideo() const;
</span><span class="cx"> bool hasAudio() const;
</span><del>-
- void setMuted(bool);
</del><span class="cx"> bool muted() const;
</span><span class="cx">
</span><span class="cx"> bool hasCaptureVideoSource() const;
</span><span class="cx"> bool hasCaptureAudioSource() const;
</span><ins>+ void setCaptureTracksMuted(bool);
</ins><span class="cx">
</span><span class="cx"> FloatSize intrinsicSize() const;
</span><span class="cx">
</span><span class="lines">@@ -136,7 +135,6 @@
</span><span class="cx"> MediaStreamTrackPrivate* m_activeVideoTrack { nullptr };
</span><span class="cx"> HashMap<String, RefPtr<MediaStreamTrackPrivate>> m_trackSet;
</span><span class="cx"> bool m_isActive { false };
</span><del>- bool m_muted { false };
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<MediaStreamPrivate>> MediaStreamPrivateVector;
</span></span></pre>
</div>
</div>
</body>
</html>