| Index: content/renderer/media/webaudiosourceprovider_impl.h
|
| diff --git a/webkit/renderer/media/webaudiosourceprovider_impl.h b/content/renderer/media/webaudiosourceprovider_impl.h
|
| similarity index 84%
|
| rename from webkit/renderer/media/webaudiosourceprovider_impl.h
|
| rename to content/renderer/media/webaudiosourceprovider_impl.h
|
| index 0f3955328d6bb53230588f8002d85a42a8e5c652..fd27697f49bdff3f9a396319183604faca9a79c3 100644
|
| --- a/webkit/renderer/media/webaudiosourceprovider_impl.h
|
| +++ b/content/renderer/media/webaudiosourceprovider_impl.h
|
| @@ -2,10 +2,11 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
| -#define WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
| +#ifndef CONTENT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
| +#define CONTENT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
|
|
| #include "base/synchronization/lock.h"
|
| +#include "content/common/content_export.h"
|
| #include "media/base/audio_renderer_sink.h"
|
| #include "third_party/WebKit/public/platform/WebVector.h"
|
| #include "third_party/WebKit/public/web/WebAudioSourceProvider.h"
|
| @@ -14,7 +15,7 @@ namespace WebKit {
|
| class WebAudioSourceProviderClient;
|
| }
|
|
|
| -namespace webkit_media {
|
| +namespace content {
|
|
|
| // WebAudioSourceProviderImpl provides a bridge between classes:
|
| // WebKit::WebAudioSourceProvider <---> media::AudioRendererSink
|
| @@ -25,9 +26,9 @@ namespace webkit_media {
|
| // sample-frames using the sink's RenderCallback to get the data.
|
| //
|
| // All calls are protected by a lock.
|
| -class WebAudioSourceProviderImpl
|
| - : public WebKit::WebAudioSourceProvider,
|
| - public media::AudioRendererSink {
|
| +class CONTENT_EXPORT WebAudioSourceProviderImpl
|
| + : NON_EXPORTED_BASE(public WebKit::WebAudioSourceProvider),
|
| + NON_EXPORTED_BASE(public media::AudioRendererSink) {
|
| public:
|
| explicit WebAudioSourceProviderImpl(
|
| const scoped_refptr<media::AudioRendererSink>& sink);
|
| @@ -73,6 +74,6 @@ class WebAudioSourceProviderImpl
|
| DISALLOW_IMPLICIT_CONSTRUCTORS(WebAudioSourceProviderImpl);
|
| };
|
|
|
| -} // namespace webkit_media
|
| +} // namespace content
|
|
|
| -#endif // WEBKIT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
| +#endif // CONTENT_RENDERER_MEDIA_WEBAUDIOSOURCEPROVIDER_IMPL_H_
|
|
|