Update MediaKeySession events to match latest EME spec

Source/modules/encryptedmedia/MediaKeySession.cpp

 /*
  * Copyright (C) 2013 Apple Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
@@ skipping 114 matching lines @@
         // NOTE: Continued from step 2. of MediaKeySession::update()
         // 2.1. Let cdm be the cdm loaded in the MediaKeys constructor.
         // NOTE: This is m_session.
         // 2.2. Let 'did store key' be false.
         // 2.3. Let 'next message' be null.
         // 2.4. Use cdm to handle key.
         m_session->update(*pendingKey);
     }
 }
 
-void MediaKeySession::keyAdded()
+// Queue a task to fire a simple event named keymessage at the new object
+void MediaKeySession::message(const unsigned char* message, size_t messageLength, const KURL& destinationURL)
 {
-    RefPtr<Event> event = Event::create(EventTypeNames::webkitkeyadded);
+    MediaKeyMessageEventInit init;
+    init.bubbles = false;
+    init.cancelable = false;
+    init.message = Uint8Array::create(message, messageLength);
+    init.destinationURL = destinationURL;
+
+    RefPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::message, init);
+    event->setTarget(this);
+    m_asyncEventQueue->enqueueEvent(event.release());
+}
+
+void MediaKeySession::ready()
+{
+    RefPtr<Event> event = Event::create(EventTypeNames::ready);
+    event->setTarget(this);
+    m_asyncEventQueue->enqueueEvent(event.release());
+}
+
+void MediaKeySession::close()
+{
+    RefPtr<Event> event = Event::create(EventTypeNames::close);
     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)
+void MediaKeySession::error(MediaKeyErrorCode errorCode, unsigned long systemCode)
 {
     MediaKeyError::Code mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
     switch (errorCode) {
     case UnknownError:
         mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_UNKNOWN;
         break;
     case ClientError:
         mediaKeyErrorCode = MediaKeyError::MEDIA_KEYERR_CLIENT;
         break;
     }
 
     // 1. Create a new MediaKeyError object with the following attributes:
     //    code = the appropriate MediaKeyError code
     //    systemCode = a Key System-specific value, if provided, and 0 otherwise
     // 2. Set the MediaKeySession object's error attribute to the error object created in the previous step.
     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());
 }
-
-// Queue a task to fire a simple event named keymessage at the new object
-void MediaKeySession::keyMessage(const unsigned char* message, size_t messageLength, const KURL& destinationURL)
-{
-    MediaKeyMessageEventInit init;
-    init.bubbles = false;
-    init.cancelable = false;
-    init.message = Uint8Array::create(message, messageLength);
-    init.destinationURL = destinationURL;
-
-    RefPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::webkitkeymessage, init);
-    event->setTarget(this);
-    m_asyncEventQueue->enqueueEvent(event.release());
-}
 
 const AtomicString& MediaKeySession::interfaceName() const
 {
     return EventTargetNames::MediaKeySession;
 }
 
 ExecutionContext* MediaKeySession::executionContext() const
 {
     return ContextLifecycleObserver::executionContext();
 }
 
 }