Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-03 02:25:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset 6a23d4536079 (bug 851338) because of Android test failures

Browse Source
This commit is contained in:
Ehsan Akhgari 2013-03-15 01:26:22 -04:00
parent f4016cc821
commit cafa3e6710
6 changed files with 0 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
content/media/DOMMediaStream.h
View File

@ -21,7 +21,6 @@ class nsXPCClassInfo;
#undef GetCurrentTime
#endif
// X11 has a #define for CurrentTime. Unbelievable :-(.
// See content/media/webaudio/AudioContext.h for more fun!
#ifdef CurrentTime
#undef CurrentTime
#endif

6
content/media/webaudio/AudioContext.cpp
View File

@ -191,11 +191,5 @@ AudioContext::DestinationStream() const
return Destination()->Stream();
}
double
AudioContext::CurrentTime() const
{
return MediaTimeToSeconds(Destination()->Stream()->GetCurrentTime());
}
}
}

8
content/media/webaudio/AudioContext.h
View File

@ -21,12 +21,6 @@
#include "MediaStreamGraph.h"
#include "nsIDOMWindow.h"
// X11 has a #define for CurrentTime. Unbelievable :-(.
// See content/media/DOMMediaStream.h for more fun!
#ifdef CurrentTime
#undef CurrentTime
#endif
struct JSContext;
class JSObject;
class nsIDOMWindow;
@ -84,8 +78,6 @@ public:
return float(IdealAudioRate());
}
double CurrentTime() const;
AudioListener* Listener();
already_AddRefed<AudioBufferSourceNode> CreateBufferSource();

1
content/media/webaudio/test/Makefile.in
View File

@ -21,7 +21,6 @@ MOCHITEST_FILES := \
test_AudioListener.html \
test_badConnect.html \
test_biquadFilterNode.html \
test_currentTime.html \
test_delayNode.html \
test_decodeAudioData.html \
test_dynamicsCompressorNode.html \

27
content/media/webaudio/test/test_currentTime.html
View File

@ -1,27 +0,0 @@
<!DOCTYPE HTML>
<html>
<head>
<title>Test AudioContext.currentTime</title>
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<pre id="test">
<script class="testbody" type="text/javascript">
SimpleTest.waitForExplicitFinish();
addLoadEvent(function() {
SpecialPowers.setBoolPref("media.webaudio.enabled", true);
var ac = new AudioContext();
is(ac.currentTime, 0, "AudioContext.currentTime should be 0 initially");
setTimeout(function() {
ok(ac.currentTime > 0, "AudioContext.currentTime should have increased by now");
SpecialPowers.clearUserPref("media.webaudio.enabled");
SimpleTest.finish();
}, 100);
});
</script>
</pre>
</body>
</html>

1
dom/webidl/AudioContext.webidl
View File

@ -18,7 +18,6 @@ interface AudioContext {
readonly attribute AudioDestinationNode destination;
readonly attribute float sampleRate;
readonly attribute double currentTime;
readonly attribute AudioListener listener;
[Creator, Throws]