Update MediaKeySession method names to 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 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_keyRequestTimer(this, &MediaKeySession::keyRequestTimerFired)
+    , m_initializeNewSessionTimer(this, &MediaKeySession::initializeNewSessionTimerFired)
     , m_addKeyTimer(this, &MediaKeySession::addKeyTimerFired)
 {
     ScriptWrappable::init(this);
 }
 
 MediaKeySession::~MediaKeySession()
 {
-    close();
+    release();

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

We should NOT call release(). We may, however, want to run the other code in
release(). Actually, I think that code should NOT be in release() since
release() != CLOSED.

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

Done.

 }
 
 void MediaKeySession::setError(MediaKeyError* error)
 {
     m_error = error;
 }
 
-void MediaKeySession::close()
+void MediaKeySession::release()
 {
     ASSERT(!m_keys == !m_session);

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

This probably doesn't make sense anymore given the other comments I made.

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

Done.

 
     if (m_session)
-        m_session->close();
+        m_session->release();
     m_session.clear();

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

I think this line and below should only be in the destructor.

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

Done.

     m_asyncEventQueue->cancelAllEvents();
 
     // FIXME: Release ref that MediaKeys has by removing it from m_sessions.
     // if (m_keys) m_keys->sessionClosed(this);
     m_keys = 0;
 }
 
 String MediaKeySession::sessionId() const
 {
     return m_session->sessionId();
 }
 
-void MediaKeySession::generateKeyRequest(const String& mimeType, Uint8Array* initData)
+void MediaKeySession::initializeNewSession(const String& mimeType, Uint8Array* initData)
 {
-    m_pendingKeyRequests.append(PendingKeyRequest(mimeType, initData));
-    // FIXME: Eliminate timers. Asynchronicity will be handled in Chromium.
-    m_keyRequestTimer.startOneShot(0);
+    m_pendingInitializeNewSessionData.append(InitializeNewSessionData(mimeType, initData));
+    m_initializeNewSessionTimer.startOneShot(0);
 }
 
-void MediaKeySession::keyRequestTimerFired(Timer<MediaKeySession>*)
+void MediaKeySession::initializeNewSessionTimerFired(Timer<MediaKeySession>*)
 {
-    ASSERT(m_pendingKeyRequests.size());
+    ASSERT(m_pendingInitializeNewSessionData.size());
     if (!m_session)
         return;

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

It might be worth noting why this can happen (release() immediately after
createSession()) since it was not obvious (to me).

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

Now we remove m_session.clear() to the dtor, so we don't need this check
anymore.

 
-    while (!m_pendingKeyRequests.isEmpty()) {
-        PendingKeyRequest request = m_pendingKeyRequests.takeFirst();
-
-        // NOTE: Continued from step 5 in MediaKeys::createSession().
-        // The user agent will asynchronously execute the following steps in the task:
-
-        // 1. Let cdm be the cdm loaded in the MediaKeys constructor.
-        // 2. Let destinationURL be null.
-
-        // 3. Use cdm to generate a key request and follow the steps for the first matching condition from the following list:
-        m_session->generateKeyRequest(request.mimeType, *request.initData);
+    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);
     }
 }
 
 void MediaKeySession::update(Uint8Array* key, ExceptionState& exceptionState)
 {
     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-addkey>:
     // The addKey(key) method must run the following steps:
     // 1. If the first or second argument [sic] is null or an empty array, throw an InvalidAccessError.
     // NOTE: the reference to a "second argument" is a spec bug.
     if (!key || !key->length()) {
@@ skipping 75 matching lines @@
 {
     return EventTargetNames::MediaKeySession;
 }
 
 ExecutionContext* MediaKeySession::executionContext() const
 {
     return ContextLifecycleObserver::executionContext();
 }
 
 }