Schedule session initialization in MediaKeys.

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 30 matching lines @@
 {
     return adoptRef(new MediaKeySession(context, cdm, keys));
 }
 
 MediaKeySession::MediaKeySession(ExecutionContext* context, ContentDecryptionModule* cdm, MediaKeys* keys)
     : ContextLifecycleObserver(context)
     , m_keySystem(keys->keySystem())
     , m_asyncEventQueue(GenericEventQueue::create(this))
     , m_session(cdm->createSession(this))
     , m_keys(keys)
-    , m_initializeNewSessionTimer(this, &MediaKeySession::initializeNewSessionTimerFired)
     , m_updateTimer(this, &MediaKeySession::updateTimerFired)
 {
     ScriptWrappable::init(this);
     ASSERT(m_session);
 }
 
 MediaKeySession::~MediaKeySession()
 {
     m_session.clear();
     m_asyncEventQueue->cancelAllEvents();
@@ skipping 11 matching lines @@
 void MediaKeySession::release(ExceptionState& exceptionState)
 {
     m_session->release();
 }
 
 String MediaKeySession::sessionId() const
 {
     return m_session->sessionId();
 }
 
-void MediaKeySession::initializeNewSession(const String& mimeType, Uint8Array* initData)
+void MediaKeySession::initializeNewSession(const String& mimeType, const Uint8Array& initData)
 {
-    m_pendingInitializeNewSessionData.append(InitializeNewSessionData(mimeType, initData));
-    m_initializeNewSessionTimer.startOneShot(0);
-}
-
-void MediaKeySession::initializeNewSessionTimerFired(Timer<MediaKeySession>*)
-{
-    ASSERT(m_pendingInitializeNewSessionData.size());
-
-    while (!m_pendingInitializeNewSessionData.isEmpty()) {
-        InitializeNewSessionData data = m_pendingInitializeNewSessionData.takeFirst();
-        // FIXME: Refer to the spec to see what needs to be done in blink.
-        m_session->initializeNewSession(data.mimeType, *data.initData);
-    }
+    m_session->initializeNewSession(mimeType, initData);
 }
 
 void MediaKeySession::update(Uint8Array* response, ExceptionState& exceptionState)
 {
     // From <https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-update>:
     // The update(response) method must run the following steps:
     // 1. If the argument is null or an empty array, throw an INVALID_ACCESS_ERR.
     if (!response || !response->length()) {
         exceptionState.throwDOMException(InvalidAccessError, String::format("The response argument provided is %s.", response ? "an empty array" : "invalid"));
         return;
     }
 
     // 2. If the session is not in the PENDING state, throw an INVALID_STATE_ERR.
     // FIXME: Implement states in MediaKeySession.
 
     // 3. Schedule a task to handle the call, providing response.
-    m_pendingKeys.append(response);
-    m_updateTimer.startOneShot(0);
+    m_pendingUpdates.append(response);
+
+    if (!m_updateTimer.isActive())
+        m_updateTimer.startOneShot(0);
 }
 
 void MediaKeySession::updateTimerFired(Timer<MediaKeySession>*)
 {
-    ASSERT(m_pendingKeys.size());
+    ASSERT(m_pendingUpdates.size());
 
-    while (!m_pendingKeys.isEmpty()) {
-        RefPtr<Uint8Array> pendingKey = m_pendingKeys.takeFirst();
+    while (!m_pendingUpdates.isEmpty()) {
+        RefPtr<Uint8Array> pendingUpdate = m_pendingUpdates.takeFirst();
 
-        // NOTE: Continued from step 2. of MediaKeySession::update()
-        // 2.1. Let cdm be the cdm loaded in the MediaKeys constructor.
+        // NOTE: Continued from step 3. of MediaKeySession::update()
+        // 3.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);
+        // 3.2. Let request be null.
+        // 3.3. Use cdm to execute the following steps:
+        // 3.3.1 Process response.
+        m_session->update(*pendingUpdate);
     }
 }
 
 void MediaKeySession::keyAdded()
 {
     RefPtr<Event> event = Event::create(EventTypeNames::webkitkeyadded);
     event->setTarget(this);
     m_asyncEventQueue->enqueueEvent(event.release());
 }
 
@@ skipping 40 matching lines @@
 {
     return EventTargetNames::MediaKeySession;
 }
 
 ExecutionContext* MediaKeySession::executionContext() const
 {
     return ContextLifecycleObserver::executionContext();
 }
 
 }