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

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

Issue 647383002: [Speculative revert to fix browser_tests on Blink canaries.] (Closed) Base URL: svn://svn.chromium.org/blink/trunk
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/MediaKeyNeededEvent.h
diff --git a/Source/modules/encryptedmedia/MediaEncryptedEvent.h b/Source/modules/encryptedmedia/MediaKeyNeededEvent.h
similarity index 62%
rename from Source/modules/encryptedmedia/MediaEncryptedEvent.h
rename to Source/modules/encryptedmedia/MediaKeyNeededEvent.h
index 719199df255c9a2610d38d7d7a004b3e796a4598..a7b03b9fd3993e7d2c0fcd0b4b1de51e109a023f 100644
--- a/Source/modules/encryptedmedia/MediaEncryptedEvent.h
+++ b/Source/modules/encryptedmedia/MediaKeyNeededEvent.h
@@ -23,51 +23,51 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef MediaEncryptedEvent_h
-#define MediaEncryptedEvent_h
+#ifndef MediaKeyNeededEvent_h
+#define MediaKeyNeededEvent_h
+#include "core/html/MediaKeyError.h"
#include "modules/EventModules.h"
-#include "wtf/ArrayBuffer.h"
namespace blink {
-struct MediaEncryptedEventInit : public EventInit {
- MediaEncryptedEventInit();
+struct MediaKeyNeededEventInit : public EventInit {
+ MediaKeyNeededEventInit();
- String initDataType;
- RefPtr<ArrayBuffer> initData;
+ String contentType;
+ RefPtr<Uint8Array> initData;
};
-class MediaEncryptedEvent final : public Event {
+class MediaKeyNeededEvent final : public Event {
DEFINE_WRAPPERTYPEINFO();
public:
- virtual ~MediaEncryptedEvent();
+ virtual ~MediaKeyNeededEvent();
- static PassRefPtrWillBeRawPtr<MediaEncryptedEvent> create()
+ static PassRefPtrWillBeRawPtr<MediaKeyNeededEvent> create()
{
- return adoptRefWillBeNoop(new MediaEncryptedEvent);
+ return adoptRefWillBeNoop(new MediaKeyNeededEvent);
}
- static PassRefPtrWillBeRawPtr<MediaEncryptedEvent> create(const AtomicString& type, const MediaEncryptedEventInit& initializer)
+ static PassRefPtrWillBeRawPtr<MediaKeyNeededEvent> create(const AtomicString& type, const MediaKeyNeededEventInit& initializer)
{
- return adoptRefWillBeNoop(new MediaEncryptedEvent(type, initializer));
+ return adoptRefWillBeNoop(new MediaKeyNeededEvent(type, initializer));
}
virtual const AtomicString& interfaceName() const override;
- String initDataType() const { return m_initDataType; }
- ArrayBuffer* initData() const { return m_initData.get(); }
+ String contentType() const { return m_contentType; }
+ Uint8Array* initData() const { return m_initData.get(); }
virtual void trace(Visitor*) override;
private:
- MediaEncryptedEvent();
- MediaEncryptedEvent(const AtomicString& type, const MediaEncryptedEventInit& initializer);
+ MediaKeyNeededEvent();
+ MediaKeyNeededEvent(const AtomicString& type, const MediaKeyNeededEventInit& initializer);
- String m_initDataType;
- RefPtr<ArrayBuffer> m_initData;
+ String m_contentType;
+ RefPtr<Uint8Array> m_initData;
};
} // namespace blink
-#endif // MediaEncryptedEvent_h
+#endif // MediaKeyNeededEvent_h
« no previous file with comments | « Source/modules/encryptedmedia/MediaEncryptedEvent.idl ('k') | Source/modules/encryptedmedia/MediaKeyNeededEvent.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698