<!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>[214976] 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/214976">214976</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2017-04-05 16:22:20 -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>
Reviewed by Youenn Fablet.
Source/WebCore:
No new tests, fast/mediastream/MediaStream-page-muted.html was updated.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::~MediaStream): Fix a typo.
(WebCore::MediaStream::pageMutedStateDidChange): Don't store muted state, let the private
stream store it.
(WebCore::MediaStream::mediaState): Deal with new muted state flags.
* Modules/mediastream/MediaStream.h:
* dom/Document.cpp:
(WebCore::Document::prepareForDestruction): Clear media state before the frame is cleared.
* page/MediaProducer.h: Add muted flags.
* platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
(WebCore::MediaPlayerPrivateMediaStreamAVFObjC::checkSelectedVideoTrack): The display layer
should not be visible when the video track is muted.
* platform/mediastream/MediaStreamPrivate.cpp:
(WebCore::MediaStreamPrivate::addTrack): Mute the new track if necessary.
(WebCore::MediaStreamPrivate::startProducingData): Do nothing when muted.
(WebCore::MediaStreamPrivate::setExternallyMuted): New, mute/unmute tracks.
* platform/mediastream/MediaStreamPrivate.h:
* platform/mediastream/RealtimeMediaSource.cpp:
(WebCore::RealtimeMediaSource::setMuted): Start/stop producing data.
* testing/Internals.cpp:
(WebCore::Internals::pageMediaState): Support new media stream muted flags.
Source/WebKit2:
* UIProcess/API/C/WKPage.cpp:
(WKPageGetMediaState): Support new media stream state flags.
* UIProcess/API/C/WKPagePrivate.h:
* UIProcess/API/Cocoa/WKWebViewPrivate.h: Ditto.
* UIProcess/Cocoa/UIDelegate.mm: Ditto.
LayoutTests:
* fast/mediastream/MediaStream-page-muted-expected.txt:
* fast/mediastream/MediaStream-page-muted.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreampagemutedhtml">trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html</a></li>
<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="#trunkSourceWebCoreModulesmediastreamMediaStreamh">trunk/Source/WebCore/Modules/mediastream/MediaStream.h</a></li>
<li><a href="#trunkSourceWebCoredomDocumentcpp">trunk/Source/WebCore/dom/Document.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMediaProducerh">trunk/Source/WebCore/page/MediaProducer.h</a></li>
<li><a href="#trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm">trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm</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>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagecpp">trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICWKPagePrivateh">trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh">trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h</a></li>
<li><a href="#trunkSourceWebKit2UIProcessCocoaUIDelegatemm">trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/LayoutTests/ChangeLog 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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>
+
+ Reviewed by Youenn Fablet.
+
+ * fast/mediastream/MediaStream-page-muted-expected.txt:
+ * fast/mediastream/MediaStream-page-muted.html:
+
</ins><span class="cx"> 2017-04-05 Javier Fernandez <jfernandez@igalia.com>
</span><span class="cx">
</span><span class="cx"> [css-align] Implement the place-items shorthand
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -15,7 +15,10 @@
</span><span class="cx"> EVENT: mute
</span><span class="cx"> PASS muteChangedEvent.target.muted is true
</span><span class="cx">
</span><del>-PASS window.internals.pageMediaState().includes('HasActiveAudioCaptureDevice') && window.internals.pageMediaState().includes('HasActiveVideoCaptureDevice') became false
</del><ins>+PASS window.internals.pageMediaState().includes(HasMutedAudioCaptureDevice) became true
+PASS window.internals.pageMediaState().includes(HasMutedVideoCaptureDevice) became true
+PASS window.internals.pageMediaState().includes(HasActiveAudioCaptureDevice) became false
+PASS window.internals.pageMediaState().includes(HasActiveVideoCaptureDevice) became false
</ins><span class="cx">
</span><span class="cx"> *** Unmuting capture devices
</span><span class="cx"> EVENT: unmute
</span><span class="lines">@@ -23,7 +26,10 @@
</span><span class="cx"> EVENT: unmute
</span><span class="cx"> PASS muteChangedEvent.target.muted is false
</span><span class="cx">
</span><del>-PASS window.internals.pageMediaState().includes('HasActiveAudioCaptureDevice') && window.internals.pageMediaState().includes('HasActiveVideoCaptureDevice') became true
</del><ins>+PASS window.internals.pageMediaState().includes(HasActiveAudioCaptureDevice) became true
+PASS window.internals.pageMediaState().includes(HasActiveVideoCaptureDevice) became true
+PASS window.internals.pageMediaState().includes(HasMutedAudioCaptureDevice) became false
+PASS window.internals.pageMediaState().includes(HasMutedVideoCaptureDevice) became false
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -27,8 +27,37 @@
</span><span class="cx">
</span><span class="cx"> if (++eventCount == 2) {
</span><span class="cx"> debug("");
</span><del>- let shouldBeActive = muteChangedEvent.type == "mute" ? "false" : "true";
- shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveAudioCaptureDevice') && window.internals.pageMediaState().includes('HasActiveVideoCaptureDevice')", shouldBeActive, nextStep);
</del><ins>+
+ let activeState = muteChangedEvent.type == "mute" ? "Muted" : "Active";
+ let inactiveState = muteChangedEvent.type == "mute" ? "Active" : "Muted";
+ let retryCount = 0;
+ let retryInterval = 100;
+ let maximumRetryCount = 20 * 1000 / retryInterval;
+ let test = () => {
+
+ if (window.internals.pageMediaState().includes(`Has${activeState}AudioCaptureDevice`)
+ && window.internals.pageMediaState().includes(`Has${activeState}VideoCaptureDevice`)
+ && !window.internals.pageMediaState().includes(`Has${inactiveState}VideoCaptureDevice`)
+ && !window.internals.pageMediaState().includes(`Has${inactiveState}VideoCaptureDevice`)) {
+
+ testPassed(`window.internals.pageMediaState().includes(Has${activeState}AudioCaptureDevice) became true`);
+ testPassed(`window.internals.pageMediaState().includes(Has${activeState}VideoCaptureDevice) became true`);
+ testPassed(`window.internals.pageMediaState().includes(Has${inactiveState}AudioCaptureDevice) became false`);
+ testPassed(`window.internals.pageMediaState().includes(Has${inactiveState}VideoCaptureDevice) became false`);
+
+ nextStep()
+ return;
+ }
+
+ if (++retryCount > maximumRetryCount) {
+ testFailed(`Page muted state failed to change after ${maximumRetryCount / 1000} seconds`);
+ return;
+ }
+
+ setTimeout(test, retryInterval);
+ }
+
+ setTimeout(test, 0);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/ChangeLog 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -1,3 +1,41 @@
</span><ins>+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>
+
+ Reviewed by Youenn Fablet.
+
+ No new tests, fast/mediastream/MediaStream-page-muted.html was updated.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::~MediaStream): Fix a typo.
+ (WebCore::MediaStream::pageMutedStateDidChange): Don't store muted state, let the private
+ stream store it.
+ (WebCore::MediaStream::mediaState): Deal with new muted state flags.
+ * Modules/mediastream/MediaStream.h:
+
+ * dom/Document.cpp:
+ (WebCore::Document::prepareForDestruction): Clear media state before the frame is cleared.
+
+ * page/MediaProducer.h: Add muted flags.
+
+ * platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm:
+ (WebCore::MediaPlayerPrivateMediaStreamAVFObjC::checkSelectedVideoTrack): The display layer
+ should not be visible when the video track is muted.
+
+ * platform/mediastream/MediaStreamPrivate.cpp:
+ (WebCore::MediaStreamPrivate::addTrack): Mute the new track if necessary.
+ (WebCore::MediaStreamPrivate::startProducingData): Do nothing when muted.
+ (WebCore::MediaStreamPrivate::setExternallyMuted): New, mute/unmute tracks.
+ * platform/mediastream/MediaStreamPrivate.h:
+
+ * platform/mediastream/RealtimeMediaSource.cpp:
+ (WebCore::RealtimeMediaSource::setMuted): Start/stop producing data.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::pageMediaState): Support new media stream muted flags.
+
</ins><span class="cx"> 2017-04-05 Andreas Kling <akling@apple.com>
</span><span class="cx">
</span><span class="cx"> Make inactive web processes behave as though under memory pressure.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -104,7 +104,7 @@
</span><span class="cx">
</span><span class="cx"> MediaStream::~MediaStream()
</span><span class="cx"> {
</span><del>- // Set isActive to false immediately so an callbacks triggered by shutting down, e.g.
</del><ins>+ // Set isActive to false immediately so any callbacks triggered by shutting down, e.g.
</ins><span class="cx"> // mediaState(), are short circuited.
</span><span class="cx"> m_isActive = false;
</span><span class="cx"> MediaStreamRegistry::shared().unregisterStream(*this);
</span><span class="lines">@@ -300,15 +300,7 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool pageMuted = document->page()->isMediaCaptureMuted();
- if (m_externallyMuted == pageMuted)
- return;
-
- m_externallyMuted = pageMuted;
- if (pageMuted)
- stopProducingData();
- else
- startProducingData();
</del><ins>+ m_private->setMuted(document->page()->isMediaCaptureMuted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags MediaStream::mediaState() const
</span><span class="lines">@@ -320,14 +312,22 @@
</span><span class="cx">
</span><span class="cx"> if (m_private->hasAudio()) {
</span><span class="cx"> state |= HasAudioOrVideo;
</span><del>- if (m_private->hasCaptureAudioSource() && m_private->isProducingData())
- state |= HasActiveAudioCaptureDevice;
</del><ins>+ if (m_private->hasCaptureAudioSource()) {
+ if (m_private->isProducingData())
+ state |= HasActiveAudioCaptureDevice;
+ else if (m_private->muted())
+ state |= HasMutedAudioCaptureDevice;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (m_private->hasVideo()) {
</span><span class="cx"> state |= HasAudioOrVideo;
</span><del>- if (m_private->hasCaptureVideoSource() && m_private->isProducingData())
- state |= HasActiveVideoCaptureDevice;
</del><ins>+ if (m_private->hasCaptureVideoSource()) {
+ if (m_private->isProducingData())
+ state |= HasActiveVideoCaptureDevice;
+ else if (m_private->muted())
+ state |= HasMutedVideoCaptureDevice;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return state;
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.h (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.h 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -157,7 +157,6 @@
</span><span class="cx">
</span><span class="cx"> bool m_isActive { false };
</span><span class="cx"> bool m_isMuted { true };
</span><del>- bool m_externallyMuted { false };
</del><span class="cx"> bool m_isWaitingUntilMediaCanStart { false };
</span><span class="cx"> };
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoredomDocumentcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/dom/Document.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/dom/Document.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/dom/Document.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -2267,6 +2267,11 @@
</span><span class="cx">
</span><span class="cx"> m_cachedResourceLoader->stopUnusedPreloadsTimer();
</span><span class="cx">
</span><ins>+ if (page() && m_mediaState != MediaProducer::IsNotPlaying) {
+ m_mediaState = MediaProducer::IsNotPlaying;
+ page()->updateIsPlayingMedia(HTMLMediaElementInvalidID);
+ }
+
</ins><span class="cx"> detachFromFrame();
</span><span class="cx">
</span><span class="cx"> m_hasPreparedForDestruction = true;
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaProducer.h (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaProducer.h 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/page/MediaProducer.h 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -44,6 +44,8 @@
</span><span class="cx"> HasAudioOrVideo = 1 << 10,
</span><span class="cx"> HasActiveAudioCaptureDevice = 1 << 11,
</span><span class="cx"> HasActiveVideoCaptureDevice = 1 << 12,
</span><ins>+ HasMutedAudioCaptureDevice = 1 << 13,
+ HasMutedVideoCaptureDevice = 1 << 14,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned MediaStateFlags;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformgraphicsavfoundationobjcMediaPlayerPrivateMediaStreamAVFObjCmm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/platform/graphics/avfoundation/objc/MediaPlayerPrivateMediaStreamAVFObjC.mm 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -950,7 +950,7 @@
</span><span class="cx"> if (oldVideoTrack != m_activeVideoTrack)
</span><span class="cx"> m_imagePainter.reset();
</span><span class="cx"> ensureLayers();
</span><del>- m_sampleBufferDisplayLayer.get().hidden = hideVideoLayer;
</del><ins>+ m_sampleBufferDisplayLayer.get().hidden = hideVideoLayer || m_displayMode < PausedImage;
</ins><span class="cx"> m_pendingSelectedTrackCheck = false;
</span><span class="cx"> updateDisplayMode();
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivatecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -134,6 +134,9 @@
</span><span class="cx"> if (m_trackSet.contains(track->id()))
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (m_muted)
+ track->stopProducingData();
+
</ins><span class="cx"> track->addObserver(*this);
</span><span class="cx"> m_trackSet.add(track->id(), track);
</span><span class="cx">
</span><span class="lines">@@ -162,6 +165,9 @@
</span><span class="cx">
</span><span class="cx"> void MediaStreamPrivate::startProducingData()
</span><span class="cx"> {
</span><ins>+ if (m_muted)
+ return;
+
</ins><span class="cx"> for (auto& track : m_trackSet.values())
</span><span class="cx"> track->startProducingData();
</span><span class="cx"> }
</span><span class="lines">@@ -181,6 +187,18 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MediaStreamPrivate::setMuted(bool muted)
+{
+ if (m_muted == muted)
+ return;
+
+ m_muted = muted;
+ for (auto& track : m_trackSet.values()) {
+ if (track->isCaptureTrack())
+ track->setMuted(muted);
+ }
+}
+
</ins><span class="cx"> bool MediaStreamPrivate::hasVideo() const
</span><span class="cx"> {
</span><span class="cx"> for (auto& track : m_trackSet.values()) {
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamMediaStreamPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/platform/mediastream/MediaStreamPrivate.h 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -95,6 +95,8 @@
</span><span class="cx">
</span><span class="cx"> bool hasVideo() const;
</span><span class="cx"> bool hasAudio() const;
</span><ins>+
+ void setMuted(bool);
</ins><span class="cx"> bool muted() const;
</span><span class="cx">
</span><span class="cx"> bool hasCaptureVideoSource() const;
</span><span class="lines">@@ -134,6 +136,7 @@
</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><ins>+ bool m_muted { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> typedef Vector<RefPtr<MediaStreamPrivate>> MediaStreamPrivateVector;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -91,6 +91,13 @@
</span><span class="cx"> if (stopped())
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ if (muted) {
+ // FIXME: We need to figure out how to guarantee that at least one black video frame is
+ // emitted after being muted.
+ stopProducingData();
+ } else
+ startProducingData();
+
</ins><span class="cx"> for (auto& observer : m_observers)
</span><span class="cx"> observer->sourceMutedChanged();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebCore/testing/Internals.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -3523,6 +3523,10 @@
</span><span class="cx"> string.append("HasActiveAudioCaptureDevice,");
</span><span class="cx"> if (state & MediaProducer::HasActiveVideoCaptureDevice)
</span><span class="cx"> string.append("HasActiveVideoCaptureDevice,");
</span><ins>+ if (state & MediaProducer::HasMutedAudioCaptureDevice)
+ string.append("HasMutedAudioCaptureDevice,");
+ if (state & MediaProducer::HasMutedVideoCaptureDevice)
+ string.append("HasMutedVideoCaptureDevice,");
</ins><span class="cx">
</span><span class="cx"> if (string.isEmpty())
</span><span class="cx"> string.append("IsNotPlaying");
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebKit2/ChangeLog 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+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>
+
+ Reviewed by Youenn Fablet.
+
+ * UIProcess/API/C/WKPage.cpp:
+ (WKPageGetMediaState): Support new media stream state flags.
+ * UIProcess/API/C/WKPagePrivate.h:
+ * UIProcess/API/Cocoa/WKWebViewPrivate.h: Ditto.
+ * UIProcess/Cocoa/UIDelegate.mm: Ditto.
+
</ins><span class="cx"> 2017-04-05 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Refactor so WebsiteDataStores always have a StorageManager.
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -2813,6 +2813,10 @@
</span><span class="cx"> state |= kWKMediaHasActiveAudioCaptureDevice;
</span><span class="cx"> if (coreState & WebCore::MediaProducer::HasActiveVideoCaptureDevice)
</span><span class="cx"> state |= kWKMediaHasActiveVideoCaptureDevice;
</span><ins>+ if (coreState & WebCore::MediaProducer::HasMutedAudioCaptureDevice)
+ state |= kWKMediaHasMutedAudioCaptureDevice;
+ if (coreState & WebCore::MediaProducer::HasMutedVideoCaptureDevice)
+ state |= kWKMediaHasMutedVideoCaptureDevice;
</ins><span class="cx">
</span><span class="cx"> return state;
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagePrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -137,6 +137,8 @@
</span><span class="cx"> kWKMediaIsPlayingVideo = 1 << 1,
</span><span class="cx"> kWKMediaHasActiveAudioCaptureDevice = 1 << 2,
</span><span class="cx"> kWKMediaHasActiveVideoCaptureDevice = 1 << 3,
</span><ins>+ kWKMediaHasMutedAudioCaptureDevice = 1 << 4,
+ kWKMediaHasMutedVideoCaptureDevice = 1 << 5,
</ins><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaState;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICocoaWKWebViewPrivateh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebKit2/UIProcess/API/Cocoa/WKWebViewPrivate.h 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -41,8 +41,10 @@
</span><span class="cx">
</span><span class="cx"> typedef NS_OPTIONS(NSInteger, _WKMediaCaptureState) {
</span><span class="cx"> _WKMediaCaptureStateNone = 0,
</span><del>- _WKMediaCaptureStateMicrophone = 1 << 0,
- _WKMediaCaptureStateCamera = 1 << 1,
</del><ins>+ _WKMediaCaptureStateActiveMicrophone = 1 << 0,
+ _WKMediaCaptureStateActiveCamera = 1 << 1,
+ _WKMediaCaptureStateMutedMicrophone = 1 << 2,
+ _WKMediaCaptureStateMutedCamera = 1 << 3,
</ins><span class="cx"> } WK_API_AVAILABLE(macosx(WK_MAC_TBA), ios(WK_IOS_TBA));
</span><span class="cx">
</span><span class="cx"> #if !TARGET_OS_IPHONE
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessCocoaUIDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm (214975 => 214976)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2017-04-05 23:12:46 UTC (rev 214975)
+++ trunk/Source/WebKit2/UIProcess/Cocoa/UIDelegate.mm 2017-04-05 23:22:20 UTC (rev 214976)
</span><span class="lines">@@ -443,9 +443,13 @@
</span><span class="cx">
</span><span class="cx"> _WKMediaCaptureState mediaCaptureState = _WKMediaCaptureStateNone;
</span><span class="cx"> if (state & WebCore::MediaProducer::HasActiveAudioCaptureDevice)
</span><del>- mediaCaptureState |= _WKMediaCaptureStateMicrophone;
</del><ins>+ mediaCaptureState |= _WKMediaCaptureStateActiveMicrophone;
</ins><span class="cx"> if (state & WebCore::MediaProducer::HasActiveVideoCaptureDevice)
</span><del>- mediaCaptureState |= _WKMediaCaptureStateCamera;
</del><ins>+ mediaCaptureState |= _WKMediaCaptureStateActiveCamera;
+ if (state & WebCore::MediaProducer::HasActiveAudioCaptureDevice)
+ mediaCaptureState |= _WKMediaCaptureStateMutedMicrophone;
+ if (state & WebCore::MediaProducer::HasMutedVideoCaptureDevice)
+ mediaCaptureState |= _WKMediaCaptureStateMutedCamera;
</ins><span class="cx">
</span><span class="cx"> [(id <WKUIDelegatePrivate>)delegate _webView:webView mediaCaptureStateDidChange:mediaCaptureState];
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>