| Index: Source/modules/encryptedmedia/MediaKeySession.cpp
|
| diff --git a/Source/modules/encryptedmedia/MediaKeySession.cpp b/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| index 9c779cb435399b4c5c700f0d06ae6793ae017a74..9ea0bdb4722c1b9a4f0cae45ea4eff3cd820fcbb 100644
|
| --- a/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| +++ b/Source/modules/encryptedmedia/MediaKeySession.cpp
|
| @@ -30,6 +30,8 @@
|
| #include "bindings/core/v8/ScriptPromise.h"
|
| #include "bindings/core/v8/ScriptPromiseResolver.h"
|
| #include "bindings/core/v8/ScriptState.h"
|
| +#include "core/dom/DOMArrayBuffer.h"
|
| +#include "core/dom/DOMArrayBufferView.h"
|
| #include "core/dom/ExceptionCode.h"
|
| #include "core/events/Event.h"
|
| #include "core/events/GenericEventQueue.h"
|
| @@ -47,8 +49,6 @@
|
| #include "public/platform/WebContentDecryptionModuleSession.h"
|
| #include "public/platform/WebString.h"
|
| #include "public/platform/WebURL.h"
|
| -#include "wtf/ArrayBuffer.h"
|
| -#include "wtf/ArrayBufferView.h"
|
| #include <cmath>
|
| #include <limits>
|
|
|
| @@ -301,13 +301,13 @@ ScriptPromise MediaKeySession::closed(ScriptState* scriptState)
|
| return m_closedPromise->promise(scriptState->world());
|
| }
|
|
|
| -ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const String& initDataType, ArrayBuffer* initData)
|
| +ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const String& initDataType, DOMArrayBuffer* initData)
|
| {
|
| RefPtr<ArrayBuffer> initDataCopy = ArrayBuffer::create(initData->data(), initData->byteLength());
|
| return generateRequestInternal(scriptState, initDataType, initDataCopy.release());
|
| }
|
|
|
| -ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const String& initDataType, ArrayBufferView* initData)
|
| +ScriptPromise MediaKeySession::generateRequest(ScriptState* scriptState, const String& initDataType, DOMArrayBufferView* initData)
|
| {
|
| RefPtr<ArrayBuffer> initDataCopy = ArrayBuffer::create(initData->baseAddress(), initData->byteLength());
|
| return generateRequestInternal(scriptState, initDataType, initDataCopy.release());
|
| @@ -377,13 +377,13 @@ ScriptPromise MediaKeySession::generateRequestInternal(ScriptState* scriptState,
|
| return promise;
|
| }
|
|
|
| -ScriptPromise MediaKeySession::update(ScriptState* scriptState, ArrayBuffer* response)
|
| +ScriptPromise MediaKeySession::update(ScriptState* scriptState, DOMArrayBuffer* response)
|
| {
|
| RefPtr<ArrayBuffer> responseCopy = ArrayBuffer::create(response->data(), response->byteLength());
|
| return updateInternal(scriptState, responseCopy.release());
|
| }
|
|
|
| -ScriptPromise MediaKeySession::update(ScriptState* scriptState, ArrayBufferView* response)
|
| +ScriptPromise MediaKeySession::update(ScriptState* scriptState, DOMArrayBufferView* response)
|
| {
|
| RefPtr<ArrayBuffer> responseCopy = ArrayBuffer::create(response->baseAddress(), response->byteLength());
|
| return updateInternal(scriptState, responseCopy.release());
|
| @@ -624,7 +624,7 @@ void MediaKeySession::message(const unsigned char* message, size_t messageLength
|
| MediaKeyMessageEventInit init;
|
| init.bubbles = false;
|
| init.cancelable = false;
|
| - init.message = ArrayBuffer::create(static_cast<const void*>(message), messageLength);
|
| + init.message = DOMArrayBuffer::create(static_cast<const void*>(message), messageLength);
|
| init.destinationURL = destinationURL.string();
|
|
|
| RefPtrWillBeRawPtr<MediaKeyMessageEvent> event = MediaKeyMessageEvent::create(EventTypeNames::message, init);
|
|
|