Index: Source/core/html/HTMLMediaElement.h |
diff --git a/Source/core/html/HTMLMediaElement.h b/Source/core/html/HTMLMediaElement.h |
index 8b5b03a8ea5c634646226f86162d0f6e61a72eac..0ab717252747f535ef1108128457ef4fbb71b23b 100644 |
--- a/Source/core/html/HTMLMediaElement.h |
+++ b/Source/core/html/HTMLMediaElement.h |
@@ -147,7 +147,7 @@ public: |
void closeMediaSource(); |
void durationChanged(double duration); |
- // encrypted media extensions |
+ // encrypted media extensions (prefixed) |
void webkitGenerateKeyRequest(const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionState&); |
void webkitGenerateKeyRequest(const String& keySystem, ExceptionState&); |
void webkitAddKey(const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionState&); |
@@ -159,8 +159,10 @@ public: |
DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage); |
DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitneedkey); |
+ // encrypted media extensions (non-prefixed) |
MediaKeys* mediaKeys() const { return m_mediaKeys.get(); } |
void setMediaKeys(MediaKeys*); |
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(needkey); |
// controls |
bool controls() const; |
@@ -358,8 +360,7 @@ private: |
virtual void mediaPlayerKeyAdded(const String& keySystem, const String& sessionId) OVERRIDE FINAL; |
virtual void mediaPlayerKeyError(const String& keySystem, const String& sessionId, MediaPlayerClient::MediaKeyErrorCode, unsigned short systemCode) OVERRIDE FINAL; |
virtual void mediaPlayerKeyMessage(const String& keySystem, const String& sessionId, const unsigned char* message, unsigned messageLength, const KURL& defaultURL) OVERRIDE FINAL; |
- virtual bool mediaPlayerKeyNeeded(const String& keySystem, const String& sessionId, const unsigned char* initData, unsigned initDataLength) OVERRIDE FINAL; |
- virtual bool mediaPlayerKeyNeeded(Uint8Array*) OVERRIDE FINAL; |
+ virtual bool mediaPlayerKeyNeeded(const String& mimeType, const unsigned char* initData, unsigned initDataLength) OVERRIDE FINAL; |
acolwell GONE FROM CHROMIUM
2014/01/11 01:11:25
nit: s/mimeType/contentType/ to match all the othe
jrummell
2014/01/11 01:56:56
Done.
|
virtual CORSMode mediaPlayerCORSMode() const OVERRIDE FINAL; |