Diff
Modified: trunk/LayoutTests/ChangeLog (207836 => 207837)
--- trunk/LayoutTests/ChangeLog 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/LayoutTests/ChangeLog 2016-10-25 19:37:15 UTC (rev 207837)
@@ -1,3 +1,23 @@
+2016-10-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r207827 and r207828.
+ https://bugs.webkit.org/show_bug.cgi?id=163965
+
+ Caused LayoutTest webaudio/web-audio-is-playing.html to time
+ out on macOS. (Requested by ryanhaddad on #webkit).
+
+ Reverted changesets:
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207827
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207828
+
2016-10-25 Antoine Quint <[email protected]>
[Modern Media Controls] Media Controller: skip back support
Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt (207836 => 207837)
--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted-expected.txt 2016-10-25 19:37:15 UTC (rev 207837)
@@ -7,27 +7,22 @@
*** Mock capture devices should be enabled by default
PASS mediaStream is an instance of Object
PASS mediaStream.getTracks().length is 2
-PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
*** Muting capture devices
EVENT: mute
-PASS muteChangedEvent.target.muted is true
-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+PASS event.target.muted is true
+
EVENT: mute
-PASS muteChangedEvent.target.muted is true
-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+PASS event.target.muted is true
-PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became false
*** Unmuting capture devices
EVENT: unmute
-PASS muteChangedEvent.target.muted is false
-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+PASS event.target.muted is false
+
EVENT: unmute
-PASS muteChangedEvent.target.muted is false
-PASS window.internals.pageMediaState().includes('HasMediaCaptureDevice') is true
+PASS event.target.muted is false
-PASS window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice') became true
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html (207836 => 207837)
--- trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/LayoutTests/fast/mediastream/MediaStream-page-muted.html 2016-10-25 19:37:15 UTC (rev 207837)
@@ -5,40 +5,29 @@
<script>
let mediaStream;
let eventCount = 0;
- let muteChangedEvent;
- function nextStep()
+ function muteChanged(ev)
{
- if (muteChangedEvent.type == "unmute") {
- finishJSTest();
- return;
- }
+ event = ev;
+ debug(`EVENT: ${ev.type}`);
+ shouldBe('event.target.muted', (ev.type == "mute").toString());
+ debug("");
- debug("<br>*** Unmuting capture devices");
- eventCount = 0;
- internals.setPageMuted("");
- }
+ if (++eventCount == 2) {
+ eventCount = 0;
- function muteChanged(ev)
- {
- muteChangedEvent = ev;
- debug(`EVENT: ${muteChangedEvent.type}`);
- shouldBe('muteChangedEvent.target.muted', (muteChangedEvent.type == "mute").toString());
- shouldBe("window.internals.pageMediaState().includes('HasMediaCaptureDevice')", "true");
+ if (ev.type == "unmute") {
+ finishJSTest();
+ return;
+ }
- if (++eventCount == 2) {
- debug("");
- let shouldBeActive = muteChangedEvent.type == "mute" ? "false" : "true";
- shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", shouldBeActive, nextStep);
+ if (window.internals) {
+ debug("<br>*** Unmuting capture devices");
+ internals.setPageMuted("");
+ }
}
}
- function muteCaptureDevices()
- {
- debug("<br>*** Muting capture devices");
- internals.setPageMuted("capturedevices");
- }
-
function testWhenEnabled()
{
navigator.mediaDevices
@@ -54,7 +43,10 @@
tracks[i]._onunmute_ = muteChanged;
}
- shouldBecomeEqual("window.internals.pageMediaState().includes('HasActiveMediaCaptureDevice')", "true", muteCaptureDevices);
+ if (window.internals) {
+ debug("<br>*** Muting capture devices");
+ internals.setPageMuted("capturedevices");
+ }
})
.catch((err) => {
testFailed(`mediaDevices.getUserMedia() failed with ${err.name}`);
Modified: trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt (207836 => 207837)
--- trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/LayoutTests/media/muted-video-is-playing-audio-expected.txt 2016-10-25 19:37:15 UTC (rev 207837)
@@ -3,9 +3,9 @@
On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
-PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
-PASS window.internals.pageMediaState().includes('IsPlayingAudio') became false
-PASS window.internals.pageMediaState().includes('IsPlayingAudio') became true
+PASS window.internals.isPagePlayingAudio() became true
+PASS window.internals.isPagePlayingAudio() became false
+PASS window.internals.isPagePlayingAudio() became true
PASS successfullyParsed is true
TEST COMPLETE
Modified: trunk/LayoutTests/media/muted-video-is-playing-audio.html (207836 => 207837)
--- trunk/LayoutTests/media/muted-video-is-playing-audio.html 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/LayoutTests/media/muted-video-is-playing-audio.html 2016-10-25 19:37:15 UTC (rev 207837)
@@ -15,16 +15,16 @@
function testUnmutingVideo()
{
run("video.muted = false");
- shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", finishJSTest);
+ shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", finishJSTest);
}
function testMutingVideo()
{
run("video.muted = true");
- shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "false", testUnmutingVideo);
+ shouldBecomeEqual("window.internals.isPagePlayingAudio()", "false", testUnmutingVideo);
}
- shouldBecomeEqual("window.internals.pageMediaState().includes('IsPlayingAudio')", "true", testMutingVideo);
+ shouldBecomeEqual("window.internals.isPagePlayingAudio()", "true", testMutingVideo);
</script>
<script src=""
</body>
Modified: trunk/Source/WebCore/ChangeLog (207836 => 207837)
--- trunk/Source/WebCore/ChangeLog 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/ChangeLog 2016-10-25 19:37:15 UTC (rev 207837)
@@ -1,3 +1,23 @@
+2016-10-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r207827 and r207828.
+ https://bugs.webkit.org/show_bug.cgi?id=163965
+
+ Caused LayoutTest webaudio/web-audio-is-playing.html to time
+ out on macOS. (Requested by ryanhaddad on #webkit).
+
+ Reverted changesets:
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207827
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207828
+
2016-10-25 Antoine Quint <[email protected]>
[Modern Media Controls] Media Controller: skip back support
Modified: trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp (207836 => 207837)
--- trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/Modules/mediastream/MediaStream.cpp 2016-10-25 19:37:15 UTC (rev 207837)
@@ -274,8 +274,7 @@
if (!m_isActive)
return state;
- state |= HasMediaCaptureDevice;
- if (m_private->isProducingData())
+ if (m_externallyMuted || m_private->isProducingData())
state |= HasActiveMediaCaptureDevice;
if (m_private->hasAudio() || m_private->hasVideo())
Modified: trunk/Source/WebCore/page/MediaProducer.h (207836 => 207837)
--- trunk/Source/WebCore/page/MediaProducer.h 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/page/MediaProducer.h 2016-10-25 19:37:15 UTC (rev 207837)
@@ -44,7 +44,6 @@
HasPlaybackTargetAvailabilityListener = 1 << 9,
HasAudioOrVideo = 1 << 10,
HasActiveMediaCaptureDevice = 1 << 11,
- HasMediaCaptureDevice = 1 << 12,
};
typedef unsigned MediaStateFlags;
Modified: trunk/Source/WebCore/testing/Internals.cpp (207836 => 207837)
--- trunk/Source/WebCore/testing/Internals.cpp 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/testing/Internals.cpp 2016-10-25 19:37:15 UTC (rev 207837)
@@ -2966,49 +2966,13 @@
page->setMuted(state);
}
-String Internals::pageMediaState()
+bool Internals::isPagePlayingAudio()
{
Document* document = contextDocument();
if (!document || !document->page())
- return emptyString();
+ return false;
- 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();
+ return !!(document->page()->mediaState() & MediaProducer::IsPlayingAudio);
}
void Internals::setPageDefersLoading(bool defersLoading)
Modified: trunk/Source/WebCore/testing/Internals.h (207836 => 207837)
--- trunk/Source/WebCore/testing/Internals.h 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/testing/Internals.h 2016-10-25 19:37:15 UTC (rev 207837)
@@ -441,7 +441,7 @@
ExceptionOr<String> pageOverlayLayerTreeAsText() const;
void setPageMuted(const String&);
- String pageMediaState();
+ bool isPagePlayingAudio();
void setPageDefersLoading(bool);
Modified: trunk/Source/WebCore/testing/Internals.idl (207836 => 207837)
--- trunk/Source/WebCore/testing/Internals.idl 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebCore/testing/Internals.idl 2016-10-25 19:37:15 UTC (rev 207837)
@@ -418,7 +418,7 @@
[MayThrowException] DOMString pageOverlayLayerTreeAsText();
void setPageMuted(DOMString mutedState);
- DOMString pageMediaState();
+ boolean isPagePlayingAudio();
void setPageDefersLoading(boolean defersLoading);
Modified: trunk/Source/WebKit2/ChangeLog (207836 => 207837)
--- trunk/Source/WebKit2/ChangeLog 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebKit2/ChangeLog 2016-10-25 19:37:15 UTC (rev 207837)
@@ -1,3 +1,23 @@
+2016-10-25 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r207827 and r207828.
+ https://bugs.webkit.org/show_bug.cgi?id=163965
+
+ Caused LayoutTest webaudio/web-audio-is-playing.html to time
+ out on macOS. (Requested by ryanhaddad on #webkit).
+
+ Reverted changesets:
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207827
+
+ "[MediaStream] Add "has capture device" bit to media state
+ flags"
+ https://bugs.webkit.org/show_bug.cgi?id=163952
+ http://trac.webkit.org/changeset/207828
+
2016-10-25 Eric Carlson <[email protected]>
[MediaStream] Add "has capture device" bit to media state flags
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp (207836 => 207837)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPage.cpp 2016-10-25 19:37:15 UTC (rev 207837)
@@ -2748,8 +2748,6 @@
state |= kWKMediaIsPlayingAudio;
if (coreState & WebCore::MediaProducer::IsPlayingVideo)
state |= kWKMediaIsPlayingVideo;
- if (coreState & WebCore::MediaProducer::HasMediaCaptureDevice)
- state |= kWKMediaHasCaptureDevice;
if (coreState & WebCore::MediaProducer::HasActiveMediaCaptureDevice)
state |= kWKMediaHasActiveCaptureDevice;
Modified: trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h (207836 => 207837)
--- trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-25 19:25:54 UTC (rev 207836)
+++ trunk/Source/WebKit2/UIProcess/API/C/WKPagePrivate.h 2016-10-25 19:37:15 UTC (rev 207837)
@@ -134,7 +134,6 @@
kWKMediaIsPlayingAudio = 1 << 0,
kWKMediaIsPlayingVideo = 1 << 1,
kWKMediaHasActiveCaptureDevice = 1 << 2,
- kWKMediaHasCaptureDevice = 1 << 3,
};
typedef uint32_t WKMediaState;
