| Index: content/renderer/media/webaudiosourceprovider_impl.h
|
| diff --git a/content/renderer/media/webaudiosourceprovider_impl.h b/content/renderer/media/webaudiosourceprovider_impl.h
|
| index 8205ad26da4ab9d36c54900f6806c195043ea10a..4e9348752137fd3bf6b38650fc191ccb81ce5b8d 100644
|
| --- a/content/renderer/media/webaudiosourceprovider_impl.h
|
| +++ b/content/renderer/media/webaudiosourceprovider_impl.h
|
| @@ -11,14 +11,14 @@
|
| #include "third_party/WebKit/public/platform/WebAudioSourceProvider.h"
|
| #include "third_party/WebKit/public/platform/WebVector.h"
|
|
|
| -namespace WebKit {
|
| +namespace blink {
|
| class WebAudioSourceProviderClient;
|
| }
|
|
|
| namespace content {
|
|
|
| // WebAudioSourceProviderImpl provides a bridge between classes:
|
| -// WebKit::WebAudioSourceProvider <---> media::AudioRendererSink
|
| +// blink::WebAudioSourceProvider <---> media::AudioRendererSink
|
| //
|
| // WebAudioSourceProviderImpl wraps an existing audio sink that is used unless
|
| // WebKit has set a client via setClient(). While a client is set WebKit will
|
| @@ -27,15 +27,15 @@ namespace content {
|
| //
|
| // All calls are protected by a lock.
|
| class CONTENT_EXPORT WebAudioSourceProviderImpl
|
| - : NON_EXPORTED_BASE(public WebKit::WebAudioSourceProvider),
|
| + : NON_EXPORTED_BASE(public blink::WebAudioSourceProvider),
|
| NON_EXPORTED_BASE(public media::AudioRendererSink) {
|
| public:
|
| explicit WebAudioSourceProviderImpl(
|
| const scoped_refptr<media::AudioRendererSink>& sink);
|
|
|
| - // WebKit::WebAudioSourceProvider implementation.
|
| - virtual void setClient(WebKit::WebAudioSourceProviderClient* client);
|
| - virtual void provideInput(const WebKit::WebVector<float*>& audio_data,
|
| + // blink::WebAudioSourceProvider implementation.
|
| + virtual void setClient(blink::WebAudioSourceProviderClient* client);
|
| + virtual void provideInput(const blink::WebVector<float*>& audio_data,
|
| size_t number_of_frames);
|
|
|
| // media::AudioRendererSink implementation.
|
| @@ -64,7 +64,7 @@ class CONTENT_EXPORT WebAudioSourceProviderImpl
|
| media::AudioRendererSink::RenderCallback* renderer_;
|
|
|
| // When set via setClient() it overrides |sink_| for consuming audio.
|
| - WebKit::WebAudioSourceProviderClient* client_;
|
| + blink::WebAudioSourceProviderClient* client_;
|
|
|
| // Where audio ends up unless overridden by |client_|.
|
| base::Lock sink_lock_;
|
|
|