Set callback interface on WebCDMSession after creation.

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 95 matching lines @@
     virtual ~MediaKeySessionInitializer();
 
     void completeWithSession(blink::WebContentDecryptionModuleResult::SessionStatus);
     void completeWithDOMException(ExceptionCode, const String& errorMessage);
 
 private:
     MediaKeySessionInitializer(ScriptState*, MediaKeys*, const String& initDataType, PassRefPtr<Uint8Array> initData, const String& sessionType);
     void timerFired(Timer<MediaKeySessionInitializer>*);
 
     Persistent<MediaKeys> m_mediaKeys;
-    Persistent<MediaKeySession> m_session;
     OwnPtr<blink::WebContentDecryptionModuleSession> m_cdmSession;
 
     // The next 3 values are simply the initialization data saved so that the
     // asynchronous creation has the data needed.
     String m_initDataType;
     RefPtr<Uint8Array> m_initData;
     String m_sessionType;
 
     Timer<MediaKeySessionInitializer> m_timer;
 };
@@ skipping 72 matching lines @@
     //       with a new DOMException whose name is "InvalidAccessError".
     // 7.4.2 If the init data is not supported by the cdm, reject promise with
     //       a new DOMException whose name is "NotSupportedError".
     // 7.4.3 Let request be a request (e.g. a license request) generated based
     //       on the init data, which is interpreteted per initDataType, and
     //       sessionType. If sessionType is "temporary", the request is for a
     //       temporary non-persisted license. If sessionType is "persistent",
     //       the request is for a persistable license.
     // 7.4.4 If the init data indicates a default URL, let default URL be
     //       that URL. The URL may be validated and/or normalized.
