Index: Source/core/html/HTMLMediaElement.idl |
diff --git a/Source/core/html/HTMLMediaElement.idl b/Source/core/html/HTMLMediaElement.idl |
index e8e441de9584dae234150c678df543aa0e86c926..5c74add1fd3d10a8a44cfe1f18e4755c90fdca3b 100644 |
--- a/Source/core/html/HTMLMediaElement.idl |
+++ b/Source/core/html/HTMLMediaElement.idl |
@@ -44,13 +44,7 @@ attribute DOMString preload; |
readonly attribute TimeRanges buffered; |
void load(); |
-#if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA |
DOMString canPlayType([Default=Undefined] optional DOMString type, [Default=Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString keySystem); |
-#elif defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 |
- DOMString canPlayType([Default=Undefined] optional DOMString type, [Default=Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMString keySystem); |
-#else |
-DOMString canPlayType([Default=Undefined] optional DOMString type); |
-#endif |
// ready state |
const unsigned short HAVE_NOTHING = 0; |
@@ -93,8 +87,6 @@ attribute boolean webkitClosedCaptionsVisible; |
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); |
@@ -107,8 +99,7 @@ readonly attribute unsigned long webkitVideoDecodedByteCount; |
[EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded; |
[EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyerror; |
[EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeymessage; |
-#endif |
- [Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2, EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitneedkey; |
+ [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitneedkey; |
#if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 |
[EnabledAtRuntime=encryptedMedia] attribute MediaKeys mediaKeys; |
#endif |