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

Side by Side Diff: Source/core/html/HTMLMediaElement.idl

Issue 15016009: Rename runtime enabled check for prefixed Encrypted Media API. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: rebase only Created 7 years, 7 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 unified diff | Download patch
« no previous file with comments | « Source/WebKit/chromium/src/WebRuntimeFeatures.cpp ('k') | Source/core/html/MediaKeyError.idl » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2007, 2010, 2011, 2012 Apple Inc. All rights reserved. 2 * Copyright (C) 2007, 2010, 2011, 2012 Apple Inc. All rights reserved.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 attribute boolean webkitPreservesPitch; 81 attribute boolean webkitPreservesPitch;
82 82
83 readonly attribute boolean webkitHasClosedCaptions; 83 readonly attribute boolean webkitHasClosedCaptions;
84 attribute boolean webkitClosedCaptionsVisible; 84 attribute boolean webkitClosedCaptionsVisible;
85 85
86 // The number of bytes consumed by the media decoder. 86 // The number of bytes consumed by the media decoder.
87 readonly attribute unsigned long webkitAudioDecodedByteCount; 87 readonly attribute unsigned long webkitAudioDecodedByteCount;
88 readonly attribute unsigned long webkitVideoDecodedByteCount; 88 readonly attribute unsigned long webkitVideoDecodedByteCount;
89 89
90 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 90 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
91 [EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaGene rateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUnde finedAs=NullString] DOMString keySystem, optional Uint8Array initData); 91 [EnabledAtRuntime=legacyEncryptedMedia, RaisesException, DeprecateAs=PrefixedMed iaGenerateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, Tre atUndefinedAs=NullString] DOMString keySystem, optional Uint8Array initData);
92 [EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaAddK ey] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMS tring keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullStri ng] optional DOMString sessionId); 92 [EnabledAtRuntime=legacyEncryptedMedia, RaisesException, DeprecateAs=PrefixedMed iaAddKey] void webkitAddKey([TreatNullAs=NullString, TreatUndefinedAs=NullString ] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=Nu llString] optional DOMString sessionId);
93 #else 93 #else
94 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitGenerateKeyRequest ([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, opti onal Uint8Array initData); 94 [EnabledAtRuntime=legacyEncryptedMedia, RaisesException] void webkitGenerateKeyR equest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem , optional Uint8Array initData);
95 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitAddKey([TreatNullA s=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId) ; 95 [EnabledAtRuntime=legacyEncryptedMedia, RaisesException] void webkitAddKey([Trea tNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sess ionId);
96 #endif 96 #endif
97 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitCancelKeyRequest([ TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Defau lt=NullString] optional DOMString sessionId); 97 [EnabledAtRuntime=legacyEncryptedMedia, RaisesException] void webkitCancelKeyReq uest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Default=NullString] optional DOMString sessionId);
98 98
99 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded; 99 [EnabledAtRuntime=legacyEncryptedMedia] attribute EventListener onwebkitkeyadded ;
100 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyerror; 100 [EnabledAtRuntime=legacyEncryptedMedia] attribute EventListener onwebkitkeyerror ;
101 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeymessage ; 101 [EnabledAtRuntime=legacyEncryptedMedia] attribute EventListener onwebkitkeymessa ge;
102 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitneedkey; 102 [EnabledAtRuntime=legacyEncryptedMedia] attribute EventListener onwebkitneedkey;
103
103 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 104 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
104 [EnabledAtRuntime=encryptedMedia] attribute MediaKeys mediaKeys; 105 [EnabledAtRuntime=encryptedMedia] attribute MediaKeys mediaKeys;
105 #endif 106 #endif
106 107
107 [EnabledAtRuntime=videoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language); 108 [EnabledAtRuntime=videoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
108 [EnabledAtRuntime=videoTrack] readonly attribute TextTrackList textTracks; 109 [EnabledAtRuntime=videoTrack] readonly attribute TextTrackList textTracks;
109 110
110 [Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup; 111 [Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup;
111 [CustomSetter] attribute MediaController controller; 112 [CustomSetter] attribute MediaController controller;
112 }; 113 };
OLDNEW
« no previous file with comments | « Source/WebKit/chromium/src/WebRuntimeFeatures.cpp ('k') | Source/core/html/MediaKeyError.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698