зеркало из https://github.com/mozilla/gecko-dev.git
Backed out changeset e184609e1d13 (bug 1207546) for bustage ON A CLOSED TREE
--HG-- extra : amend_source : 2ba50d75927848525041bea8ab3bbf371c72342d
This commit is contained in:
Родитель
372d96ff26
Коммит
a2f3106ede
|
@ -269,8 +269,6 @@ support-files =
|
||||||
[test_audioWindowUtils.html]
|
[test_audioWindowUtils.html]
|
||||||
[test_audioNotification.html]
|
[test_audioNotification.html]
|
||||||
skip-if = buildapp == 'mulet'
|
skip-if = buildapp == 'mulet'
|
||||||
[test_audioNotificationStream.html]
|
|
||||||
skip-if = buildapp == 'mulet'
|
|
||||||
[test_audioNotificationStopOnNavigation.html]
|
[test_audioNotificationStopOnNavigation.html]
|
||||||
skip-if = buildapp == 'mulet'
|
skip-if = buildapp == 'mulet'
|
||||||
[test_audioNotificationWithEarlyPlay.html]
|
[test_audioNotificationWithEarlyPlay.html]
|
||||||
|
|
|
@ -1,71 +0,0 @@
|
||||||
<!DOCTYPE HTML>
|
|
||||||
<html>
|
|
||||||
<head>
|
|
||||||
<title>Test for audio controller in windows</title>
|
|
||||||
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
|
|
||||||
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
|
|
||||||
</head>
|
|
||||||
<body>
|
|
||||||
<pre id="test">
|
|
||||||
</pre>
|
|
||||||
|
|
||||||
<script type="application/javascript">
|
|
||||||
|
|
||||||
SimpleTest.waitForExplicitFinish();
|
|
||||||
|
|
||||||
var expectedNotification = null;
|
|
||||||
|
|
||||||
var observer = {
|
|
||||||
observe: function(subject, topic, data) {
|
|
||||||
is(topic, "audio-playback", "audio-playback received");
|
|
||||||
is(data, expectedNotification, "This is the right notification");
|
|
||||||
runTest();
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
var observerService = SpecialPowers.Cc["@mozilla.org/observer-service;1"]
|
|
||||||
.getService(SpecialPowers.Ci.nsIObserverService);
|
|
||||||
|
|
||||||
var audio = new Audio();
|
|
||||||
audio.srcObject = (new AudioContext()).createMediaStreamDestination().stream;
|
|
||||||
|
|
||||||
var tests = [
|
|
||||||
function() {
|
|
||||||
observerService.addObserver(observer, "audio-playback", false);
|
|
||||||
ok(true, "Observer set");
|
|
||||||
runTest();
|
|
||||||
},
|
|
||||||
|
|
||||||
function() {
|
|
||||||
expectedNotification = 'active';
|
|
||||||
audio.play();
|
|
||||||
},
|
|
||||||
|
|
||||||
function() {
|
|
||||||
expectedNotification = 'inactive';
|
|
||||||
audio.pause();
|
|
||||||
},
|
|
||||||
|
|
||||||
function() {
|
|
||||||
observerService.removeObserver(observer, "audio-playback");
|
|
||||||
ok(true, "Observer removed");
|
|
||||||
runTest();
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
function runTest() {
|
|
||||||
if (!tests.length) {
|
|
||||||
SimpleTest.finish();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
var test = tests.shift();
|
|
||||||
test();
|
|
||||||
}
|
|
||||||
|
|
||||||
runTest();
|
|
||||||
|
|
||||||
</script>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
|
|
|
@ -4730,8 +4730,7 @@ HTMLMediaElement::UpdateAudioChannelPlayingState()
|
||||||
(HasAttr(kNameSpaceID_None, nsGkAtoms::loop) ||
|
(HasAttr(kNameSpaceID_None, nsGkAtoms::loop) ||
|
||||||
(mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA &&
|
(mReadyState >= nsIDOMHTMLMediaElement::HAVE_CURRENT_DATA &&
|
||||||
!IsPlaybackEnded()) ||
|
!IsPlaybackEnded()) ||
|
||||||
mPlayingThroughTheAudioChannelBeforeSeek ||
|
mPlayingThroughTheAudioChannelBeforeSeek));
|
||||||
mSrcAttrStream));
|
|
||||||
if (playingThroughTheAudioChannel != mPlayingThroughTheAudioChannel) {
|
if (playingThroughTheAudioChannel != mPlayingThroughTheAudioChannel) {
|
||||||
mPlayingThroughTheAudioChannel = playingThroughTheAudioChannel;
|
mPlayingThroughTheAudioChannel = playingThroughTheAudioChannel;
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче