Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1255718. Remove the unused JSContext argument of AudioBuffer::Create. r=ehsan

Browse Source
This commit is contained in:
Boris Zbarsky 2016-03-11 16:43:31 -05:00
parent 57fc0e989c
commit 20514713f3
9 changed files with 12 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/bindings/Bindings.conf
View File

@ -109,10 +109,6 @@ DOMInterfaces = {
'headerFile': 'AudioChannelManager.h'
},
'AudioContext': {
'implicitJSContext': [ 'createBuffer' ],
},
'AudioBuffer': {
'implicitJSContext': [ 'copyToChannel' ],
},

2
dom/media/webaudio/AudioBuffer.cpp
View File

@ -71,7 +71,7 @@ AudioBuffer::Create(AudioContext* aContext, uint32_t aNumberOfChannels,
uint32_t aLength, float aSampleRate,
already_AddRefed<ThreadSharedFloatArrayBufferList>
aInitialContents,
JSContext* aJSContext, ErrorResult& aRv)
ErrorResult& aRv)
{
// Note that a buffer with zero channels is permitted here for the sake of
// AudioProcessingEvent, where channel counts must match parameters passed

6
dom/media/webaudio/AudioBuffer.h
View File

@ -39,15 +39,15 @@ public:
Create(AudioContext* aContext, uint32_t aNumberOfChannels,
uint32_t aLength, float aSampleRate,
already_AddRefed<ThreadSharedFloatArrayBufferList> aInitialContents,
JSContext* aJSContext, ErrorResult& aRv);
ErrorResult& aRv);
static already_AddRefed<AudioBuffer>
Create(AudioContext* aContext, uint32_t aNumberOfChannels,
uint32_t aLength, float aSampleRate,
JSContext* aJSContext, ErrorResult& aRv)
ErrorResult& aRv)
{
return Create(aContext, aNumberOfChannels, aLength, aSampleRate,
nullptr, aJSContext, aRv);
nullptr, aRv);
}
size_t SizeOfIncludingThis(mozilla::MallocSizeOf aMallocSizeOf) const;

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

@ -245,8 +245,8 @@ AudioContext::CreateBufferSource(ErrorResult& aRv)
}
already_AddRefed<AudioBuffer>
AudioContext::CreateBuffer(JSContext* aJSContext, uint32_t aNumberOfChannels,
uint32_t aLength, float aSampleRate,
AudioContext::CreateBuffer(uint32_t aNumberOfChannels, uint32_t aLength,
float aSampleRate,
ErrorResult& aRv)
{
if (!aNumberOfChannels) {
@ -255,7 +255,7 @@ AudioContext::CreateBuffer(JSContext* aJSContext, uint32_t aNumberOfChannels,
}
return AudioBuffer::Create(this, aNumberOfChannels, aLength,
aSampleRate, aJSContext, aRv);
aSampleRate, aRv);
}
namespace {

3
dom/media/webaudio/AudioContext.h
View File

@ -200,8 +200,7 @@ public:
already_AddRefed<AudioBufferSourceNode> CreateBufferSource(ErrorResult& aRv);
already_AddRefed<AudioBuffer>
CreateBuffer(JSContext* aJSContext, uint32_t aNumberOfChannels,
uint32_t aLength, float aSampleRate,
CreateBuffer(uint32_t aNumberOfChannels, uint32_t aLength, float aSampleRate,
ErrorResult& aRv);
already_AddRefed<MediaStreamAudioDestinationNode>

8
dom/media/webaudio/AudioDestinationNode.cpp
View File

@ -151,17 +151,11 @@ public:
// which is strongly referenced by the runnable that called
// AudioDestinationNode::FireOfflineCompletionEvent.
AutoJSAPI jsapi;
if (NS_WARN_IF(!jsapi.Init(aNode->GetOwner()))) {
return;
}
JSContext* cx = jsapi.cx();
// Create the input buffer
ErrorResult rv;
RefPtr<AudioBuffer> renderedBuffer =
AudioBuffer::Create(context, mNumberOfChannels, mLength, mSampleRate,
mBuffer.forget(), cx, rv);
mBuffer.forget(), rv);
if (rv.Failed()) {
return;
}

9
dom/media/webaudio/AudioProcessingEvent.cpp
View File

@ -44,17 +44,10 @@ already_AddRefed<AudioBuffer>
AudioProcessingEvent::LazilyCreateBuffer(uint32_t aNumberOfChannels,
ErrorResult& aRv)
{
AutoJSAPI jsapi;
if (NS_WARN_IF(!jsapi.Init(mNode->GetOwner()))) {
aRv.Throw(NS_ERROR_UNEXPECTED);
return nullptr;
}
JSContext* cx = jsapi.cx();
RefPtr<AudioBuffer> buffer =
AudioBuffer::Create(mNode->Context(), aNumberOfChannels,
mNode->BufferSize(),
mNode->Context()->SampleRate(), cx, aRv);
mNode->Context()->SampleRate(), aRv);
MOZ_ASSERT(buffer || aRv.ErrorCodeIs(NS_ERROR_OUT_OF_MEMORY));
return buffer.forget();
}

8
dom/media/webaudio/MediaBufferDecoder.cpp
View File

@ -470,18 +470,12 @@ WebAudioDecodeJob::AllocateBuffer()
MOZ_ASSERT(!mOutput);
MOZ_ASSERT(NS_IsMainThread());
AutoJSAPI jsapi;
if (NS_WARN_IF(!jsapi.Init(mContext->GetOwner()))) {
return false;
}
JSContext* cx = jsapi.cx();
// Now create the AudioBuffer
ErrorResult rv;
uint32_t channelCount = mBuffer->GetChannels();
mOutput = AudioBuffer::Create(mContext, channelCount,
mWriteIndex, mContext->SampleRate(),
mBuffer.forget(), cx, rv);
mBuffer.forget(), rv);
return !rv.Failed();
}

2
dom/media/webaudio/ScriptProcessorNode.cpp
View File

@ -429,7 +429,7 @@ private:
inputBuffer =
AudioBuffer::Create(context, inputChannelCount,
aNode->BufferSize(), context->SampleRate(),
mInputBuffer.forget(), cx, rv);
mInputBuffer.forget(), rv);
if (rv.Failed()) {
return nullptr;
}