diff options
Diffstat (limited to 'Source/WebCore/platform/graphics/MediaPlayer.h')
| -rw-r--r-- | Source/WebCore/platform/graphics/MediaPlayer.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Source/WebCore/platform/graphics/MediaPlayer.h b/Source/WebCore/platform/graphics/MediaPlayer.h index 60876e638..be93e8701 100644 --- a/Source/WebCore/platform/graphics/MediaPlayer.h +++ b/Source/WebCore/platform/graphics/MediaPlayer.h @@ -44,7 +44,7 @@ #include <wtf/text/StringHash.h> #if USE(ACCELERATED_COMPOSITING) -#include "GraphicsLayer.h" +#include "PlatformLayer.h" #endif OBJC_CLASS AVPlayer; @@ -184,10 +184,10 @@ public: #if ENABLE(ENCRYPTED_MEDIA) enum MediaKeyErrorCode { UnknownError = 1, ClientError, ServiceError, OutputError, HardwareChangeError, DomainError }; - virtual void mediaPlayerKeyAdded(MediaPlayer*, const String& keySystem, const String& sessionId) { } - virtual void mediaPlayerKeyError(MediaPlayer*, const String& keySystem, const String& sessionId, MediaKeyErrorCode errorCode, unsigned short systemCode) { } - virtual void mediaPlayerKeyMessage(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength) { } - virtual void mediaPlayerKeyNeeded(MediaPlayer*, const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength) { } + virtual void mediaPlayerKeyAdded(MediaPlayer*, const String&, const String&) { } + virtual void mediaPlayerKeyError(MediaPlayer*, const String&, const String&, MediaKeyErrorCode, unsigned short) { } + virtual void mediaPlayerKeyMessage(MediaPlayer*, const String&, const String&, const unsigned char*, unsigned) { } + virtual bool mediaPlayerKeyNeeded(MediaPlayer*, const String&, const String&, const unsigned char*, unsigned) { return false; } #endif virtual String mediaPlayerReferrer() const { return String(); } @@ -412,7 +412,7 @@ public: void keyAdded(const String& keySystem, const String& sessionId); void keyError(const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode); void keyMessage(const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength); - void keyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength); + bool keyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength); #endif String referrer() const; |