Index: public/platform/WebMediaPlayerClient.h |
diff --git a/public/platform/WebMediaPlayerClient.h b/public/platform/WebMediaPlayerClient.h |
index 67e0ad048b031287fe878458b1e255d2d3c95c62..399706020595fe66fbb0e7e6e6f05ca8bd2a4f8a 100644 |
--- a/public/platform/WebMediaPlayerClient.h |
+++ b/public/platform/WebMediaPlayerClient.h |
@@ -32,26 +32,15 @@ |
#define WebMediaPlayerClient_h |
#include "WebMediaPlayer.h" |
-#include "public/platform/WebEncryptedMediaTypes.h" |
namespace blink { |
class WebInbandTextTrack; |
class WebLayer; |
class WebMediaSource; |
-class WebURL; |
class WebMediaPlayerClient { |
public: |
- enum MediaKeyErrorCode { |
- MediaKeyErrorCodeUnknown = 1, |
- MediaKeyErrorCodeClient, |
- MediaKeyErrorCodeService, |
- MediaKeyErrorCodeOutput, |
- MediaKeyErrorCodeHardwareChange, |
- MediaKeyErrorCodeDomain, |
- }; |
- |
enum VideoTrackKind { |
VideoTrackKindNone, |
VideoTrackKindAlternative, |
@@ -79,12 +68,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,7 +76,7 @@ public: |
virtual void addTextTrack(WebInbandTextTrack*) = 0; |
virtual void removeTextTrack(WebInbandTextTrack*) = 0; |
virtual void mediaSourceOpened(WebMediaSource*) = 0; |
- virtual void requestSeek(double) = 0; |
+ virtual void mediaPlayerRequestSeek(double) = 0; |
ddorwin
2015/07/06 20:43:01
Is there a reason this name was changed?
Srirama
2015/07/09 15:19:37
As per Philip's suggestion in patchset3, i have ch
Srirama
2015/07/15 13:25:24
Done.
|
virtual void remoteRouteAvailabilityChanged(bool) = 0; |
virtual void connectedToRemoteDevice() = 0; |
virtual void disconnectedFromRemoteDevice() = 0; |