Index: Source/web/WebMediaPlayerClientImpl.h |
diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h |
index 807b380d76c3824b778a30ee4f59a57be993613b..7e71cb261b37240de649254e833e837f78acda76 100644 |
--- a/Source/web/WebMediaPlayerClientImpl.h |
+++ b/Source/web/WebMediaPlayerClientImpl.h |
@@ -41,22 +41,19 @@ |
#include "wtf/ThreadingPrimitives.h" |
namespace blink { |
+ |
class AudioSourceProviderClient; |
class HTMLMediaElement; |
-} |
- |
-namespace blink { |
- |
class WebAudioSourceProvider; |
class WebContentDecryptionModule; |
class WebMediaPlayer; |
-// This class serves as a bridge between blink::MediaPlayer and |
-// blink::WebMediaPlayer. |
-class WebMediaPlayerClientImpl FINAL : public blink::MediaPlayer, public WebMediaPlayerClient { |
+// This class serves as a bridge between MediaPlayer and |
+// WebMediaPlayer. |
+class WebMediaPlayerClientImpl FINAL : public MediaPlayer, public WebMediaPlayerClient { |
public: |
- static PassOwnPtr<blink::MediaPlayer> create(blink::MediaPlayerClient*); |
+ static PassOwnPtr<MediaPlayer> create(MediaPlayerClient*); |
virtual ~WebMediaPlayerClientImpl(); |
@@ -89,27 +86,27 @@ public: |
// MediaPlayer methods: |
virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE; |
virtual void load(WebMediaPlayer::LoadType, const WTF::String& url, WebMediaPlayer::CORSMode) OVERRIDE; |
- virtual void setPreload(blink::MediaPlayer::Preload) OVERRIDE; |
+ virtual void setPreload(MediaPlayer::Preload) OVERRIDE; |
#if ENABLE(WEB_AUDIO) |
- virtual blink::AudioSourceProvider* audioSourceProvider() OVERRIDE; |
+ virtual AudioSourceProvider* audioSourceProvider() OVERRIDE; |
#endif |
private: |
- explicit WebMediaPlayerClientImpl(blink::MediaPlayerClient*); |
+ explicit WebMediaPlayerClientImpl(MediaPlayerClient*); |
- blink::HTMLMediaElement& mediaElement() const; |
+ HTMLMediaElement& mediaElement() const; |
- blink::MediaPlayerClient* m_client; |
+ MediaPlayerClient* m_client; |
OwnPtr<WebMediaPlayer> m_webMediaPlayer; |
#if ENABLE(WEB_AUDIO) |
// AudioClientImpl wraps an AudioSourceProviderClient. |
// When the audio format is known, Chromium calls setFormat() which then dispatches into WebCore. |
- class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<AudioClientImpl>, public blink::WebAudioSourceProviderClient { |
+ class AudioClientImpl FINAL : public NoBaseWillBeGarbageCollectedFinalized<AudioClientImpl>, public WebAudioSourceProviderClient { |
public: |
- explicit AudioClientImpl(blink::AudioSourceProviderClient* client) |
+ explicit AudioClientImpl(AudioSourceProviderClient* client) |
: m_client(client) |
{ |
} |
@@ -122,13 +119,13 @@ private: |
void trace(Visitor*); |
private: |
- RawPtrWillBeMember<blink::AudioSourceProviderClient> m_client; |
+ RawPtrWillBeMember<AudioSourceProviderClient> m_client; |
}; |
// AudioSourceProviderImpl wraps a WebAudioSourceProvider. |
// provideInput() calls into Chromium to get a rendered audio stream. |
- class AudioSourceProviderImpl FINAL : public blink::AudioSourceProvider { |
+ class AudioSourceProviderImpl FINAL : public AudioSourceProvider { |
public: |
AudioSourceProviderImpl() |
: m_webAudioSourceProvider(0) |
@@ -140,9 +137,9 @@ private: |
// Wraps the given WebAudioSourceProvider. |
void wrap(WebAudioSourceProvider*); |
- // blink::AudioSourceProvider |
- virtual void setClient(blink::AudioSourceProviderClient*) OVERRIDE; |
- virtual void provideInput(blink::AudioBus*, size_t framesToProcess) OVERRIDE; |
+ // AudioSourceProvider |
+ virtual void setClient(AudioSourceProviderClient*) OVERRIDE; |
+ virtual void provideInput(AudioBus*, size_t framesToProcess) OVERRIDE; |
private: |
WebAudioSourceProvider* m_webAudioSourceProvider; |