Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1243)

Unified Diff: Source/modules/encryptedmedia/MediaKeySession.h

Issue 124253003: Update MediaKeySession events to match latest EME spec (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 12 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/MediaKeySession.h
diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
index 26ad01f7e48ad90b2b40f43e70996b7fc0e44695..b5d63d810f9c3a37a8b7128e8c0933cee73a7eb8 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.h
+++ b/Source/modules/encryptedmedia/MediaKeySession.h
@@ -70,9 +70,10 @@ public:
void enqueueEvent(PassRefPtr<Event>);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeyerror);
- DEFINE_ATTRIBUTE_EVENT_LISTENER(webkitkeymessage);
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(error);
ddorwin 2014/01/07 23:44:41 on* attributes do not exist in the WD, except for
jrummell 2014/01/08 18:05:52 Removed.
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(message);
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(ready);
+ DEFINE_ATTRIBUTE_EVENT_LISTENER(closed);
virtual const AtomicString& interfaceName() const OVERRIDE;
virtual ExecutionContext* executionContext() const OVERRIDE;
@@ -83,9 +84,10 @@ private:
void addKeyTimerFired(Timer<MediaKeySession>*);
// ContentDecryptionModuleSessionClient
- virtual void keyAdded() OVERRIDE;
virtual void keyError(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
ddorwin 2014/01/07 23:44:41 I think we should drop "key" here.
jrummell 2014/01/08 18:05:52 Done.
virtual void keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL) OVERRIDE;
+ virtual void keyReady() OVERRIDE;
+ virtual void keyClosed() OVERRIDE;
String m_keySystem;
RefPtr<MediaKeyError> m_error;

Powered by Google App Engine
This is Rietveld 408576698