Implement MediaKeySession.load()

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 29 matching lines @@
 #include "platform/Logging.h"
 #include "platform/MIMETypeRegistry.h"
 #include "platform/Timer.h"
 #include "platform/UUID.h"
 #include "public/platform/Platform.h"
 #include "public/platform/WebContentDecryptionModule.h"
 #include "wtf/ArrayBuffer.h"
 #include "wtf/ArrayBufferView.h"
 #include "wtf/RefPtr.h"
 
-#if ENABLE(ASSERT)
-namespace {
-
-// The list of possible values for |sessionType| passed to createSession().
-const char* kTemporary = "temporary";
-const char* kPersistent = "persistent";
-
-} // namespace
-#endif
-
 namespace blink {
 
 static bool isKeySystemSupportedWithContentType(const String& keySystem, const String& contentType)
 {
     ASSERT(!keySystem.isEmpty());
 
     ContentType type(contentType);
     String codecs = type.parameter("codecs");
     return MIMETypeRegistry::isSupportedEncryptedMediaMIMEType(keySystem, type.type(), codecs);
 }
@@ skipping 166 matching lines @@
 {
     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".
     // FIXME: Check whether sessionType is actually supported by the CDM.
-    ASSERT(sessionType == kTemporary || sessionType == kPersistent);
+    ASSERT(MediaKeySession::isValidSessionType(sessionType));
 
     // 2. Let session be a new MediaKeySession object, and initialize it as
     //    follows:
     //    (Initialization is performed in the constructor.)
     // 3. Return session.
     return MediaKeySession::create(scriptState, this, sessionType);
 }
 
 ScriptPromise MediaKeys::setServerCertificate(ScriptState* scriptState, ArrayBuffer* serverCertificate)
 {
@@ skipping 101 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 } // namespace blink