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

Unified Diff: third_party/WebCore/html/HTMLMediaElement.idl

Issue 12316066: Update WebKit idl files after chrome roll (Closed) Base URL: https://dart.googlecode.com/svn/branches/bleeding_edge/dart
Patch Set: Remove deltaMode from WheelEvent template. Created 7 years, 10 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: third_party/WebCore/html/HTMLMediaElement.idl
diff --git a/third_party/WebCore/html/HTMLMediaElement.idl b/third_party/WebCore/html/HTMLMediaElement.idl
index 2ece5acaa5ada3285ec3879342fa81b2790583be..5ebf4470bbc0d6ce5862bad19cdb64a4caf5589f 100644
--- a/third_party/WebCore/html/HTMLMediaElement.idl
+++ b/third_party/WebCore/html/HTMLMediaElement.idl
@@ -45,7 +45,9 @@ attribute DOMString preload;
readonly attribute TimeRanges buffered;
void load();
#if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA
-DOMString canPlayType(in [Optional=DefaultIsUndefined] DOMString type, in [Optional=DefaultIsUndefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem);
+ DOMString canPlayType(in [Optional=DefaultIsUndefined] DOMString type, in [Optional=DefaultIsUndefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem);
+#elif defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
+ DOMString canPlayType(in [Optional=DefaultIsUndefined] DOMString type, in [Optional=DefaultIsUndefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem);
#else
DOMString canPlayType(in [Optional=DefaultIsUndefined] DOMString type);
#endif
@@ -101,10 +103,13 @@ readonly attribute [Conditional=MEDIA_STATISTICS] unsigned long webkitVideoDecod
[V8EnabledAtRuntime=encryptedMedia] void webkitCancelKeyRequest(in [TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, in [Optional=DefaultIsNullString] DOMString sessionId)
raises (DOMException);
-[V8EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded;
-attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeyerror;
-attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeymessage;
-attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitneedkey;
+ attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeyadded;
+ attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeyerror;
+ attribute [V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitkeymessage;
+#endif
+ attribute [Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2, V8EnabledAtRuntime=encryptedMedia] EventListener onwebkitneedkey;
+#if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
+ attribute [V8EnabledAtRuntime=encryptedMedia] MediaKeys mediaKeys;
#endif
#if defined(ENABLE_VIDEO_TRACK) && ENABLE_VIDEO_TRACK

Powered by Google App Engine
This is Rietveld 408576698