Change EME WebIDL to use ArrayBuffer/ArrayBufferView.

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 24 matching lines @@
 #include "modules/encryptedmedia/MediaKeyMessageEvent.h"
 #include "modules/encryptedmedia/MediaKeySession.h"
 #include "modules/encryptedmedia/MediaKeysController.h"
 #include "platform/ContentType.h"
 #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"
-#include "wtf/Uint8Array.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
@@ skipping 133 matching lines @@
     // 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);
 }
 
-ScriptPromise MediaKeys::createSession(ScriptState* scriptState, const String& initDataType, Uint8Array* initData, const String& sessionType)
+ScriptPromise MediaKeys::createSession(ScriptState* scriptState, const String& initDataType, ArrayBuffer* initData, const String& sessionType)
 {
-    WTF_LOG(Media, "MediaKeys(%p)::createSession(%s, %d)", this, initDataType.ascii().data(), initData->length());
+    RefPtr<ArrayBuffer> initDataCopy = ArrayBuffer::create(initData->data(), initData->byteLength());
+    return createSessionInternal(scriptState, initDataType, initDataCopy.release(), sessionType);
+}
+
+ScriptPromise MediaKeys::createSession(ScriptState* scriptState, const String& initDataType, ArrayBufferView* initData, const String& sessionType)
+{
+    RefPtr<ArrayBuffer> initDataCopy = ArrayBuffer::create(initData->baseAddress(), initData->byteLength());
+    return createSessionInternal(scriptState, initDataType, initDataCopy.release(), sessionType);
+}
+
+ScriptPromise MediaKeys::createSessionInternal(ScriptState* scriptState, const String& initDataType, PassRefPtr<ArrayBuffer> initData, const String& sessionType)
+{
+    WTF_LOG(Media, "MediaKeys(%p)::createSession(%s, %d)", this, initDataType.ascii().data(), initData->byteLength());
 
     // From <http://dvcs.w3.org/hg/html-media/raw-file/default/encrypted-media/encrypted-media.html#dom-createsession>:
     // The createSession(initDataType, initData, sessionType) method creates a
     // new MediaKeySession object for the initData. It must run the following steps:
 
     // 1. If initDataType is an empty string, return a promise rejected with a
     //    new DOMException whose name is "InvalidAccessError".
     if (initDataType.isEmpty()) {
         return createRejectedPromise(scriptState, InvalidAccessError, "The initDataType parameter is empty.");
     }
 
     // 2. If initData is an empty array, return a promise rejected with a new
     //    DOMException whose name is"InvalidAccessError".
-    if (!initData->length()) {
+    if (!initData->byteLength()) {
         return createRejectedPromise(scriptState, InvalidAccessError, "The initData parameter is empty.");
     }
 
     // 3. If initDataType is not an initialization data type supported by the
     //    content decryption module corresponding to the keySystem, return a
     //    promise rejected with a new DOMException whose name is
     //    "NotSupportedError". String comparison is case-sensitive.
     if (!isKeySystemSupportedWithInitDataType(m_keySystem, initDataType)) {
         return createRejectedPromise(scriptState, NotSupportedError, "The initialization data type '" + initDataType + "' is not supported by the key system.");
     }
 
     // 4. If sessionType is not supported by the content decryption module
     //    corresponding to the keySystem, return a promise rejected with a new
     //    DOMException whose name is "NotSupportedError".
     //    Since this is typed by the IDL, we should not see any invalid values.
     // FIXME: Check whether sessionType is actually supported by the CDM.
     ASSERT(sessionType == kTemporary || sessionType == kPersistent);
 
     // 5. Let init data be a copy of the contents of the initData parameter.
-    RefPtr<Uint8Array> initDataCopy = Uint8Array::create(initData->data(), initData->length());
-
+    //    (Copied in the caller.)
     // 6. Let promise be a new promise.
     // 7. Asynchronously create and initialize the session.
     // 8. Return promise.
-    return MediaKeySession::create(scriptState, this, initDataType, initDataCopy.release(), sessionType);
+    return MediaKeySession::create(scriptState, this, initDataType, initData, sessionType);
 }
 
 bool MediaKeys::isTypeSupported(const String& keySystem, const String& contentType)
 {
     WTF_LOG(Media, "MediaKeys::isTypeSupported(%s, %s)", keySystem.ascii().data(), contentType.ascii().data());
 
     // 1. If keySystem is an empty string, return false and abort these steps.
     if (keySystem.isEmpty())
         return false;
 
@@ skipping 22 matching lines @@
 
 void MediaKeys::contextDestroyed()
 {
     ContextLifecycleObserver::contextDestroyed();
 
     // We don't need the CDM anymore.
     m_cdm.clear();
 }
 
 }