third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp - Issue 2103043007: Rename AbstractAudioContext to BaseAudioContext

Unified Diff: third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp

Issue 2103043007: Rename AbstractAudioContext to BaseAudioContext (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Use ASSERT(isGraphOwner()) instead of DCHECK Created 4 years, 5 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.h ('k') | third_party/WebKit/Source/modules/webaudio/AudioBasicInspectorNode.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp

diff --git a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp

index 360ad1ad664aa7dd55453efa7d9fd87716f4a40c..12aa3b8895ba5dc3c96aed0fe870d09c1aed428e 100644

--- a/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp

+++ b/third_party/WebKit/Source/modules/webaudio/AsyncAudioDecoder.cpp

@@ -23,10 +23,10 @@

#include "core/dom/DOMArrayBuffer.h"

-#include "modules/webaudio/AbstractAudioContext.h"

#include "modules/webaudio/AsyncAudioDecoder.h"

#include "modules/webaudio/AudioBuffer.h"

#include "modules/webaudio/AudioBufferCallback.h"

+#include "modules/webaudio/BaseAudioContext.h"

#include "platform/CrossThreadFunctional.h"

#include "platform/audio/AudioBus.h"

#include "platform/audio/AudioFileReader.h"

@@ -45,7 +45,7 @@ AsyncAudioDecoder::~AsyncAudioDecoder()

{

}

-void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResolver* resolver, AbstractAudioContext* context)

+void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResolver* resolver, BaseAudioContext* context)

{

ASSERT(isMainThread());

ASSERT(audioData);

@@ -55,7 +55,7 @@ void AsyncAudioDecoder::decodeAsync(DOMArrayBuffer* audioData, float sampleRate,

m_thread->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&AsyncAudioDecoder::decode, wrapCrossThreadPersistent(audioData), sampleRate, wrapCrossThreadPersistent(successCallback), wrapCrossThreadPersistent(errorCallback), wrapCrossThreadPersistent(resolver), wrapCrossThreadPersistent(context)));

}

-void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResolver* resolver, AbstractAudioContext* context)

+void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, ScriptPromiseResolver* resolver, BaseAudioContext* context)

{

RefPtr<AudioBus> bus = createBusFromInMemoryAudioFile(audioData->data(), audioData->byteLength(), false, sampleRate);

@@ -64,7 +64,7 @@ void AsyncAudioDecoder::decode(DOMArrayBuffer* audioData, float sampleRate, Audi

Platform::current()->mainThread()->getWebTaskRunner()->postTask(BLINK_FROM_HERE, crossThreadBind(&AsyncAudioDecoder::notifyComplete, wrapCrossThreadPersistent(audioData), wrapCrossThreadPersistent(successCallback), wrapCrossThreadPersistent(errorCallback), bus.release(), wrapCrossThreadPersistent(resolver), wrapCrossThreadPersistent(context)));

}

-void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer*, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus, ScriptPromiseResolver* resolver, AbstractAudioContext* context)

+void AsyncAudioDecoder::notifyComplete(DOMArrayBuffer*, AudioBufferCallback* successCallback, AudioBufferCallback* errorCallback, AudioBus* audioBus, ScriptPromiseResolver* resolver, BaseAudioContext* context)

{

ASSERT(isMainThread());