Update MediaKeySession method names to latest EME spec.

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 60 matching lines @@
 MediaKeys::MediaKeys(const String& keySystem, PassOwnPtr<ContentDecryptionModule> cdm)
     : m_mediaElement(0)
     , m_keySystem(keySystem)
     , m_cdm(cdm)
 {
     ScriptWrappable::init(this);
 }
 
 MediaKeys::~MediaKeys()
 {
-    // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-media-keys-constructor>:
-    // When destroying a MediaKeys object, follow the steps in close().
-    for (size_t i = 0; i < m_sessions.size(); ++i)
-        m_sessions[i]->close();
+    // FIXME: Make sure MediaKeySessions are torn down correctly.
 }
 
 PassRefPtr<MediaKeySession> MediaKeys::createSession(ExecutionContext* context, const String& type, Uint8Array* initData, ExceptionState& exceptionState)
 {
     // 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.
 
-    // 1. If type is null or an empty string and initData is not null or an empty string, throw an
+    // 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.throwUninformativeAndGenericDOMException(InvalidAccessError);
         return 0;
     }
 
-    // 2. If type contains a MIME type that is not supported or is not supported by the keySystem, throw
-    // a NotSupportedError exception and abort these steps.
+    // 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)) {
         exceptionState.throwUninformativeAndGenericDOMException(NotSupportedError);
         return 0;
     }
 
-    // 3. Create a new MediaKeySession object.
+    // 2. Create a new MediaKeySession object.
     RefPtr<MediaKeySession> session = MediaKeySession::create(context, m_cdm.get(), this);
-    // 3.1 Let the keySystem attribute be keySystem.
+    // 2.1 Let the keySystem attribute be keySystem.
     ASSERT(!session->keySystem().isEmpty());
-    // 3.2 Let the sessionId attribute be a unique Session ID string. It may be generated by cdm.
-    // This is handled by m_cdm and may happen asynchronously.
+    // FIXME: 2.2 Let the state of the session be CREATED.
 
-    // 4. Add the new object to an internal list of session objects.
+    // 3. Add the new object to an internal list of session objects.
     m_sessions.append(session);
 
-    // 5. Schedule a task to generate a key request, providing type, initData, and the new object.
-    session->generateKeyRequest(type, initData);
+    // 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.

[ddorwin, 2014/01/09 01:35:31]

Empty, but not NULL. Maybe you mean the IDL needs to be updated to match the
spec? Is that covered by l90?

[xhwang, 2014/01/09 02:32:17]

In this function, |initData| is a pointer which can be 0. Yes, the IDL change is
covered by l.90.

[ddorwin, 2014/01/09 18:05:33]

Shouldn't we note that this FIXME may become obsolete with that change? We don't
want someone to come along and fix this after that change.

[xhwang, 2014/01/09 20:01:26]

Done.

+    session->initializeNewSession(type, initData);
 
-    // 6. Return the new object to the caller.
+    // 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.
     // FIXME: Hook up the CDM to the WebMediaPlayer in Chromium.
     ASSERT(!m_mediaElement);
     m_mediaElement = element;
 }
 
 }