Index: core/html/HTMLMediaElement.idl |
diff --git a/core/html/HTMLMediaElement.idl b/core/html/HTMLMediaElement.idl |
index 13cc91ba8020e5097a9068f0e5bdc24428757c2d..0dbe3edca2f7e6df1eb1f1da367bdebe897f901e 100644 |
--- a/core/html/HTMLMediaElement.idl |
+++ b/core/html/HTMLMediaElement.idl |
@@ -24,7 +24,6 @@ |
*/ |
[ |
- Conditional=VIDEO, |
ActiveDOMObject |
] interface HTMLMediaElement : HTMLElement { |
@@ -94,8 +93,14 @@ readonly attribute unsigned long webkitAudioDecodedByteCount; |
readonly attribute unsigned long webkitVideoDecodedByteCount; |
#if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA |
+ |
+#if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 |
+[EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaGenerateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData); |
+[EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaAddKey] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId); |
+#else |
[EnabledAtRuntime=encryptedMedia, RaisesException] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData); |
[EnabledAtRuntime=encryptedMedia, RaisesException] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId); |
+#endif |
[EnabledAtRuntime=encryptedMedia, RaisesException] void webkitCancelKeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Default=NullString] optional DOMString sessionId); |
[EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded; |