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

Unified Diff: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp

Issue 799733002: Use event init dictionaries in core/{css,html} (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Created 6 years 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
« no previous file with comments | « Source/core/html/canvas/WebGLContextEventInit.idl ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
diff --git a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
index 439d2df0cac4b96d3eb8bcdae28afe3f000f9561..c9adbd0c035e4af9f010bf49ec6e4a37c849c911 100644
--- a/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
+++ b/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
@@ -309,11 +309,7 @@ static PassRefPtrWillBeRawPtr<Event> createEncryptedEvent(const String& initData
static PassRefPtrWillBeRawPtr<Event> createWebkitNeedKeyEvent(const unsigned char* initData, unsigned initDataLength)
{
MediaKeyEventInit webkitInitializer;
- webkitInitializer.keySystem = String();
- webkitInitializer.sessionId = String();
- webkitInitializer.initData = DOMUint8Array::create(initData, initDataLength);
- webkitInitializer.bubbles = false;
- webkitInitializer.cancelable = false;
+ webkitInitializer.setInitData(DOMUint8Array::create(initData, initDataLength));
return MediaKeyEvent::create(EventTypeNames::webkitneedkey, webkitInitializer);
}
@@ -441,10 +437,8 @@ void HTMLMediaElementEncryptedMedia::keyAdded(HTMLMediaElement& element, const S
WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::mediaPlayerKeyAdded");
MediaKeyEventInit initializer;
- initializer.keySystem = keySystem;
- initializer.sessionId = sessionId;
- initializer.bubbles = false;
- initializer.cancelable = false;
+ initializer.setKeySystem(keySystem);
+ initializer.setSessionId(sessionId);
RefPtrWillBeRawPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitkeyadded, initializer);
event->setTarget(&element);
@@ -478,12 +472,10 @@ void HTMLMediaElementEncryptedMedia::keyError(HTMLMediaElement& element, const S
}
MediaKeyEventInit initializer;
- initializer.keySystem = keySystem;
- initializer.sessionId = sessionId;
- initializer.errorCode = MediaKeyError::create(mediaKeyErrorCode);
- initializer.systemCode = systemCode;
- initializer.bubbles = false;
- initializer.cancelable = false;
+ initializer.setKeySystem(keySystem);
+ initializer.setSessionId(sessionId);
+ initializer.setErrorCode(MediaKeyError::create(mediaKeyErrorCode));
+ initializer.setSystemCode(systemCode);
RefPtrWillBeRawPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitkeyerror, initializer);
event->setTarget(&element);
@@ -495,12 +487,10 @@ void HTMLMediaElementEncryptedMedia::keyMessage(HTMLMediaElement& element, const
WTF_LOG(Media, "HTMLMediaElementEncryptedMedia::mediaPlayerKeyMessage: sessionID=%s", sessionId.utf8().data());
MediaKeyEventInit initializer;
- initializer.keySystem = keySystem;
- initializer.sessionId = sessionId;
- initializer.message = DOMUint8Array::create(message, messageLength);
- initializer.defaultURL = KURL(defaultURL);
- initializer.bubbles = false;
- initializer.cancelable = false;
+ initializer.setKeySystem(keySystem);
+ initializer.setSessionId(sessionId);
+ initializer.setMessage(DOMUint8Array::create(message, messageLength));
+ initializer.setDefaultURL(KURL(defaultURL));
RefPtrWillBeRawPtr<Event> event = MediaKeyEvent::create(EventTypeNames::webkitkeymessage, initializer);
event->setTarget(&element);
« no previous file with comments | « Source/core/html/canvas/WebGLContextEventInit.idl ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698