From cafa3e67100864233c951df6e58a5223c68312d1 Mon Sep 17 00:00:00 2001 From: Ehsan Akhgari Date: Fri, 15 Mar 2013 01:26:22 -0400 Subject: [PATCH] Backed out changeset 6a23d4536079 (bug 851338) because of Android test failures --- content/media/DOMMediaStream.h | 1 - content/media/webaudio/AudioContext.cpp | 6 ----- content/media/webaudio/AudioContext.h | 8 ------ content/media/webaudio/test/Makefile.in | 1 - .../media/webaudio/test/test_currentTime.html | 27 ------------------- dom/webidl/AudioContext.webidl | 1 - 6 files changed, 44 deletions(-) delete mode 100644 content/media/webaudio/test/test_currentTime.html diff --git a/content/media/DOMMediaStream.h b/content/media/DOMMediaStream.h index ce2946cea31c..2b15570e29b2 100644 --- a/content/media/DOMMediaStream.h +++ b/content/media/DOMMediaStream.h @@ -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 diff --git a/content/media/webaudio/AudioContext.cpp b/content/media/webaudio/AudioContext.cpp index d2b396a77be0..a1e827c19aa1 100644 --- a/content/media/webaudio/AudioContext.cpp +++ b/content/media/webaudio/AudioContext.cpp @@ -191,11 +191,5 @@ AudioContext::DestinationStream() const return Destination()->Stream(); } -double -AudioContext::CurrentTime() const -{ - return MediaTimeToSeconds(Destination()->Stream()->GetCurrentTime()); -} - } } diff --git a/content/media/webaudio/AudioContext.h b/content/media/webaudio/AudioContext.h index 0c7b2bbdb3eb..9d97ebc90138 100644 --- a/content/media/webaudio/AudioContext.h +++ b/content/media/webaudio/AudioContext.h @@ -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 CreateBufferSource(); diff --git a/content/media/webaudio/test/Makefile.in b/content/media/webaudio/test/Makefile.in index bcabc1c03ad7..bbd8c39b81d9 100644 --- a/content/media/webaudio/test/Makefile.in +++ b/content/media/webaudio/test/Makefile.in @@ -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 \ diff --git a/content/media/webaudio/test/test_currentTime.html b/content/media/webaudio/test/test_currentTime.html deleted file mode 100644 index 09ab141b345a..000000000000 --- a/content/media/webaudio/test/test_currentTime.html +++ /dev/null @@ -1,27 +0,0 @@ - - - - Test AudioContext.currentTime - - - - -
-
-
- - diff --git a/dom/webidl/AudioContext.webidl b/dom/webidl/AudioContext.webidl index 736b6755ba93..a1b40a61e2e0 100644 --- a/dom/webidl/AudioContext.webidl +++ b/dom/webidl/AudioContext.webidl @@ -18,7 +18,6 @@ interface AudioContext { readonly attribute AudioDestinationNode destination; readonly attribute float sampleRate; - readonly attribute double currentTime; readonly attribute AudioListener listener; [Creator, Throws]