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

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

Issue 15178010: Remove ENABLE_ENCRYPTED_MEDIA #define as it's always enabled (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: 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 | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaError.h » ('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 26 matching lines...) Expand all
37 37
38 const unsigned short NETWORK_EMPTY = 0; 38 const unsigned short NETWORK_EMPTY = 0;
39 const unsigned short NETWORK_IDLE = 1; 39 const unsigned short NETWORK_IDLE = 1;
40 const unsigned short NETWORK_LOADING = 2; 40 const unsigned short NETWORK_LOADING = 2;
41 const unsigned short NETWORK_NO_SOURCE = 3; 41 const unsigned short NETWORK_NO_SOURCE = 3;
42 readonly attribute unsigned short networkState; 42 readonly attribute unsigned short networkState;
43 attribute DOMString preload; 43 attribute DOMString preload;
44 44
45 readonly attribute TimeRanges buffered; 45 readonly attribute TimeRanges buffered;
46 void load(); 46 void load();
47 #if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA
48 DOMString canPlayType([Default=Undefined] optional DOMString type, [Default= Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMStri ng keySystem); 47 DOMString canPlayType([Default=Undefined] optional DOMString type, [Default= Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMStri ng keySystem);
49 #elif defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
50 DOMString canPlayType([Default=Undefined] optional DOMString type, [Default= Undefined, TreatNullAs=NullString, TreatUndefinedAs=NullString] optional DOMStri ng keySystem);
51 #else
52 DOMString canPlayType([Default=Undefined] optional DOMString type);
53 #endif
54 48
55 // ready state 49 // ready state
56 const unsigned short HAVE_NOTHING = 0; 50 const unsigned short HAVE_NOTHING = 0;
57 const unsigned short HAVE_METADATA = 1; 51 const unsigned short HAVE_METADATA = 1;
58 const unsigned short HAVE_CURRENT_DATA = 2; 52 const unsigned short HAVE_CURRENT_DATA = 2;
59 const unsigned short HAVE_FUTURE_DATA = 3; 53 const unsigned short HAVE_FUTURE_DATA = 3;
60 const unsigned short HAVE_ENOUGH_DATA = 4; 54 const unsigned short HAVE_ENOUGH_DATA = 4;
61 readonly attribute unsigned short readyState; 55 readonly attribute unsigned short readyState;
62 readonly attribute boolean seeking; 56 readonly attribute boolean seeking;
63 57
(...skipping 22 matching lines...) Expand all
86 // WebKit extensions 80 // WebKit extensions
87 attribute boolean webkitPreservesPitch; 81 attribute boolean webkitPreservesPitch;
88 82
89 readonly attribute boolean webkitHasClosedCaptions; 83 readonly attribute boolean webkitHasClosedCaptions;
90 attribute boolean webkitClosedCaptionsVisible; 84 attribute boolean webkitClosedCaptionsVisible;
91 85
92 // The number of bytes consumed by the media decoder. 86 // The number of bytes consumed by the media decoder.
93 readonly attribute unsigned long webkitAudioDecodedByteCount; 87 readonly attribute unsigned long webkitAudioDecodedByteCount;
94 readonly attribute unsigned long webkitVideoDecodedByteCount; 88 readonly attribute unsigned long webkitVideoDecodedByteCount;
95 89
96 #if defined(ENABLE_ENCRYPTED_MEDIA) && ENABLE_ENCRYPTED_MEDIA
97
98 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 90 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
99 [EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaGene rateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUnde finedAs=NullString] DOMString keySystem, optional Uint8Array initData); 91 [EnabledAtRuntime=encryptedMedia, RaisesException, DeprecateAs=PrefixedMediaGene rateKeyRequest] void webkitGenerateKeyRequest([TreatNullAs=NullString, TreatUnde finedAs=NullString] DOMString keySystem, optional Uint8Array initData);
100 [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=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);
101 #else 93 #else
102 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitGenerateKeyRequest ([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, opti onal Uint8Array initData); 94 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitGenerateKeyRequest ([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, opti onal Uint8Array initData);
103 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitAddKey([TreatNullA s=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId) ; 95 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitAddKey([TreatNullA s=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8Array key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId) ;
104 #endif 96 #endif
105 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitCancelKeyRequest([ TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Defau lt=NullString] optional DOMString sessionId); 97 [EnabledAtRuntime=encryptedMedia, RaisesException] void webkitCancelKeyRequest([ TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, [Defau lt=NullString] optional DOMString sessionId);
106 98
107 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded; 99 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyadded;
108 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyerror; 100 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeyerror;
109 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeymessage ; 101 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitkeymessage ;
110 #endif 102 [EnabledAtRuntime=encryptedMedia] attribute EventListener onwebkitneedkey;
111 [Conditional=ENCRYPTED_MEDIA|ENCRYPTED_MEDIA_V2, EnabledAtRuntime=encryptedM edia] attribute EventListener onwebkitneedkey;
112 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2 103 #if defined(ENABLE_ENCRYPTED_MEDIA_V2) && ENABLE_ENCRYPTED_MEDIA_V2
113 [EnabledAtRuntime=encryptedMedia] attribute MediaKeys mediaKeys; 104 [EnabledAtRuntime=encryptedMedia] attribute MediaKeys mediaKeys;
114 #endif 105 #endif
115 106
116 [EnabledAtRuntime=videoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language); 107 [EnabledAtRuntime=videoTrack, RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language);
117 [EnabledAtRuntime=videoTrack] readonly attribute TextTrackList textTracks; 108 [EnabledAtRuntime=videoTrack] readonly attribute TextTrackList textTracks;
118 109
119 [Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup; 110 [Reflect, TreatNullAs=NullString] attribute DOMString mediaGroup;
120 [CustomSetter] attribute MediaController controller; 111 [CustomSetter] attribute MediaController controller;
121 }; 112 };
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaError.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698