Filter supported session types in createSession().

Source/modules/encryptedmedia/MediaKeySystemAccess.cpp

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "config.h"
 #include "modules/encryptedmedia/MediaKeySystemAccess.h"
 
 #include "bindings/core/v8/ScriptPromiseResolver.h"
 #include "bindings/core/v8/ScriptState.h"
 #include "core/dom/DOMException.h"
@@ skipping 14 matching lines @@
 // This class wraps the promise resolver used when creating MediaKeys
 // and is passed to Chromium to fullfill the promise. This implementation of
 // completeWithCdm() will resolve the promise with a new MediaKeys object,
 // while completeWithError() will reject the promise with an exception.
 // All other complete methods are not expected to be called, and will
 // reject the promise.
 class NewCdmResultPromise : public ContentDecryptionModuleResultPromise {
     WTF_MAKE_NONCOPYABLE(NewCdmResultPromise);
 
 public:
-    NewCdmResultPromise(ScriptState* scriptState, const String& keySystem)
+    NewCdmResultPromise(ScriptState* scriptState, const String& keySystem, const blink::WebVector<blink::WebString>& supportedSessionTypes)
         : ContentDecryptionModuleResultPromise(scriptState)
         , m_keySystem(keySystem)
+        , m_supportedSessionTypes(supportedSessionTypes)
     {
     }
 
     virtual ~NewCdmResultPromise()
     {
     }
 
     // ContentDecryptionModuleResult implementation.
     virtual void completeWithContentDecryptionModule(WebContentDecryptionModule* cdm) override
     {
-        // NOTE: Continued from step 2. of createMediaKeys().
-        // 2.4 Let media keys be a new MediaKeys object.
-        MediaKeys* mediaKeys = new MediaKeys(executionContext(), m_keySystem, adoptPtr(cdm));
+        // NOTE: Continued from step 2.8 of createMediaKeys().
+        // 2.9. Let media keys be a new MediaKeys object.
+        MediaKeys* mediaKeys = new MediaKeys(executionContext(), m_keySystem, m_supportedSessionTypes, adoptPtr(cdm));
 
-        // 2.5 Resolve promise with media keys.
+        // 2.10. Resolve promise with media keys.
         resolve(mediaKeys);
     }
 
 private:
     const String m_keySystem;
+    const blink::WebVector<blink::WebString> m_supportedSessionTypes;
 };
 
 // These methods are the inverses of those with the same names in
 // NavigatorRequestMediaKeySystemAccess.
 static Vector<String> convertInitDataTypes(const WebVector<WebString>& initDataTypes)
 {
     Vector<String> result;
     result.reserveCapacity(initDataTypes.size());
     for (size_t i = 0; i < initDataTypes.size(); i++)
         result.append(initDataTypes[i]);
@@ skipping 45 matching lines @@
     WebMediaKeySystemConfiguration configuration = m_access->getConfiguration();
     result.setInitDataTypes(convertInitDataTypes(configuration.initDataTypes));
     result.setAudioCapabilities(convertCapabilities(configuration.audioCapabilities));
     result.setVideoCapabilities(convertCapabilities(configuration.videoCapabilities));
     result.setDistinctiveIdentifier(convertMediaKeysRequirement(configuration.distinctiveIdentifier));
     result.setPersistentState(convertMediaKeysRequirement(configuration.persistentState));
 }
 
 ScriptPromise MediaKeySystemAccess::createMediaKeys(ScriptState* scriptState)
 {
-    // From https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#widl-MediaKeySystemAccess-createMediaKeys-Promise-MediaKeys
-    // When this method is invoked, the user agent must run the following steps:
+    // From http://w3c.github.io/encrypted-media/#createMediaKeys
+    // (Reordered to be able to pass values into the promise constructor.)
+    // 2.4 Let configuration be the value of this object's configuration value.
+    // 2.5-2.8. [Set use distinctive identifier and persistent state allowed
+    //          based on configuration.]
+    WebMediaKeySystemConfiguration configuration = m_access->getConfiguration();
+
     // 1. Let promise be a new promise.
-    NewCdmResultPromise* helper = new NewCdmResultPromise(scriptState, m_keySystem);
+    NewCdmResultPromise* helper = new NewCdmResultPromise(scriptState, m_keySystem, configuration.sessionTypes);
     ScriptPromise promise = helper->promise();
 
     // 2. Asynchronously create and initialize the MediaKeys object.
     // 2.1 Let cdm be the CDM corresponding to this object.
     // 2.2 Load and initialize the cdm if necessary.
     // 2.3 If cdm fails to load or initialize, reject promise with a new
     //     DOMException whose name is the appropriate error name.
     //     (Done if completeWithException() called).
     m_access->createContentDecryptionModule(helper->result());
 
     // 3. Return promise.
     return promise;
 }
 
 void MediaKeySystemAccess::trace(Visitor*)
 {
 }
 
 } // namespace blink