Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h |
diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h |
index e1d49d3b2221a4e6f8c2aa34b507959a554244a5..cbcbcc23d038492733cf26baadbd3571de1b522b 100644 |
--- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h |
+++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h |
@@ -5,12 +5,13 @@ |
#ifndef HTMLMediaElementEncryptedMedia_h |
#define HTMLMediaElementEncryptedMedia_h |
-#include "modules/EventTargetModules.h" |
+#include "core/EventTypeNames.h" |
+#include "core/dom/DOMTypedArray.h" |
+#include "core/events/EventTarget.h" |
#include "platform/Supplementable.h" |
#include "platform/graphics/media/MediaPlayer.h" |
#include "platform/heap/Handle.h" |
#include "public/platform/WebMediaPlayerClient.h" |
-#include "wtf/Forward.h" |
namespace blink { |
@@ -25,10 +26,10 @@ class HTMLMediaElementEncryptedMedia final : public NoBaseWillBeGarbageCollected |
DECLARE_EMPTY_VIRTUAL_DESTRUCTOR_WILL_BE_REMOVED(HTMLMediaElementEncryptedMedia); |
public: |
// encrypted media extensions (v0.1b) |
- static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionState&); |
+ static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> initData, ExceptionState&); |
static void webkitGenerateKeyRequest(HTMLMediaElement&, const String& keySystem, ExceptionState&); |
- static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionState&); |
- static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<Uint8Array> key, ExceptionState&); |
+ static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionState&); |
+ static void webkitAddKey(HTMLMediaElement&, const String& keySystem, PassRefPtr<DOMUint8Array> key, ExceptionState&); |
static void webkitCancelKeyRequest(HTMLMediaElement&, const String& keySystem, const String& sessionId, ExceptionState&); |
DEFINE_STATIC_ATTRIBUTE_EVENT_LISTENER(webkitkeyadded); |
@@ -57,8 +58,8 @@ private: |
friend class SetMediaKeysHandler; |
HTMLMediaElementEncryptedMedia(); |
- void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr<Uint8Array> initData, ExceptionState&); |
- void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<Uint8Array> key, PassRefPtr<Uint8Array> initData, const String& sessionId, ExceptionState&); |
+ void generateKeyRequest(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Array> initData, ExceptionState&); |
+ void addKey(WebMediaPlayer*, const String& keySystem, PassRefPtr<DOMUint8Array> key, PassRefPtr<DOMUint8Array> initData, const String& sessionId, ExceptionState&); |
void cancelKeyRequest(WebMediaPlayer*, const String& keySystem, const String& sessionId, ExceptionState&); |
// EventTarget |