Filter supported session types in createSession().

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 62 matching lines @@
     PendingAction(ContentDecryptionModuleResult* result, PassRefPtr<DOMArrayBuffer> data)
         : m_result(result)
         , m_data(data)
     {
     }
 
     const Member<ContentDecryptionModuleResult> m_result;
     const RefPtr<DOMArrayBuffer> m_data;
 };
 
-MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, PassOwnPtr<WebContentDecryptionModule> cdm)
+MediaKeys::MediaKeys(ExecutionContext* context, const String& keySystem, const blink::WebMediaKeySystemConfiguration& configuration, PassOwnPtr<WebContentDecryptionModule> cdm)
     : ContextLifecycleObserver(context)
     , m_keySystem(keySystem)
+    , m_configuration(configuration)
     , m_cdm(cdm)
     , m_timer(this, &MediaKeys::timerFired)
 {
     WTF_LOG(Media, "MediaKeys(%p)::MediaKeys", this);
 
     // Step 4.4 of MediaKeys::create():
     // 4.4.1 Set the keySystem attribute to keySystem.
     ASSERT(!m_keySystem.isEmpty());
 }
 
 MediaKeys::~MediaKeys()
 {
     WTF_LOG(Media, "MediaKeys(%p)::~MediaKeys", this);
 }
 
 MediaKeySession* MediaKeys::createSession(ScriptState* scriptState, const String& sessionType, ExceptionState& exceptionState)
 {
     WTF_LOG(Media, "MediaKeys(%p)::createSession", this);
 
-    // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-createsession>:
-    // The createSession(sessionType) method returns a new MediaKeySession
-    // object. It must run the following steps:
-    // 1. If sessionType is not supported by the content decryption module
-    //    corresponding to the keySystem, throw a DOMException whose name is
-    //    "NotSupportedError".
-    ASSERT(MediaKeySession::isValidSessionType(sessionType));
-    // FIXME: Check whether sessionType is actually supported by the CDM.
-    // (http://crbug.com/384152)
-    // FIXME: Enable "persistent-release-message" session type once support
-    // added to CDMs.
-    if (sessionType == "persistent-release-message") {
-        exceptionState.throwDOMException(NotSupportedError, "'persistent-release-message' is not supported.");
-        return nullptr;
+    // From http://w3c.github.io/encrypted-media/#createSession
+
+    // When this method is invoked, the user agent must run the following steps:
+    // 1. If this object's persistent state allowed value is false and
+    //    sessionType is not "temporary", throw a new DOMException whose name is
+    //    NotSupportedError.

[ddorwin, 2015/02/20 03:42:00]

Something like:
\n
(Chromium ensures the returned supported session types...)

[sandersd (OOO until July 31), 2015/02/20 03:47:17]

Done.

+    // 2. If the Key System implementation represented by this object's cdm
+    //    implementation value does not support sessionType, throw a new
+    //    DOMException whose name is NotSupportedError.
+    blink::WebString webSessionType = blink::WebString(sessionType);
+    bool valid = false;

[ddorwin, 2015/02/20 03:42:00]

nit: Replace valid with supported (or even found).

[sandersd (OOO until July 31), 2015/02/20 03:47:17]

Done.

+    for (size_t i = 0; i < m_configuration.sessionTypes.size(); i++) {
+        if (m_configuration.sessionTypes[i] == webSessionType) {

[ddorwin, 2015/02/20 03:42:00]

Can we just do blink::WebString(sessionType) inline here? Even with an extra
line, this seems better.

[sandersd (OOO until July 31), 2015/02/20 03:47:17]

Done.

+            valid = true;
+            break;
+        }
     }
+    if (!valid)
+        exceptionState.throwDOMException(NotSupportedError, "Unsupported session type.");
 
-    // 2. Let session be a new MediaKeySession object, and initialize it as
+    // 3. Let session be a new MediaKeySession object, and initialize it as
     //    follows:
     //    (Initialization is performed in the constructor.)
-    // 3. Return session.
+    // 4. Return session.
     return MediaKeySession::create(scriptState, this, sessionType);
 }
 
 ScriptPromise MediaKeys::setServerCertificate(ScriptState* scriptState, const DOMArrayPiece& serverCertificate)
 {
     // From https://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-setservercertificate:
     // The setServerCertificate(serverCertificate) method provides a server
     // certificate to be used to encrypt messages to the license server.
     // It must run the following steps:
     // 1. If serverCertificate is an empty array, return a promise rejected
@@ skipping 63 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 } // namespace blink