| Index: Source/modules/encryptedmedia/MediaKeySession.h
|
| diff --git a/Source/modules/encryptedmedia/MediaKeySession.h b/Source/modules/encryptedmedia/MediaKeySession.h
|
| index be27870e42f73ac8472535d7e4179c2db547ec30..1ec08de20522bf35a63ad98055bb8d867db72203 100644
|
| --- a/Source/modules/encryptedmedia/MediaKeySession.h
|
| +++ b/Source/modules/encryptedmedia/MediaKeySession.h
|
| @@ -66,7 +66,7 @@ class MediaKeySession FINAL
|
| DEFINE_EVENT_TARGET_REFCOUNTING_WILL_BE_REMOVED(RefCountedGarbageCollected<MediaKeySession>);
|
| WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(MediaKeySession);
|
| public:
|
| - static ScriptPromise create(ScriptState*, MediaKeys*, const String& initDataType, PassRefPtr<Uint8Array> initData, const String& sessionType);
|
| + static ScriptPromise create(ScriptState*, MediaKeys*, const String& initDataType, PassRefPtr<ArrayBuffer> initData, const String& sessionType);
|
| virtual ~MediaKeySession();
|
|
|
| const String& keySystem() const { return m_keySystem; }
|
| @@ -75,7 +75,8 @@ public:
|
| void setError(MediaKeyError*);
|
| MediaKeyError* error() { return m_error.get(); }
|
|
|
| - ScriptPromise update(ScriptState*, Uint8Array* response);
|
| + ScriptPromise update(ScriptState*, ArrayBuffer* response);
|
| + ScriptPromise update(ScriptState*, ArrayBufferView* response);
|
| ScriptPromise release(ScriptState*);
|
|
|
| void enqueueEvent(PassRefPtrWillBeRawPtr<Event>);
|
| @@ -105,6 +106,8 @@ private:
|
| virtual void error(MediaKeyErrorCode, unsigned long systemCode) OVERRIDE;
|
| virtual void error(blink::WebContentDecryptionModuleException, unsigned long systemCode, const blink::WebString& errorMessage) OVERRIDE;
|
|
|
| + ScriptPromise updateInternal(ScriptState*, PassRefPtr<ArrayBuffer> response);
|
| +
|
| String m_keySystem;
|
| RefPtrWillBeMember<MediaKeyError> m_error;
|
| OwnPtrWillBeMember<GenericEventQueue> m_asyncEventQueue;
|
|
|