| Index: public/platform/WebMediaPlayerClient.h
|
| diff --git a/public/platform/WebMediaPlayerClient.h b/public/platform/WebMediaPlayerClient.h
|
| index 8f5e7ff15528050751c6b6e0344e0f55e9dec48e..73ab219089503b24691b3e9c7e549c6c50fd1dea 100644
|
| --- a/public/platform/WebMediaPlayerClient.h
|
| +++ b/public/platform/WebMediaPlayerClient.h
|
| @@ -79,12 +79,6 @@ public:
|
| virtual void durationChanged() = 0;
|
| virtual void sizeChanged() = 0;
|
| virtual void playbackStateChanged() = 0;
|
| - virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
|
| - virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
|
| - virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) = 0;
|
| - virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) = 0;
|
| - virtual void didBlockPlaybackWaitingForKey() = 0;
|
| - virtual void didResumePlaybackBlockedForKey() = 0;
|
| virtual void setWebLayer(WebLayer*) = 0;
|
| virtual WebMediaPlayer::TrackId addAudioTrack(const WebString& id, AudioTrackKind, const WebString& label, const WebString& language, bool enabled) = 0;
|
| virtual void removeAudioTrack(WebMediaPlayer::TrackId) = 0;
|
| @@ -93,12 +87,20 @@ public:
|
| virtual void addTextTrack(WebInbandTextTrack*) = 0;
|
| virtual void removeTextTrack(WebInbandTextTrack*) = 0;
|
| virtual void mediaSourceOpened(WebMediaSource*) = 0;
|
| - virtual void requestFullscreen() = 0;
|
| - virtual void requestSeek(double) = 0;
|
| + virtual void mediaPlayerRequestFullscreen() = 0;
|
| + virtual void mediaPlayerRequestSeek(double) = 0;
|
| virtual void remoteRouteAvailabilityChanged(bool) = 0;
|
| virtual void connectedToRemoteDevice() = 0;
|
| virtual void disconnectedFromRemoteDevice() = 0;
|
|
|
| + // TODO(srirama): Remove these methods once blink updated.
|
| + virtual void keyAdded(const WebString& keySystem, const WebString& sessionId) = 0;
|
| + virtual void keyError(const WebString& keySystem, const WebString& sessionId, MediaKeyErrorCode, unsigned short systemCode) = 0;
|
| + virtual void keyMessage(const WebString& keySystem, const WebString& sessionId, const unsigned char* message, unsigned messageLength, const WebURL& defaultURL) = 0;
|
| + virtual void encrypted(WebEncryptedMediaInitDataType, const unsigned char* initData, unsigned initDataLength) = 0;
|
| + virtual void didBlockPlaybackWaitingForKey() = 0;
|
| + virtual void didResumePlaybackBlockedForKey() = 0;
|
| +
|
| protected:
|
| ~WebMediaPlayerClient() { }
|
| };
|
|
|