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()); |
} |