<!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>[207764] 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/207764">207764</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-24 10:53:12 -0700 (Mon, 24 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Separate media capture and audio playback muting
https://bugs.webkit.org/show_bug.cgi?id=163855
<rdar://problem/28827186>
Reviewed by Darin Adler.
Source/WebCore:
Test: fast/mediastream/MediaStream-page-muted.html
Change page.muted from a bool to a bitfield so audio and media capture muted are independent.
Fix a couple of bugs in the mock media capture device uncovered by new test case.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::pageMutedStateDidChange): page.isMuted -> page.mutedState.
* Modules/webaudio/AudioContext.cpp:
(WebCore::AudioContext::pageMutedStateDidChange): Ditto.
* html/HTMLMediaElement.cpp:
(WebCore::HTMLMediaElement::updateVolume): Ditto.
(WebCore::HTMLMediaElement::effectiveMuted): Ditto.
* page/MediaProducer.h: Add MutedState enum.
* page/Page.cpp:
(WebCore::Page::Page):
(WebCore::Page::setMuted): Take MutedStateFlags instead of bool. m_muted -> m_mutedState.
* page/Page.h:
* platform/mock/MockRealtimeMediaSource.cpp:
(WebCore::MockRealtimeMediaSource::startProducingData): Call setMuted.
(WebCore::MockRealtimeMediaSource::stopProducingData): Ditto.
* platform/mock/MockRealtimeMediaSource.h:
* platform/mock/MockRealtimeVideoSource.cpp:
(WebCore::MockRealtimeVideoSource::stopProducingData): Call correct base class method.
* testing/Internals.cpp:
(WebCore::Internals::setPageMuted): Change parameter from a bool to a string.
* testing/Internals.h:
* testing/Internals.idl:
Source/WebKit2:
* Shared/WebPageCreationParameters.h: Change 'muted' from bool to MutedStateFlags.
* UIProcess/API/C/WKPage.cpp: Change parameter from bool to WKMediaMutedState.
(WKPageSetMuted):
* UIProcess/API/C/WKPagePrivate.h: Define WKMediaMutedState.
* UIProcess/WebPageProxy.cpp:
(WebKit::WebPageProxy::WebPageProxy):
(WebKit::WebPageProxy::setMuted): m_muted -> m_mutedState.
(WebKit::WebPageProxy::creationParameters): Ditto.
* UIProcess/WebPageProxy.h:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::isMuted): page.isMuted -> page.mutedState.
* WebProcess/WebPage/WebPage.messages.in: Change SetMuted parameter.
LayoutTests:
* fast/mediastream/MediaStream-page-muted-expected.txt: Added.
* fast/mediastream/MediaStream-page-muted.html: Added.
* media/video-muted-after-setting-page-muted-state.html: Updated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsmediavideomutedaftersettingpagemutedstatehtml">trunk/LayoutTests/media/video-muted-after-setting-page-muted-state.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="#trunkSourceWebCoreModuleswebaudioAudioContextcpp">trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLMediaElementcpp">trunk/Source/WebCore/html/HTMLMediaElement.cpp</a></li>
<li><a href="#trunkSourceWebCorepageMediaProducerh">trunk/Source/WebCore/page/MediaProducer.h</a></li>
<li><a href="#trunkSourceWebCorepagePagecpp">trunk/Source/WebCore/page/Page.cpp</a></li>
<li><a href="#trunkSourceWebCorepagePageh">trunk/Source/WebCore/page/Page.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh">trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h</a></li>
<li><a href="#trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp">trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalscpp">trunk/Source/WebCore/testing/Internals.cpp</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsh">trunk/Source/WebCore/testing/Internals.h</a></li>
<li><a href="#trunkSourceWebCoretestingInternalsidl">trunk/Source/WebCore/testing/Internals.idl</a></li>
<li><a href="#trunkSourceWebKit2ChangeLog">trunk/Source/WebKit2/ChangeLog</a></li>
<li><a href="#trunkSourceWebKit2SharedWebPageCreationParametersh">trunk/Source/WebKit2/Shared/WebPageCreationParameters.h</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="#trunkSourceWebKit2UIProcessWebPageProxycpp">trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp</a></li>
<li><a href="#trunkSourceWebKit2UIProcessWebPageProxyh">trunk/Source/WebKit2/UIProcess/WebPageProxy.h</a></li>
<li><a href="#trunkSourceWebKit2WebProcessPluginsPluginViewcpp">trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp</a></li>
<li><a href="#trunkSourceWebKit2WebProcessWebPageWebPagemessagesin">trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/LayoutTests/ChangeLog 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-24 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Separate media capture and audio playback muting
+ https://bugs.webkit.org/show_bug.cgi?id=163855
+ <rdar://problem/28827186>
+
+ Reviewed by Darin Adler.
+
+ * fast/mediastream/MediaStream-page-muted-expected.txt: Added.
+ * fast/mediastream/MediaStream-page-muted.html: Added.
+ * media/video-muted-after-setting-page-muted-state.html: Updated.
+
</ins><span class="cx"> 2016-10-24 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Activate WEB_RTC compilation flags for Mac bots
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (0 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -0,0 +1,29 @@
</span><ins>+Test enabling/disabling mock media capture devices
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+
+*** Mock capture devices should be enabled by default
+PASS mediaStream is an instance of Object
+PASS mediaStream.getTracks().length is 2
+
+*** Muting capture devices
+EVENT: mute
+PASS event.target.muted is true
+
+EVENT: mute
+PASS event.target.muted is true
+
+
+*** Unmuting capture devices
+EVENT: unmute
+PASS event.target.muted is false
+
+EVENT: unmute
+PASS event.target.muted is false
+
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html (0 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html (rev 0)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -0,0 +1,80 @@
</span><ins>+<!DOCTYPE HTML>
+<html>
+ <head>
+ <script src="../../resources/js-test-pre.js"></script>
+ <script>
+ let mediaStream;
+ let eventCount = 0;
+
+ function muteChanged(ev)
+ {
+ event = ev;
+ debug(`EVENT: ${ev.type}`);
+ shouldBe('event.target.muted', (ev.type == "mute").toString());
+ debug("");
+
+ if (++eventCount == 2) {
+ eventCount = 0;
+
+ if (ev.type == "unmute") {
+ finishJSTest();
+ return;
+ }
+
+ if (window.internals) {
+ debug("<br>*** Unmuting capture devices");
+ internals.setPageMuted("");
+ }
+ }
+ }
+
+ function testWhenEnabled()
+ {
+ navigator.mediaDevices
+ .getUserMedia({audio:{}, video:{}})
+ .then(stream => {
+ mediaStream = stream;
+ shouldBeType("mediaStream", "Object");
+ shouldBe("mediaStream.getTracks().length", "2");
+
+ var tracks = mediaStream.getTracks();
+ for (var i = 0; i < tracks.length; i++) {
+ tracks[i].onmute = muteChanged;
+ tracks[i].onunmute = muteChanged;
+ }
+
+ if (window.internals) {
+ debug("<br>*** Muting capture devices");
+ internals.setPageMuted("capturedevices");
+ }
+ })
+ .catch((err) => {
+ testFailed(`mediaDevices.getUserMedia() failed with ${err.name}`);
+ finishJSTest();
+ });
+ }
+
+ function start()
+ {
+ debug(`<br>*** Mock capture devices should be enabled by default`);
+ if (window.testRunner)
+ testRunner.setUserMediaPermission(true);
+
+ testWhenEnabled();
+ }
+
+ </script>
+ </head>
+
+ <body onload="start()">
+ <p id="description"></p>
+ <div id="console"></div>
+ <script>
+ description("Test enabling/disabling mock media capture devices");
+ window.jsTestIsAsync = true;
+
+ window.successfullyParsed = true;
+ </script>
+ <script src="../../resources/js-test-post.js"></script>
+ </body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsmediavideomutedaftersettingpagemutedstatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/video-muted-after-setting-page-muted-state.html (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/video-muted-after-setting-page-muted-state.html 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/LayoutTests/media/video-muted-after-setting-page-muted-state.html 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -5,13 +5,13 @@
</span><span class="cx"> <script>
</span><span class="cx"> testExpected("video.muted", false);
</span><span class="cx"> if (window.internals)
</span><del>- internals.setPageMuted(true);
</del><ins>+ internals.setPageMuted("audio");
</ins><span class="cx"> testExpected("video.muted", false);
</span><span class="cx">
</span><span class="cx"> run("video.muted = true");
</span><span class="cx"> testExpected("video.muted", true);
</span><span class="cx"> if (window.internals)
</span><del>- internals.setPageMuted(false);
</del><ins>+ internals.setPageMuted("");
</ins><span class="cx"> testExpected("video.muted", true);
</span><span class="cx"> endTest();
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/ChangeLog 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -1,3 +1,47 @@
</span><ins>+2016-10-24 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Separate media capture and audio playback muting
+ https://bugs.webkit.org/show_bug.cgi?id=163855
+ <rdar://problem/28827186>
+
+ Reviewed by Darin Adler.
+
+ Test: fast/mediastream/MediaStream-page-muted.html
+
+ Change page.muted from a bool to a bitfield so audio and media capture muted are independent.
+ Fix a couple of bugs in the mock media capture device uncovered by new test case.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::pageMutedStateDidChange): page.isMuted -> page.mutedState.
+
+ * Modules/webaudio/AudioContext.cpp:
+ (WebCore::AudioContext::pageMutedStateDidChange): Ditto.
+
+ * html/HTMLMediaElement.cpp:
+ (WebCore::HTMLMediaElement::updateVolume): Ditto.
+ (WebCore::HTMLMediaElement::effectiveMuted): Ditto.
+
+ * page/MediaProducer.h: Add MutedState enum.
+
+ * page/Page.cpp:
+ (WebCore::Page::Page):
+ (WebCore::Page::setMuted): Take MutedStateFlags instead of bool. m_muted -> m_mutedState.
+ * page/Page.h:
+
+ * platform/mock/MockRealtimeMediaSource.cpp:
+ (WebCore::MockRealtimeMediaSource::startProducingData): Call setMuted.
+ (WebCore::MockRealtimeMediaSource::stopProducingData): Ditto.
+ * platform/mock/MockRealtimeMediaSource.h:
+
+ * platform/mock/MockRealtimeVideoSource.cpp:
+ (WebCore::MockRealtimeVideoSource::stopProducingData): Call correct base class method.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::setPageMuted): Change parameter from a bool to a string.
+ * testing/Internals.h:
+
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-10-24 Darin Adler <darin@apple.com>
</span><span class="cx">
</span><span class="cx"> Try to fix Windows build.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -256,7 +256,7 @@
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- bool pageMuted = document->page()->isMuted();
</del><ins>+ bool pageMuted = document->page()->isMediaCaptureMuted();
</ins><span class="cx"> if (m_externallyMuted == pageMuted)
</span><span class="cx"> return;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModuleswebaudioAudioContextcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/Modules/webaudio/AudioContext.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -973,7 +973,7 @@
</span><span class="cx"> void AudioContext::pageMutedStateDidChange()
</span><span class="cx"> {
</span><span class="cx"> if (m_destinationNode && document()->page())
</span><del>- m_destinationNode->setMuted(document()->page()->isMuted());
</del><ins>+ m_destinationNode->setMuted(document()->page()->isAudioMuted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void AudioContext::isPlayingAudioDidChange()
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLMediaElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLMediaElement.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/html/HTMLMediaElement.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -4846,7 +4846,7 @@
</span><span class="cx">
</span><span class="cx"> if (m_mediaController) {
</span><span class="cx"> volumeMultiplier *= m_mediaController->volume();
</span><del>- shouldMute = m_mediaController->muted() || (page && page->isMuted());
</del><ins>+ shouldMute = m_mediaController->muted() || (page && page->isAudioMuted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="lines">@@ -7007,7 +7007,7 @@
</span><span class="cx">
</span><span class="cx"> bool HTMLMediaElement::effectiveMuted() const
</span><span class="cx"> {
</span><del>- return muted() || (document().page() && document().page()->isMuted());
</del><ins>+ return muted() || (document().page() && document().page()->isAudioMuted());
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void HTMLMediaElement::updateAudioAssertionState()
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaProducer.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaProducer.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/page/MediaProducer.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -48,6 +48,14 @@
</span><span class="cx"> typedef unsigned MediaStateFlags;
</span><span class="cx">
</span><span class="cx"> virtual MediaStateFlags mediaState() const = 0;
</span><ins>+
+ enum MutedState {
+ NoneMuted = 0,
+ AudioIsMuted = 1 << 0,
+ CaptureDevicesAreMuted = 1 << 1,
+ };
+ typedef unsigned MutedStateFlags;
+
</ins><span class="cx"> virtual void pageMutedStateDidChange() = 0;
</span><span class="cx">
</span><span class="cx"> protected:
</span></span></pre></div>
<a id="trunkSourceWebCorepagePagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/page/Page.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -193,7 +193,6 @@
</span><span class="cx"> , m_inLowQualityInterpolationMode(false)
</span><span class="cx"> , m_areMemoryCacheClientCallsEnabled(true)
</span><span class="cx"> , m_mediaVolume(1)
</span><del>- , m_muted(false)
</del><span class="cx"> , m_pageScaleFactor(1)
</span><span class="cx"> , m_zoomedOutPageScaleFactor(0)
</span><span class="cx"> , m_topContentInset(0)
</span><span class="lines">@@ -1381,12 +1380,12 @@
</span><span class="cx"> chrome().client().isPlayingMediaDidChange(state, sourceElementID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Page::setMuted(bool muted)
</del><ins>+void Page::setMuted(MediaProducer::MutedStateFlags muted)
</ins><span class="cx"> {
</span><del>- if (m_muted == muted)
</del><ins>+ if (m_mutedState == muted)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_muted = muted;
</del><ins>+ m_mutedState = muted;
</ins><span class="cx">
</span><span class="cx"> for (Frame* frame = &mainFrame(); frame; frame = frame->tree().traverseNext()) {
</span><span class="cx"> if (!frame->document())
</span></span></pre></div>
<a id="trunkSourceWebCorepagePageh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/Page.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/Page.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/page/Page.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -480,8 +480,10 @@
</span><span class="cx">
</span><span class="cx"> MediaProducer::MediaStateFlags mediaState() const { return m_mediaState; }
</span><span class="cx"> void updateIsPlayingMedia(uint64_t);
</span><del>- bool isMuted() const { return m_muted; }
- WEBCORE_EXPORT void setMuted(bool);
</del><ins>+ MediaProducer::MutedStateFlags mutedState() const { return m_mutedState; }
+ bool isAudioMuted() const { return m_mutedState & MediaProducer::AudioIsMuted; }
+ bool isMediaCaptureMuted() const { return m_mutedState & MediaProducer::CaptureDevicesAreMuted; };
+ WEBCORE_EXPORT void setMuted(MediaProducer::MutedStateFlags);
</ins><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span><span class="cx"> WEBCORE_EXPORT void handleMediaEvent(MediaEventType);
</span><span class="lines">@@ -609,7 +611,7 @@
</span><span class="cx"> bool m_inLowQualityInterpolationMode;
</span><span class="cx"> bool m_areMemoryCacheClientCallsEnabled;
</span><span class="cx"> float m_mediaVolume;
</span><del>- bool m_muted;
</del><ins>+ MediaProducer::MutedStateFlags m_mutedState { MediaProducer::NoneMuted };
</ins><span class="cx">
</span><span class="cx"> float m_pageScaleFactor;
</span><span class="cx"> float m_zoomedOutPageScaleFactor;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmediastreamRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/platform/mediastream/RealtimeMediaSource.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> void RealtimeMediaSource::setMuted(bool muted)
</span><span class="cx"> {
</span><del>- if (m_muted == muted)
</del><ins>+ if (m_stopped || m_muted == muted)
</ins><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> m_muted = muted;
</span><span class="lines">@@ -150,7 +150,6 @@
</span><span class="cx"> stop(callingObserver);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#if 1
</del><span class="cx"> double RealtimeMediaSource::fitnessDistance(const MediaConstraint& constraint)
</span><span class="cx"> {
</span><span class="cx"> RealtimeMediaSourceCapabilities& capabilities = *this->capabilities();
</span><span class="lines">@@ -275,7 +274,6 @@
</span><span class="cx">
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>-#endif
</del><span class="cx">
</span><span class="cx"> template <typename ValueType>
</span><span class="cx"> static void applyNumericConstraint(const NumericConstraint<ValueType>& constraint, ValueType current, ValueType capabilityMin, ValueType capabilityMax, RealtimeMediaSource* source, void (RealtimeMediaSource::*applier)(ValueType))
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -124,6 +124,18 @@
</span><span class="cx"> return m_supportedConstraints;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+void MockRealtimeMediaSource::startProducingData()
+{
+ m_isProducingData = true;
+ setMuted(false);
+}
+
+void MockRealtimeMediaSource::stopProducingData()
+{
+ m_isProducingData = false;
+ setMuted(true);
+}
+
</ins><span class="cx"> } // namespace WebCore
</span><span class="cx">
</span><span class="cx"> #endif // ENABLE(MEDIA_STREAM)
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeMediaSourceh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeMediaSource.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -69,8 +69,8 @@
</span><span class="cx"> virtual void initializeCapabilities(RealtimeMediaSourceCapabilities&) = 0;
</span><span class="cx"> virtual void initializeSupportedConstraints(RealtimeMediaSourceSupportedConstraints&) = 0;
</span><span class="cx">
</span><del>- void startProducingData() override { m_isProducingData = true; }
- void stopProducingData() override { m_isProducingData = false; }
</del><ins>+ void startProducingData() override;
+ void stopProducingData() override;
</ins><span class="cx">
</span><span class="cx"> RefPtr<RealtimeMediaSourceCapabilities> capabilities() override;
</span><span class="cx"> const RealtimeMediaSourceSettings& settings() override;
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformmockMockRealtimeVideoSourcecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/platform/mock/MockRealtimeVideoSource.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -85,7 +85,7 @@
</span><span class="cx">
</span><span class="cx"> void MockRealtimeVideoSource::stopProducingData()
</span><span class="cx"> {
</span><del>- MockRealtimeMediaSource::startProducingData();
</del><ins>+ MockRealtimeMediaSource::stopProducingData();
</ins><span class="cx"> m_timer.stop();
</span><span class="cx"> m_elapsedTime += monotonicallyIncreasingTime() - m_startTime;
</span><span class="cx"> m_startTime = NAN;
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -86,6 +86,7 @@
</span><span class="cx"> #include "MainFrame.h"
</span><span class="cx"> #include "MallocStatistics.h"
</span><span class="cx"> #include "MediaPlayer.h"
</span><ins>+#include "MediaProducer.h"
</ins><span class="cx"> #include "MemoryCache.h"
</span><span class="cx"> #include "MemoryInfo.h"
</span><span class="cx"> #include "MemoryPressureHandler.h"
</span><span class="lines">@@ -2945,14 +2946,24 @@
</span><span class="cx"> return MockPageOverlayClient::singleton().layerTreeAsText(document->frame()->mainFrame());
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void Internals::setPageMuted(bool muted)
</del><ins>+void Internals::setPageMuted(const String& states)
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document)
</span><span class="cx"> return;
</span><span class="cx">
</span><ins>+ WebCore::MediaProducer::MutedStateFlags state = MediaProducer::NoneMuted;
+ Vector<String> stateString;
+ states.split(',', false, stateString);
+ for (auto& muteString : stateString) {
+ if (equalLettersIgnoringASCIICase(muteString, "audio"))
+ state |= MediaProducer::AudioIsMuted;
+ if (equalLettersIgnoringASCIICase(muteString, "capturedevices"))
+ state |= MediaProducer::CaptureDevicesAreMuted;
+ }
+
</ins><span class="cx"> if (Page* page = document->page())
</span><del>- page->setMuted(muted);
</del><ins>+ page->setMuted(state);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> bool Internals::isPagePlayingAudio()
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/testing/Internals.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -440,7 +440,7 @@
</span><span class="cx"> ExceptionOr<Ref<MockPageOverlay>> installMockPageOverlay(PageOverlayType);
</span><span class="cx"> ExceptionOr<String> pageOverlayLayerTreeAsText() const;
</span><span class="cx">
</span><del>- void setPageMuted(bool);
</del><ins>+ void setPageMuted(const String&);
</ins><span class="cx"> bool isPagePlayingAudio();
</span><span class="cx">
</span><span class="cx"> void setPageDefersLoading(bool);
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx"> [MayThrowException] MockPageOverlay installMockPageOverlay(PageOverlayType type);
</span><span class="cx"> [MayThrowException] DOMString pageOverlayLayerTreeAsText();
</span><span class="cx">
</span><del>- void setPageMuted(boolean muted);
</del><ins>+ void setPageMuted(DOMString mutedState);
</ins><span class="cx"> boolean isPagePlayingAudio();
</span><span class="cx">
</span><span class="cx"> void setPageDefersLoading(boolean defersLoading);
</span></span></pre></div>
<a id="trunkSourceWebKit2ChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/ChangeLog (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/ChangeLog 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -1,3 +1,28 @@
</span><ins>+2016-10-24 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Separate media capture and audio playback muting
+ https://bugs.webkit.org/show_bug.cgi?id=163855
+ <rdar://problem/28827186>
+
+ Reviewed by Darin Adler.
+
+ * Shared/WebPageCreationParameters.h: Change 'muted' from bool to MutedStateFlags.
+
+ * UIProcess/API/C/WKPage.cpp: Change parameter from bool to WKMediaMutedState.
+ (WKPageSetMuted):
+ * UIProcess/API/C/WKPagePrivate.h: Define WKMediaMutedState.
+
+ * UIProcess/WebPageProxy.cpp:
+ (WebKit::WebPageProxy::WebPageProxy):
+ (WebKit::WebPageProxy::setMuted): m_muted -> m_mutedState.
+ (WebKit::WebPageProxy::creationParameters): Ditto.
+ * UIProcess/WebPageProxy.h:
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::isMuted): page.isMuted -> page.mutedState.
+
+ * WebProcess/WebPage/WebPage.messages.in: Change SetMuted parameter.
+
</ins><span class="cx"> 2016-10-24 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><span class="cx"> Activate WEB_RTC compilation flags for Mac bots
</span></span></pre></div>
<a id="trunkSourceWebKit2SharedWebPageCreationParametersh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/Shared/WebPageCreationParameters.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/Shared/WebPageCreationParameters.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -35,6 +35,7 @@
</span><span class="cx"> #include <WebCore/Color.h>
</span><span class="cx"> #include <WebCore/FloatSize.h>
</span><span class="cx"> #include <WebCore/IntSize.h>
</span><ins>+#include <WebCore/MediaProducer.h>
</ins><span class="cx"> #include <WebCore/Pagination.h>
</span><span class="cx"> #include <WebCore/ScrollTypes.h>
</span><span class="cx"> #include <WebCore/SessionID.h>
</span><span class="lines">@@ -99,7 +100,7 @@
</span><span class="cx"> float topContentInset;
</span><span class="cx">
</span><span class="cx"> float mediaVolume;
</span><del>- bool muted;
</del><ins>+ WebCore::MediaProducer::MutedStateFlags muted;
</ins><span class="cx"> bool mayStartMediaWhenInWindow;
</span><span class="cx">
</span><span class="cx"> WebCore::IntSize minimumLayoutSize;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessAPICWKPagecpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -2601,7 +2601,7 @@
</span><span class="cx"> toImpl(page)->setMediaVolume(volume);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WKPageSetMuted(WKPageRef page, bool muted)
</del><ins>+void WKPageSetMuted(WKPageRef page, WKMediaMutedState muted)
</ins><span class="cx"> {
</span><span class="cx"> toImpl(page)->setMuted(muted);
</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 (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -120,9 +120,16 @@
</span><span class="cx"> WK_EXPORT void WKPageSetAddsVisitedLinks(WKPageRef page, bool visitedLinks);
</span><span class="cx">
</span><span class="cx"> WK_EXPORT bool WKPageIsPlayingAudio(WKPageRef page);
</span><del>-WK_EXPORT void WKPageSetMuted(WKPageRef page, bool muted);
</del><span class="cx">
</span><span class="cx"> enum {
</span><ins>+ kWKMediaNoneMuted = 0,
+ kWKMediaAudioMuted = 1 << 0,
+ kWKMediaCaptureDevicesMuted = 1 << 1,
+};
+typedef uint32_t WKMediaMutedState;
+WK_EXPORT void WKPageSetMuted(WKPageRef page, WKMediaMutedState muted);
+
+enum {
</ins><span class="cx"> kWKMediaIsNotPlaying = 0,
</span><span class="cx"> kWKMediaIsPlayingAudio = 1 << 0,
</span><span class="cx"> kWKMediaIsPlayingVideo = 1 << 1,
</span><span class="lines">@@ -130,6 +137,7 @@
</span><span class="cx"> };
</span><span class="cx"> typedef uint32_t WKMediaState;
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> WK_EXPORT WKMediaState WKPageGetMediaState(WKPageRef page);
</span><span class="cx">
</span><span class="cx"> enum {
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxycpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -444,7 +444,6 @@
</span><span class="cx"> , m_suppressVisibilityUpdates(false)
</span><span class="cx"> , m_autoSizingShouldExpandToViewHeight(false)
</span><span class="cx"> , m_mediaVolume(1)
</span><del>- , m_muted(false)
</del><span class="cx"> , m_mayStartMediaWhenInWindow(true)
</span><span class="cx"> , m_waitingForDidUpdateViewState(false)
</span><span class="cx"> #if PLATFORM(COCOA)
</span><span class="lines">@@ -1588,7 +1587,7 @@
</span><span class="cx">
</span><span class="cx"> // We should suppress if the page is not active, is visually idle, and supression is enabled.
</span><span class="cx"> bool isLoading = m_pageLoadState.isLoading();
</span><del>- bool isPlayingAudio = m_mediaState & MediaProducer::IsPlayingAudio && !m_muted;
</del><ins>+ bool isPlayingAudio = m_mediaState & MediaProducer::IsPlayingAudio && !(m_mutedState & MediaProducer::AudioIsMuted);
</ins><span class="cx"> bool pageShouldBeSuppressed = !isLoading && !isPlayingAudio && processSuppressionEnabled && (m_viewState & ViewState::IsVisuallyIdle);
</span><span class="cx"> if (m_pageSuppressed != pageShouldBeSuppressed) {
</span><span class="cx"> m_pageSuppressed = pageShouldBeSuppressed;
</span><span class="lines">@@ -4152,17 +4151,17 @@
</span><span class="cx"> m_process->send(Messages::WebPage::SetMediaVolume(volume), m_pageID);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-void WebPageProxy::setMuted(bool muted)
</del><ins>+void WebPageProxy::setMuted(WebCore::MediaProducer::MutedStateFlags state)
</ins><span class="cx"> {
</span><del>- if (m_muted == muted)
</del><ins>+ if (m_mutedState == state)
</ins><span class="cx"> return;
</span><span class="cx">
</span><del>- m_muted = muted;
</del><ins>+ m_mutedState = state;
</ins><span class="cx">
</span><span class="cx"> if (!isValid())
</span><span class="cx"> return;
</span><span class="cx">
</span><del>- m_process->send(Messages::WebPage::SetMuted(muted), m_pageID);
</del><ins>+ m_process->send(Messages::WebPage::SetMuted(state), m_pageID);
</ins><span class="cx">
</span><span class="cx"> updateThrottleState();
</span><span class="cx"> }
</span><span class="lines">@@ -5483,7 +5482,7 @@
</span><span class="cx"> parameters.viewScaleFactor = m_viewScaleFactor;
</span><span class="cx"> parameters.topContentInset = m_topContentInset;
</span><span class="cx"> parameters.mediaVolume = m_mediaVolume;
</span><del>- parameters.muted = m_muted;
</del><ins>+ parameters.muted = m_mutedState;
</ins><span class="cx"> parameters.mayStartMediaWhenInWindow = m_mayStartMediaWhenInWindow;
</span><span class="cx"> parameters.minimumLayoutSize = m_minimumLayoutSize;
</span><span class="cx"> parameters.autoSizingShouldExpandToViewHeight = m_autoSizingShouldExpandToViewHeight;
</span></span></pre></div>
<a id="trunkSourceWebKit2UIProcessWebPageProxyh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/UIProcess/WebPageProxy.h (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/UIProcess/WebPageProxy.h 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -937,7 +937,7 @@
</span><span class="cx"> void printMainFrame();
</span><span class="cx">
</span><span class="cx"> void setMediaVolume(float);
</span><del>- void setMuted(bool);
</del><ins>+ void setMuted(WebCore::MediaProducer::MutedStateFlags);
</ins><span class="cx"> void setMayStartMediaWhenInWindow(bool);
</span><span class="cx"> bool mayStartMediaWhenInWindow() const { return m_mayStartMediaWhenInWindow; }
</span><span class="cx">
</span><span class="lines">@@ -1852,7 +1852,7 @@
</span><span class="cx"> WebCore::IntSize m_minimumLayoutSize;
</span><span class="cx">
</span><span class="cx"> float m_mediaVolume;
</span><del>- bool m_muted;
</del><ins>+ WebCore::MediaProducer::MutedStateFlags m_mutedState { WebCore::MediaProducer::NoneMuted };
</ins><span class="cx"> bool m_mayStartMediaWhenInWindow;
</span><span class="cx">
</span><span class="cx"> bool m_waitingForDidUpdateViewState;
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessPluginsPluginViewcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -1531,7 +1531,7 @@
</span><span class="cx"> if (!frame() || !frame()->page())
</span><span class="cx"> return false;
</span><span class="cx">
</span><del>- return frame()->page()->isMuted();
</del><ins>+ return frame()->page()->isAudioMuted();
</ins><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebKit2WebProcessWebPageWebPagemessagesin"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in (207763 => 207764)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-24 16:48:54 UTC (rev 207763)
+++ trunk/Source/WebKit2/WebProcess/WebPage/WebPage.messages.in 2016-10-24 17:53:12 UTC (rev 207764)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">
</span><span class="cx"> # Media
</span><span class="cx"> SetMediaVolume(float volume)
</span><del>- SetMuted(bool muted)
</del><ins>+ SetMuted(WebCore::MediaProducer::MutedStateFlags muted)
</ins><span class="cx"> SetMayStartMediaWhenInWindow(bool mayStartMedia)
</span><span class="cx">
</span><span class="cx"> #if ENABLE(MEDIA_SESSION)
</span></span></pre>
</div>
</div>
</body>
</html>