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

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

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.cpp
diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp
index 0760ee356b0780ba0127f132c6ea8d9771a48813..b7dcac448a0d14429bdfaede557bc8c5a804ec7b 100644
--- a/Source/modules/encryptedmedia/MediaKeySession.cpp
+++ b/Source/modules/encryptedmedia/MediaKeySession.cpp
@@ -145,13 +145,6 @@ void MediaKeySession::addKeyTimerFired(Timer<MediaKeySession>*)
}
}
-void MediaKeySession::keyAdded()
-{
- RefPtr<Event> event = Event::create(EventTypeNames::webkitkeyadded);
- event->setTarget(this);
- m_asyncEventQueue->enqueueEvent(event.release());
-}
-
// Queue a task to fire a simple event named keyadded at the MediaKeySession object.
void MediaKeySession::keyError(MediaKeyErrorCode errorCode, unsigned long systemCode)
{
@@ -172,7 +165,7 @@ void MediaKeySession::keyError(MediaKeyErrorCode errorCode, unsigned long system
m_error = MediaKeyError::create(mediaKeyErrorCode, systemCode);
// 3. queue a task to fire a simple event named keyerror at the MediaKeySession object.
- RefPtr<Event> event = Event::create(EventTypeNames::webkitkeyerror);
+ RefPtr<Event> event = Event::create(EventTypeNames::error);
event->setTarget(this);
m_asyncEventQueue->enqueueEvent(event.release());
}
@@ -186,7 +179,21 @@ void MediaKeySession::keyMessage(const unsigned char* message, size_t messageLen
init.message = Uint8Array::create(message, messageLength);
init.destinationURL = destinationURL;
- RefPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::webkitkeymessage, init);
+ RefPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::message, init);
+ event->setTarget(this);
+ m_asyncEventQueue->enqueueEvent(event.release());
+}
+
+void MediaKeySession::keyReady()
+{
+ RefPtr<Event> event = Event::create(EventTypeNames::ready);
+ event->setTarget(this);
+ m_asyncEventQueue->enqueueEvent(event.release());
+}
+
+void MediaKeySession::keyClosed()
+{
+ RefPtr<Event> event = Event::create(EventTypeNames::closed);
event->setTarget(this);
m_asyncEventQueue->enqueueEvent(event.release());
}

Powered by Google App Engine
This is Rietveld 408576698