Index: Source/modules/encryptedmedia/MediaEncryptedEvent.h |
diff --git a/Source/modules/encryptedmedia/MediaKeyNeededEvent.h b/Source/modules/encryptedmedia/MediaEncryptedEvent.h |
similarity index 60% |
rename from Source/modules/encryptedmedia/MediaKeyNeededEvent.h |
rename to Source/modules/encryptedmedia/MediaEncryptedEvent.h |
index ba154833b138b55d8faca4b09494e6afa552b3f5..211d125143bd526380d26d2ff982097e247c14bd 100644 |
--- a/Source/modules/encryptedmedia/MediaKeyNeededEvent.h |
+++ b/Source/modules/encryptedmedia/MediaEncryptedEvent.h |
@@ -1,5 +1,5 @@ |
/* |
- * Copyright (C) 2012 Google Inc. All rights reserved. |
+ * Copyright (C) 2014 Google Inc. All rights reserved. |
* |
* Redistribution and use in source and binary forms, with or without |
* modification, are permitted provided that the following conditions |
@@ -23,51 +23,51 @@ |
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
*/ |
-#ifndef MediaKeyNeededEvent_h |
-#define MediaKeyNeededEvent_h |
+#ifndef MediaEncryptedEvent_h |
+#define MediaEncryptedEvent_h |
-#include "core/html/MediaKeyError.h" |
#include "modules/EventModules.h" |
+#include "wtf/ArrayBuffer.h" |
namespace blink { |
-struct MediaKeyNeededEventInit : public EventInit { |
- MediaKeyNeededEventInit(); |
+struct MediaEncryptedEventInit : public EventInit { |
+ MediaEncryptedEventInit(); |
- String contentType; |
- RefPtr<Uint8Array> initData; |
+ String initDataType; |
+ RefPtr<ArrayBuffer> initData; |
}; |
-class MediaKeyNeededEvent FINAL : public Event { |
+class MediaEncryptedEvent FINAL : public Event { |
DEFINE_WRAPPERTYPEINFO(); |
public: |
- virtual ~MediaKeyNeededEvent(); |
+ virtual ~MediaEncryptedEvent(); |
- static PassRefPtrWillBeRawPtr<MediaKeyNeededEvent> create() |
+ static PassRefPtrWillBeRawPtr<MediaEncryptedEvent> create() |
{ |
- return adoptRefWillBeNoop(new MediaKeyNeededEvent); |
+ return adoptRefWillBeNoop(new MediaEncryptedEvent); |
} |
- static PassRefPtrWillBeRawPtr<MediaKeyNeededEvent> create(const AtomicString& type, const MediaKeyNeededEventInit& initializer) |
+ static PassRefPtrWillBeRawPtr<MediaEncryptedEvent> create(const AtomicString& type, const MediaEncryptedEventInit& initializer) |
{ |
- return adoptRefWillBeNoop(new MediaKeyNeededEvent(type, initializer)); |
+ return adoptRefWillBeNoop(new MediaEncryptedEvent(type, initializer)); |
} |
virtual const AtomicString& interfaceName() const OVERRIDE; |
- String contentType() const { return m_contentType; } |
- Uint8Array* initData() const { return m_initData.get(); } |
+ String initDataType() const { return m_initDataType; } |
+ ArrayBuffer* initData() const { return m_initData.get(); } |
virtual void trace(Visitor*) OVERRIDE; |
private: |
- MediaKeyNeededEvent(); |
- MediaKeyNeededEvent(const AtomicString& type, const MediaKeyNeededEventInit& initializer); |
+ MediaEncryptedEvent(); |
+ MediaEncryptedEvent(const AtomicString& type, const MediaEncryptedEventInit& initializer); |
- String m_contentType; |
- RefPtr<Uint8Array> m_initData; |
+ String m_initDataType; |
+ RefPtr<ArrayBuffer> m_initData; |
}; |
} // namespace blink |
-#endif // MediaKeyNeededEvent_h |
+#endif // MediaEncryptedEvent_h |