<!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>[207827] 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/207827">207827</a></dd>
<dt>Author</dt> <dd>eric.carlson@apple.com</dd>
<dt>Date</dt> <dd>2016-10-25 10:34:07 -0700 (Tue, 25 Oct 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[MediaStream] Add "has capture device" bit to media state flags
https://bugs.webkit.org/show_bug.cgi?id=163952
Reviewed by Jer Noble.
Source/WebCore:
No new tests, updated fast/mediastream/MediaStream-page-muted.html and media/muted-video-is-playing-audio.html.
* Modules/mediastream/MediaStream.cpp:
(WebCore::MediaStream::mediaState): Set HasMediaCaptureDevice, only set HasActiveMediaCaptureDevice when
actually producing data.
* page/MediaProducer.h: Add HasMediaCaptureDevice bit.
* testing/Internals.cpp:
(WebCore::Internals::pageMediaState): Return a string representing MediaStateFlags.
(WebCore::Internals::isPagePlayingAudio): Deleted.
* testing/Internals.h:
* testing/Internals.idl:
LayoutTests:
* fast/mediastream/MediaStream-page-muted-expected.txt:
* fast/mediastream/MediaStream-page-muted.html:
* media/muted-video-is-playing-audio-expected.txt:
* media/muted-video-is-playing-audio.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="#trunkLayoutTestsmediamutedvideoisplayingaudioexpectedtxt">trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt</a></li>
<li><a href="#trunkLayoutTestsmediamutedvideoisplayingaudiohtml">trunk/LayoutTests/media/muted-video-is-playing-audio.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="#trunkSourceWebCorepageMediaProducerh">trunk/Source/WebCore/page/MediaProducer.h</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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/LayoutTests/ChangeLog 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+2016-10-25 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Add "has capture device" bit to media state flags
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+
+ Reviewed by Jer Noble.
+
+ * fast/mediastream/MediaStream-page-muted-expected.txt:
+ * fast/mediastream/MediaStream-page-muted.html:
+ * media/muted-video-is-playing-audio-expected.txt:
+ * media/muted-video-is-playing-audio.html:
+
</ins><span class="cx"> 2016-10-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Support new IDBTransaction interfaces.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreampagemutedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -7,22 +7,27 @@
</span><span class="cx"> *** Mock capture devices should be enabled by default
</span><span class="cx"> PASS mediaStream is an instance of Object
</span><span class="cx"> PASS mediaStream.getTracks().length is 2
</span><ins>+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
</ins><span class="cx">
</span><span class="cx"> *** Muting capture devices
</span><span class="cx"> EVENT: mute
</span><del>-PASS event.target.muted is true
-
</del><ins>+PASS muteChangedEvent.target.muted is true
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</ins><span class="cx"> EVENT: mute
</span><del>-PASS event.target.muted is true
</del><ins>+PASS muteChangedEvent.target.muted is true
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</ins><span class="cx">
</span><ins>+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
</ins><span class="cx">
</span><span class="cx"> *** Unmuting capture devices
</span><span class="cx"> EVENT: unmute
</span><del>-PASS event.target.muted is false
-
</del><ins>+PASS muteChangedEvent.target.muted is false
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</ins><span class="cx"> EVENT: unmute
</span><del>-PASS event.target.muted is false
</del><ins>+PASS muteChangedEvent.target.muted is false
+PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
</ins><span class="cx">
</span><ins>+PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
</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 (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -5,29 +5,40 @@
</span><span class="cx"> <script>
</span><span class="cx"> let mediaStream;
</span><span class="cx"> let eventCount = 0;
</span><ins>+ let muteChangedEvent;
</ins><span class="cx">
</span><ins>+ function nextStep()
+ {
+ if (muteChangedEvent.type == "unmute") {
+ finishJSTest();
+ return;
+ }
+
+ debug("<br>*** Unmuting capture devices");
+ eventCount = 0;
+ internals.setPageMuted("");
+ }
+
</ins><span class="cx"> function muteChanged(ev)
</span><span class="cx"> {
</span><del>- event = ev;
- debug(`EVENT: ${ev.type}`);
- shouldBe('event.target.muted', (ev.type == "mute").toString());
- debug("");
</del><ins>+ muteChangedEvent = ev;
+ debug(`EVENT: ${muteChangedEvent.type}`);
+ shouldBe('muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());
+ shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");
</ins><span class="cx">
</span><span class="cx"> if (++eventCount == 2) {
</span><del>- eventCount = 0;
-
- if (ev.type == "unmute") {
- finishJSTest();
- return;
- }
-
- if (window.internals) {
- debug("<br>*** Unmuting capture devices");
- internals.setPageMuted("");
- }
</del><ins>+ debug("");
+ let shouldBeActive = muteChangedEvent.type == "mute" ? "false" : "true";
+ shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", shouldBeActive, nextStep);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ function muteCaptureDevices()
+ {
+ debug("<br>*** Muting capture devices");
+ internals.setPageMuted("capturedevices");
+ }
+
</ins><span class="cx"> function testWhenEnabled()
</span><span class="cx"> {
</span><span class="cx"> navigator.mediaDevices
</span><span class="lines">@@ -43,10 +54,7 @@
</span><span class="cx"> tracks[i].onunmute = muteChanged;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (window.internals) {
- debug("<br>*** Muting capture devices");
- internals.setPageMuted("capturedevices");
- }
</del><ins>+ shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", "true", muteCaptureDevices);
</ins><span class="cx"> })
</span><span class="cx"> .catch((err) => {
</span><span class="cx"> testFailed(`mediaDevices.getUserMedia() failed with ${err.name}`);
</span></span></pre></div>
<a id="trunkLayoutTestsmediamutedvideoisplayingaudioexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -3,9 +3,9 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx">
</span><span class="cx">
</span><del>-PASS window.internals.isPagePlayingAudio() became true
-PASS window.internals.isPagePlayingAudio() became false
-PASS window.internals.isPagePlayingAudio() became true
</del><ins>+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became false
+PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx">
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsmediamutedvideoisplayingaudiohtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/media/muted-video-is-playing-audio.html (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/media/muted-video-is-playing-audio.html 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/LayoutTests/media/muted-video-is-playing-audio.html 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -15,16 +15,16 @@
</span><span class="cx"> function testUnmutingVideo()
</span><span class="cx"> {
</span><span class="cx"> run("video.muted = false");
</span><del>- shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", finishJSTest);
</del><ins>+ shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", finishJSTest);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function testMutingVideo()
</span><span class="cx"> {
</span><span class="cx"> run("video.muted = true");
</span><del>- shouldBecomeEqual("window.internals.isPagePlayingAudio()", "false", testUnmutingVideo);
</del><ins>+ shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "false", testUnmutingVideo);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", testMutingVideo);
</del><ins>+ shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", testMutingVideo);
</ins><span class="cx"> </script>
</span><span class="cx"> <script src="../resources/js-test-post.js"></script>
</span><span class="cx"> </body>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2016-10-25 Eric Carlson <eric.carlson@apple.com>
+
+ [MediaStream] Add "has capture device" bit to media state flags
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+
+ Reviewed by Jer Noble.
+
+ No new tests, updated fast/mediastream/MediaStream-page-muted.html and media/muted-video-is-playing-audio.html.
+
+ * Modules/mediastream/MediaStream.cpp:
+ (WebCore::MediaStream::mediaState): Set HasMediaCaptureDevice, only set HasActiveMediaCaptureDevice when
+ actually producing data.
+
+ * page/MediaProducer.h: Add HasMediaCaptureDevice bit.
+
+ * testing/Internals.cpp:
+ (WebCore::Internals::pageMediaState): Return a string representing MediaStateFlags.
+ (WebCore::Internals::isPagePlayingAudio): Deleted.
+ * testing/Internals.h:
+ * testing/Internals.idl:
+
</ins><span class="cx"> 2016-10-25 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> IndexedDB 2.0: Support new IDBTransaction interfaces.
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesmediastreamMediaStreamcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -274,7 +274,8 @@
</span><span class="cx"> if (!m_isActive)
</span><span class="cx"> return state;
</span><span class="cx">
</span><del>- if (m_externallyMuted || m_private->isProducingData())
</del><ins>+ state |= HasMediaCaptureDevice;
+ if (m_private->isProducingData())
</ins><span class="cx"> state |= HasActiveMediaCaptureDevice;
</span><span class="cx">
</span><span class="cx"> if (m_private->hasAudio() || m_private->hasVideo())
</span></span></pre></div>
<a id="trunkSourceWebCorepageMediaProducerh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/MediaProducer.h (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/MediaProducer.h 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/page/MediaProducer.h 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -44,6 +44,7 @@
</span><span class="cx"> HasPlaybackTargetAvailabilityListener = 1 << 9,
</span><span class="cx"> HasAudioOrVideo = 1 << 10,
</span><span class="cx"> HasActiveMediaCaptureDevice = 1 << 11,
</span><ins>+ HasMediaCaptureDevice = 1 << 12,
</ins><span class="cx"> };
</span><span class="cx"> typedef unsigned MediaStateFlags;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalscpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.cpp (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.cpp 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -2966,13 +2966,49 @@
</span><span class="cx"> page->setMuted(state);
</span><span class="cx"> }
</span><span class="cx">
</span><del>-bool Internals::isPagePlayingAudio()
</del><ins>+String Internals::pageMediaState()
</ins><span class="cx"> {
</span><span class="cx"> Document* document = contextDocument();
</span><span class="cx"> if (!document || !document->page())
</span><del>- return false;
</del><ins>+ return emptyString();
</ins><span class="cx">
</span><del>- return !!(document->page()->mediaState() & MediaProducer::IsPlayingAudio);
</del><ins>+ WebCore::MediaProducer::MediaStateFlags state = document->page()->mediaState();
+ StringBuilder string;
+ if (state & MediaProducer::IsPlayingAudio)
+ string.append("IsPlayingAudio,");
+ if (state & MediaProducer::IsPlayingVideo)
+ string.append("IsPlayingVideo,");
+ if (state & MediaProducer::IsPlayingToExternalDevice)
+ string.append("IsPlayingToExternalDevice,");
+ if (state & MediaProducer::RequiresPlaybackTargetMonitoring)
+ string.append("RequiresPlaybackTargetMonitoring,");
+ if (state & MediaProducer::ExternalDeviceAutoPlayCandidate)
+ string.append("ExternalDeviceAutoPlayCandidate,");
+ if (state & MediaProducer::DidPlayToEnd)
+ string.append("DidPlayToEnd,");
+ if (state & MediaProducer::IsSourceElementPlaying)
+ string.append("IsSourceElementPlaying,");
+
+ if (state & MediaProducer::IsNextTrackControlEnabled)
+ string.append("IsNextTrackControlEnabled,");
+ if (state & MediaProducer::IsPreviousTrackControlEnabled)
+ string.append("IsPreviousTrackControlEnabled,");
+
+ if (state & MediaProducer::HasPlaybackTargetAvailabilityListener)
+ string.append("HasPlaybackTargetAvailabilityListener,");
+ if (state & MediaProducer::HasAudioOrVideo)
+ string.append("HasAudioOrVideo,");
+ if (state & MediaProducer::HasActiveMediaCaptureDevice)
+ string.append("HasActiveMediaCaptureDevice,");
+ if (state & MediaProducer::HasMediaCaptureDevice)
+ string.append("HasMediaCaptureDevice,");
+
+ if (string.isEmpty())
+ string.append("IsNotPlaying");
+ else
+ string.resize(string.length() - 1);
+
+ return string.toString();
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> void Internals::setPageDefersLoading(bool defersLoading)
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.h (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.h 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/testing/Internals.h 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> ExceptionOr<String> pageOverlayLayerTreeAsText() const;
</span><span class="cx">
</span><span class="cx"> void setPageMuted(const String&);
</span><del>- bool isPagePlayingAudio();
</del><ins>+ String pageMediaState();
</ins><span class="cx">
</span><span class="cx"> void setPageDefersLoading(bool);
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoretestingInternalsidl"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/testing/Internals.idl (207826 => 207827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/testing/Internals.idl 2016-10-25 17:27:00 UTC (rev 207826)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-10-25 17:34:07 UTC (rev 207827)
</span><span class="lines">@@ -418,7 +418,7 @@
</span><span class="cx"> [MayThrowException] DOMString pageOverlayLayerTreeAsText();
</span><span class="cx">
</span><span class="cx"> void setPageMuted(DOMString mutedState);
</span><del>- boolean isPagePlayingAudio();
</del><ins>+ DOMString pageMediaState();
</ins><span class="cx">
</span><span class="cx"> void setPageDefersLoading(boolean defersLoading);
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>