diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-04 16:18:03 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-01-04 16:18:03 +0100 |
| commit | 7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc (patch) | |
| tree | fa285d3a7373596199df427327fd76a3d888f789 /dom/media | |
| parent | dfce7fa7b664815bbce363d252033094a0dfe843 (diff) | |
| download | UXP-7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc.tar UXP-7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc.tar.gz UXP-7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc.tar.lz UXP-7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc.tar.xz UXP-7fcb7f54468aaf4e988e545ef1f6a8b9ab23b7dc.zip | |
Remove proprietary constructor on AudioContext.
This is a B2G leftover, was proprietary, and is causing issues
because `AudioContext` can now have a parameter that is a property bag,
per spec (we do not do anything with the property bag now; the audio
back-end will use automatic values for everything).
This resolves #924.
Diffstat (limited to 'dom/media')
| -rw-r--r-- | dom/media/test/crashtests/1228484.html | 13 | ||||
| -rw-r--r-- | dom/media/test/crashtests/crashtests.list | 2 | ||||
| -rwxr-xr-x | dom/media/webaudio/AudioContext.cpp | 12 | ||||
| -rw-r--r-- | dom/media/webaudio/AudioContext.h | 6 |
4 files changed, 1 insertions, 32 deletions
diff --git a/dom/media/test/crashtests/1228484.html b/dom/media/test/crashtests/1228484.html deleted file mode 100644 index 2b2e9b0f9..000000000 --- a/dom/media/test/crashtests/1228484.html +++ /dev/null @@ -1,13 +0,0 @@ -<!DOCTYPE html> -<html> -<head> -<script> - -var htmlAudio = new Audio(URL.createObjectURL(new window.MediaSource())); - -(new window.AudioContext("ringer")).createMediaElementSource(htmlAudio); -(new window.AudioContext("alarm")).createMediaElementSource(htmlAudio); - -</script> -</head> -</html> diff --git a/dom/media/test/crashtests/crashtests.list b/dom/media/test/crashtests/crashtests.list index 496fe5ee5..e4f25ca8d 100644 --- a/dom/media/test/crashtests/crashtests.list +++ b/dom/media/test/crashtests/crashtests.list @@ -81,8 +81,6 @@ load 1157994.html load 1158427.html load 1185176.html load 1185192.html -load 1223670.html -load 1228484.html load 1304948.html load 1319486.html load 1291702.html diff --git a/dom/media/webaudio/AudioContext.cpp b/dom/media/webaudio/AudioContext.cpp index 85842c811..d58441309 100755 --- a/dom/media/webaudio/AudioContext.cpp +++ b/dom/media/webaudio/AudioContext.cpp @@ -179,23 +179,13 @@ AudioContext::WrapObject(JSContext* aCx, JS::Handle<JSObject*> aGivenProto) AudioContext::Constructor(const GlobalObject& aGlobal, ErrorResult& aRv) { - return AudioContext::Constructor(aGlobal, - AudioChannelService::GetDefaultAudioChannel(), - aRv); -} - -/* static */ already_AddRefed<AudioContext> -AudioContext::Constructor(const GlobalObject& aGlobal, - AudioChannel aChannel, - ErrorResult& aRv) -{ nsCOMPtr<nsPIDOMWindowInner> window = do_QueryInterface(aGlobal.GetAsSupports()); if (!window) { aRv.Throw(NS_ERROR_FAILURE); return nullptr; } - RefPtr<AudioContext> object = new AudioContext(window, false, aChannel); + RefPtr<AudioContext> object = new AudioContext(window, false, AudioChannelService::GetDefaultAudioChannel()); aRv = object->Init(); if (NS_WARN_IF(aRv.Failed())) { return nullptr; diff --git a/dom/media/webaudio/AudioContext.h b/dom/media/webaudio/AudioContext.h index 069efa986..599debef8 100644 --- a/dom/media/webaudio/AudioContext.h +++ b/dom/media/webaudio/AudioContext.h @@ -151,12 +151,6 @@ public: static already_AddRefed<AudioContext> Constructor(const GlobalObject& aGlobal, ErrorResult& aRv); - // Constructor for regular AudioContext. A default audio channel is needed. - static already_AddRefed<AudioContext> - Constructor(const GlobalObject& aGlobal, - AudioChannel aChannel, - ErrorResult& aRv); - // Constructor for offline AudioContext static already_AddRefed<AudioContext> Constructor(const GlobalObject& aGlobal, |