Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2)

Unified Diff: Source/modules/encryptedmedia/MediaEncryptedEvent.h

Issue 655603003: Reland: Remove "needkey" event and add its replacement, "encrypted". (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: Source/modules/encryptedmedia/MediaEncryptedEvent.h
diff --git a/Source/modules/encryptedmedia/MediaKeyNeededEvent.h b/Source/modules/encryptedmedia/MediaEncryptedEvent.h
similarity index 62%
rename from Source/modules/encryptedmedia/MediaKeyNeededEvent.h
rename to Source/modules/encryptedmedia/MediaEncryptedEvent.h
index a7b03b9fd3993e7d2c0fcd0b4b1de51e109a023f..719199df255c9a2610d38d7d7a004b3e796a4598 100644
--- a/Source/modules/encryptedmedia/MediaKeyNeededEvent.h
+++ b/Source/modules/encryptedmedia/MediaEncryptedEvent.h
@@ -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

Powered by Google App Engine
This is Rietveld 408576698