| Index: Source/web/WebMediaPlayerClientImpl.h
|
| diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h
|
| index 4199bc00ed416f9470f9cfa94360a7cfa0932eb2..23bc172490fbc6541c482c97ece98433a3e335c1 100644
|
| --- a/Source/web/WebMediaPlayerClientImpl.h
|
| +++ b/Source/web/WebMediaPlayerClientImpl.h
|
| @@ -46,7 +46,7 @@
|
| #include "wtf/PassOwnPtr.h"
|
| #include "wtf/ThreadingPrimitives.h"
|
|
|
| -namespace WebCore {
|
| +namespace blink {
|
| class AudioSourceProviderClient;
|
| class HTMLMediaElement;
|
| }
|
| @@ -58,12 +58,12 @@ class WebContentDecryptionModule;
|
| class WebMediaPlayer;
|
| class WebGraphicsContext3D;
|
|
|
| -// This class serves as a bridge between WebCore::MediaPlayer and
|
| +// This class serves as a bridge between blink::MediaPlayer and
|
| // blink::WebMediaPlayer.
|
| -class WebMediaPlayerClientImpl FINAL : public WebCore::MediaPlayer, public WebMediaPlayerClient {
|
| +class WebMediaPlayerClientImpl FINAL : public blink::MediaPlayer, public WebMediaPlayerClient {
|
|
|
| public:
|
| - static PassOwnPtr<WebCore::MediaPlayer> create(WebCore::MediaPlayerClient*);
|
| + static PassOwnPtr<blink::MediaPlayer> create(blink::MediaPlayerClient*);
|
|
|
| virtual ~WebMediaPlayerClientImpl();
|
|
|
| @@ -98,28 +98,28 @@ public:
|
| // MediaPlayer methods:
|
| virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE;
|
| virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE;
|
| - virtual void paint(WebCore::GraphicsContext*, const WebCore::IntRect&) OVERRIDE;
|
| + virtual void paint(blink::GraphicsContext*, const blink::IntRect&) OVERRIDE;
|
| virtual bool copyVideoTextureToPlatformTexture(WebGraphicsContext3D*, Platform3DObject texture, GLint level, GLenum type, GLenum internalFormat, bool premultiplyAlpha, bool flipY) OVERRIDE;
|
| - virtual void setPreload(WebCore::MediaPlayer::Preload) OVERRIDE;
|
| + virtual void setPreload(blink::MediaPlayer::Preload) OVERRIDE;
|
|
|
| #if ENABLE(WEB_AUDIO)
|
| - virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE;
|
| + virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE;
|
| #endif
|
|
|
| private:
|
| - explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*);
|
| + explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*);
|
|
|
| - WebCore::HTMLMediaElement& mediaElement() const;
|
| + blink::HTMLMediaElement& mediaElement() const;
|
|
|
| - WebCore::MediaPlayerClient* m_client;
|
| + blink::MediaPlayerClient* m_client;
|
| OwnPtr<WebMediaPlayer> m_webMediaPlayer;
|
| - WebCore::MediaPlayer::Preload m_preload;
|
| + blink::MediaPlayer::Preload m_preload;
|
|
|
| #if OS(ANDROID)
|
| // FIXME: This path "only works" on Android. It is a workaround for the problem that Skia could not handle Android's GL_TEXTURE_EXTERNAL_OES
|
| // texture internally. It should be removed and replaced by the normal paint path.
|
| // https://code.google.com/p/skia/issues/detail?id=1189
|
| - void paintOnAndroid(WebCore::GraphicsContext*, const WebCore::IntRect&, uint8_t alpha);
|
| + void paintOnAndroid(blink::GraphicsContext*, const blink::IntRect&, uint8_t alpha);
|
| SkBitmap m_bitmap;
|
| bool m_usePaintOnAndroid;
|
| #endif
|
| @@ -130,7 +130,7 @@ private:
|
|
|
| class AudioClientImpl FINAL : public blink::WebAudioSourceProviderClient {
|
| public:
|
| - AudioClientImpl(WebCore::AudioSourceProviderClient* client)
|
| + AudioClientImpl(blink::AudioSourceProviderClient* client)
|
| : m_client(client)
|
| {
|
| }
|
| @@ -141,13 +141,13 @@ private:
|
| virtual void setFormat(size_t numberOfChannels, float sampleRate) OVERRIDE;
|
|
|
| private:
|
| - WebCore::AudioSourceProviderClient* m_client;
|
| + blink::AudioSourceProviderClient* m_client;
|
| };
|
|
|
| // AudioSourceProviderImpl wraps a WebAudioSourceProvider.
|
| // provideInput() calls into Chromium to get a rendered audio stream.
|
|
|
| - class AudioSourceProviderImpl FINAL : public WebCore::AudioSourceProvider {
|
| + class AudioSourceProviderImpl FINAL : public blink::AudioSourceProvider {
|
| public:
|
| AudioSourceProviderImpl()
|
| : m_webAudioSourceProvider(0)
|
| @@ -159,9 +159,9 @@ private:
|
| // Wraps the given WebAudioSourceProvider.
|
| void wrap(WebAudioSourceProvider*);
|
|
|
| - // WebCore::AudioSourceProvider
|
| - virtual void setClient(WebCore::AudioSourceProviderClient*) OVERRIDE;
|
| - virtual void provideInput(WebCore::AudioBus*, size_t framesToProcess) OVERRIDE;
|
| + // blink::AudioSourceProvider
|
| + virtual void setClient(blink::AudioSourceProviderClient*) OVERRIDE;
|
| + virtual void provideInput(blink::AudioBus*, size_t framesToProcess) OVERRIDE;
|
|
|
| private:
|
| WebAudioSourceProvider* m_webAudioSourceProvider;
|
|
|