Index: Source/web/WebMediaPlayerClientImpl.h |
diff --git a/Source/web/WebMediaPlayerClientImpl.h b/Source/web/WebMediaPlayerClientImpl.h |
index 91cd9d734feed7ede44fdbf9f56597e2f2b5e971..37d653b60f18b68919afded517abdafecb59bc45 100644 |
--- a/Source/web/WebMediaPlayerClientImpl.h |
+++ b/Source/web/WebMediaPlayerClientImpl.h |
@@ -68,7 +68,7 @@ public: |
virtual ~WebMediaPlayerClientImpl(); |
// Returns the encapsulated blink::WebMediaPlayer. |
- WebMediaPlayer* mediaPlayer() const; |
+ virtual WebMediaPlayer* webMediaPlayer() const OVERRIDE; |
// WebMediaPlayerClient methods: |
virtual void networkStateChanged() OVERRIDE; |
@@ -81,12 +81,17 @@ public: |
virtual double volume() const OVERRIDE; |
virtual void playbackStateChanged() OVERRIDE; |
virtual WebMediaPlayer::Preload preload() const OVERRIDE; |
+ |
+ // WebEncryptedMediaPlayerClient methods: |
+ // FIXME: Remove these once the WebMediaPlayer implementation stop making these calls on the WebMediaPlayerClient object. |
virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) OVERRIDE; |
virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) OVERRIDE; |
virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) OVERRIDE; |
virtual void keyNeeded(const WebString& contentType, const unsigned char* initData, unsigned initDataLength) OVERRIDE; |
virtual WebPlugin* createHelperPlugin(const WebString& pluginType, WebFrame*) OVERRIDE; |
virtual void closeHelperPluginSoon(WebFrame*) OVERRIDE; |
+ virtual void playerDestroyed(); |
+ |
virtual bool needsWebLayerForVideo() const OVERRIDE; |
virtual void setWebLayer(WebLayer*) OVERRIDE; |
virtual void addTextTrack(WebInbandTextTrack*) OVERRIDE; |
@@ -139,11 +144,6 @@ public: |
virtual WebCore::AudioSourceProvider* audioSourceProvider() OVERRIDE; |
#endif |
- virtual WebCore::MediaPlayer::MediaKeyException generateKeyRequest(const String& keySystem, const unsigned char* initData, unsigned initDataLength) OVERRIDE; |
- virtual WebCore::MediaPlayer::MediaKeyException addKey(const String& keySystem, const unsigned char* key, unsigned keyLength, const unsigned char* initData, unsigned initDataLength, const String& sessionId) OVERRIDE; |
- virtual WebCore::MediaPlayer::MediaKeyException cancelKeyRequest(const String& keySystem, const String& sessionId) OVERRIDE; |
- virtual void setContentDecryptionModule(WebContentDecryptionModule*) OVERRIDE; |
- |
private: |
explicit WebMediaPlayerClientImpl(WebCore::MediaPlayerClient*); |
@@ -168,7 +168,6 @@ private: |
double m_volume; |
bool m_muted; |
double m_rate; |
- WebContentDecryptionModule* m_cdm; |
#if ENABLE(WEB_AUDIO) |
// AudioClientImpl wraps an AudioSourceProviderClient. |