-
-    // Currently the client callback interface is passed to Chromium when
-    // creating the session on the Chromium side. As a result, we need to
-    // create the session now.
-    // FIXME: Add an API to allow the client interface to be specified later
-    // to WebContentDecryptionModuleSession, and then creating the
-    // MediaKeySession object can be done in completeWithSession().
-    m_session = adoptRefCountedGarbageCollectedWillBeNoop(new MediaKeySession(executionContext(), m_mediaKeys));
-    m_session->suspendIfNeeded();
-
-    m_cdmSession = adoptPtr(cdm->createSession(m_session));
+    m_cdmSession = adoptPtr(cdm->createSession());
     NewMediaKeySessionResult* result = new NewMediaKeySessionResult(this);
     m_cdmSession->initializeNewSession(m_initDataType, m_initData->data(), m_initData->length(), m_sessionType, result->result());
 
     WTF_LOG(Media, "MediaKeySessionInitializer::timerFired done");
     // Note: As soon as the promise is resolved (or rejected), the
     // ScriptPromiseResolver object (|this|) is freed. So if
     // initializeNewSession() is synchronous, access to any members will crash.
 }
 
 void MediaKeySessionInitializer::completeWithSession(blink::WebContentDecryptionModuleResult::SessionStatus status)
 {
     WTF_LOG(Media, "MediaKeySessionInitializer::completeWithSession");
 
     switch (status) {
-    case blink::WebContentDecryptionModuleResult::NewSession:
+    case blink::WebContentDecryptionModuleResult::NewSession: {
         // Resume MediaKeys::createSession().
         // 7.5 Let the session ID be a unique Session ID string. It may be
         //     obtained from cdm (it is).
         // 7.6 Let session be a new MediaKeySession object, and initialize it.
         //     (Object was created previously, complete the steps for 7.6).
-        m_session->finishInitialization(m_cdmSession.release());
+        MediaKeySession* session = adoptRefCountedGarbageCollectedWillBeNoop(new MediaKeySession(executionContext(), m_mediaKeys, m_cdmSession.release()));

[acolwell GONE FROM CHROMIUM, 2014/07/17 17:45:25]

Isn't this a memory leak for a non-Oilpan build?

[jrummell, 2014/07/17 19:03:07]

Shouldn't be. The object is passed back to JavaScript with the resolve() call
below, so it owns the reference. There are a bunch of tests (e.g.
LayoutTests/media/encrypted-media/encrypted-media-lifetime-multiple-mediakeys.html)
that count the ActiveDOMObjects, and the MediaKeySession objects do get cleaned
up when they aren't needed anymore.

[acolwell GONE FROM CHROMIUM, 2014/07/17 19:16:04]

Ok. I'm just not used to the return value of adoptXXX being handed to a raw
pointer variable. I would have expected this to go into a
RefPtr<MediaKeySession>. 

[jrummell, 2014/07/17 21:33:48]

For clarity, changed to use RefPtrWillBeRawPtr<>.

+        session->suspendIfNeeded();
 
         // 7.7 If any of the preceding steps failed, reject promise with a
         //     new DOMException whose name is the appropriate error name
         //     and that has an appropriate message.
         //     (Implemented by CDM/Chromium calling completeWithError()).
 
         // 7.8 Add an entry for the value of the sessionId attribute to the
         //     list of active session IDs for this object.
         //     (Implemented in SessionIdAdapter).
 
         // 7.9 Run the Queue a "message" Event algorithm on the session,
         //     providing request and default URL.
         //     (Done by the CDM).
 
         // 7.10 Resolve promise with session.
-        resolve(m_session.get());
+        resolve(session);
         WTF_LOG(Media, "MediaKeySessionInitializer::completeWithSession done w/session");
         return;
+    }
 
     case blink::WebContentDecryptionModuleResult::SessionNotFound:
         // Step 4.7.1 of MediaKeys::loadSession(): If there is no data
         // stored for the sessionId in the origin, resolve promise with
         // undefined.
         resolve(V8UndefinedType());
         WTF_LOG(Media, "MediaKeySessionInitializer::completeWithSession done w/undefined");
         return;
 
     case blink::WebContentDecryptionModuleResult::SessionAlreadyExists:
@@ skipping 11 matching lines @@
     reject(DOMException::create(code, errorMessage));
 }
 
 ScriptPromise MediaKeySession::create(ScriptState* scriptState, MediaKeys* mediaKeys, const String& initDataType, PassRefPtr<Uint8Array> initData, const String& sessionType)
 {
     // Since creation is done asynchronously, use MediaKeySessionInitializer
     // to do it.
     return MediaKeySessionInitializer::create(scriptState, mediaKeys, initDataType, initData, sessionType);
 }
 
-MediaKeySession::MediaKeySession(ExecutionContext* context, MediaKeys* keys)
+MediaKeySession::MediaKeySession(ExecutionContext* context, MediaKeys* keys, PassOwnPtr<blink::WebContentDecryptionModuleSession> cdmSession)
     : ActiveDOMObject(context)
     , m_keySystem(keys->keySystem())
     , m_asyncEventQueue(GenericEventQueue::create(this))
+    , m_session(cdmSession)
     , m_keys(keys)
     , m_isClosed(false)
     , m_actionTimer(this, &MediaKeySession::actionTimerFired)
 {
     WTF_LOG(Media, "MediaKeySession(%p)::MediaKeySession", this);
     ScriptWrappable::init(this);
+    m_session->setClientInterface(this);
+
+    // Resume MediaKeys::createSession() at step 7.6.
+    // 7.6.1 Set the error attribute to null.
+    ASSERT(!m_error);
+
+    // 7.6.2 Set the sessionId attribute to session ID.
+    ASSERT(!sessionId().isEmpty());
+
+    // 7.6.3 Let expiration be NaN.
+    // 7.6.4 Let closed be a new promise.
+    // 7.6.5 Let the session type be sessionType.
+    // FIXME: Implement the previous 3 values.
 }
 
 MediaKeySession::~MediaKeySession()
 {
     WTF_LOG(Media, "MediaKeySession(%p)::~MediaKeySession", this);
     m_session.clear();
 #if !ENABLE(OILPAN)
     // MediaKeySession and m_asyncEventQueue always become unreachable
     // together. So MediaKeySession and m_asyncEventQueue are destructed in the
     // same GC. We don't need to call cancelAllEvents explicitly in Oilpan.
@@ skipping 107 matching lines @@
             // 3.2.1 Process the close request. Do not remove stored session data.
             // 3.2.2 If the previous step caused the session to be closed, run the
             //       Session Close algorithm on this object.
             // 3.3 Resolve promise with undefined.
             m_session->release(action->result()->result());
             break;
         }
     }
 }
 
-void MediaKeySession::finishInitialization(PassOwnPtr<blink::WebContentDecryptionModuleSession> cdmSession)
-{
-    ASSERT(cdmSession);
-    m_session = cdmSession;
-
-    // Resume MediaKeys::createSession() at step 7.6.
-    // 7.6.1 Set the error attribute to null.
-    ASSERT(!m_error);
-
-    // 7.6.2 Set the sessionId attribute to session ID.
-    ASSERT(!sessionId().isEmpty());
-
-    // 7.6.3 Let expiration be NaN..
-    // 7.6.4 Let closed be a new promise.
-    // 7.6.5 Let the session type be sessionType.
-    // FIXME: Implement the previous 3 values.
-}
-
 // 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 blink::WebURL& destinationURL)
 {
     WTF_LOG(Media, "MediaKeySession(%p)::message", this);
 
     MediaKeyMessageEventInit init;
     init.bubbles = false;
     init.cancelable = false;
     init.message = Uint8Array::create(message, messageLength);
     init.destinationURL = destinationURL.string();
@@ skipping 112 matching lines @@
 void MediaKeySession::trace(Visitor* visitor)
 {
     visitor->trace(m_error);
     visitor->trace(m_asyncEventQueue);
     visitor->trace(m_pendingActions);
     visitor->trace(m_keys);
     EventTargetWithInlineData::trace(visitor);
 }
 
 }