Schedule session initialization in MediaKeys.

Source/modules/encryptedmedia/MediaKeys.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 12 matching lines @@
  * THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "config.h"
 #include "modules/encryptedmedia/MediaKeys.h"
 
 #include "bindings/v8/ExceptionState.h"
 #include "core/events/ThreadLocalEventNames.h"
 #include "core/html/HTMLMediaElement.h"
 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
-#include "modules/encryptedmedia/MediaKeySession.h"
 #include "platform/UUID.h"
 #include "platform/drm/ContentDecryptionModule.h"
 #include "wtf/HashSet.h"
 
 namespace WebCore {
 
 PassRefPtr<MediaKeys> MediaKeys::create(const String& keySystem, ExceptionState& exceptionState)
 {
     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-media-keys-constructor>:
     // The MediaKeys(keySystem) constructor must run the following steps:
@@ skipping 21 matching lines @@
     // 5. Create a new MediaKeys object.
     // 5.1 Let the keySystem attribute be keySystem.
     // 6. Return the new object to the caller.
     return adoptRef(new MediaKeys(keySystem, cdm.release()));
 }
 
 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule> cdm)
     : m_mediaElement(0)
     , m_keySystem(keySystem)
     , m_cdm(cdm)
+    , m_initializeNewSessionTimer(this, &MediaKeys::initializeNewSessionTimerFired)
 {
     ScriptWrappable::init(this);
 }
 
 MediaKeys::~MediaKeys()
 {
     // FIXME: Make sure MediaKeySessions are torn down correctly.
 }
 
 PassRefPtr<MediaKeySession> MediaKeys::createSession(ExecutionContext* context, const String& type, Uint8Array* initData, ExceptionState& exceptionState)

[ddorwin, 2014/01/13 20:20:57]

type is now contentType

[xhwang, 2014/01/14 04:04:11]

Done.

 {
     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-createsession>:
     // The createSession(type, initData) method must run the following steps:
     // Note: The contents of initData are container-specific Initialization Data.
 
-    // FIXME: Follow the latest spec to check |type| and |initData|.
-    // If type is null or an empty string and initData is not null or an empty string, throw an
-    // InvalidAccessError exception and abort these steps.
-    if ((type.isEmpty()) && (!initData || initData->length())) {
-        exceptionState.throwDOMException(InvalidAccessError, "The type provided is empty, but initData is not empty.");
+    if (type.isEmpty() || !initData || !initData->length()) {
+        exceptionState.throwDOMException(InvalidAccessError, "The type or initData provided is empty or null.");

[ddorwin, 2014/01/13 20:20:57]

I wonder what is the best practice for these strings.

It seems odd that we combine two parameters in the exception message. I wonder
if we should separate them.

[xhwang, 2014/01/14 04:04:11]

Done.

         return 0;
     }
 
     // 1. If type contains a MIME type that is not supported or is not supported by the keySystem,
     // throw a NOT_SUPPORTED_ERR exception and abort these steps.
-    ASSERT(!type.isEmpty());
-    if (type.isEmpty() || !m_cdm->supportsMIMEType(type)) {
+    if (!m_cdm->supportsMIMEType(type)) {
         exceptionState.throwDOMException(NotSupportedError, "The type provided ('" + type + "') is unsupported.");
         return 0;
     }
 
     // 2. Create a new MediaKeySession object.
     RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get(), this);
     // 2.1 Let the keySystem attribute be keySystem.
     ASSERT(!session->keySystem().isEmpty());
     // FIXME: 2.2 Let the state of the session be CREATED.
 
     // 3. Add the new object to an internal list of session objects.
     m_sessions.append(session);
 
     // 4. Schedule a task to initialize the session, providing type, initData, and the new object.
-    // FIXME: The spec says "schedule a task". We should move the timer here.
-    // FIXME: |initData| may be 0. We need to add more check before we dereference it.
-    // Note that this may become obsolete when the FIXME on l.90 is fixed.
-    session->initializeNewSession(type, initData);
+    m_pendingInitializeNewSessionData.append(InitializeNewSessionData(session, type, initData));
+
+    if (!m_initializeNewSessionTimer.isActive())
+        m_initializeNewSessionTimer.startOneShot(0);
 
     // 5. Return the new object to the caller.
     return session;
 }
 
 void MediaKeys::setMediaElement(HTMLMediaElement* element)
 {
     // FIXME: Cause HTMLMediaElement::setMediaKeys() to throw an exception if m_mediaElement is not 0
     // and remove the code that prevents the assert below in HTMLMediaElement.
     ASSERT(!m_mediaElement != !element);
     m_mediaElement = element;
 }
 
 blink::WebContentDecryptionModule* MediaKeys::contentDecryptionModule()
 {
     return m_cdm ? m_cdm->contentDecryptionModule() : 0;
 }
 
+void MediaKeys::initializeNewSessionTimerFired(Timer<MediaKeys>*)
+{
+    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.
+        data.session->initializeNewSession(data.mimeType, *data.initData);
+    }
 }
+
+}