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

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

Issue 876863006: Make canPlayType()'s keySystem argument depend on PrefixedEncryptedMedia (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Move CanPlayTypeKeySystem deprecation to IDL Created 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | no next file » | 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 28 matching lines...) Expand all
39 39
40 const unsigned short NETWORK_EMPTY = 0; 40 const unsigned short NETWORK_EMPTY = 0;
41 const unsigned short NETWORK_IDLE = 1; 41 const unsigned short NETWORK_IDLE = 1;
42 const unsigned short NETWORK_LOADING = 2; 42 const unsigned short NETWORK_LOADING = 2;
43 const unsigned short NETWORK_NO_SOURCE = 3; 43 const unsigned short NETWORK_NO_SOURCE = 3;
44 readonly attribute unsigned short networkState; 44 readonly attribute unsigned short networkState;
45 attribute DOMString preload; 45 attribute DOMString preload;
46 46
47 readonly attribute TimeRanges buffered; 47 readonly attribute TimeRanges buffered;
48 void load(); 48 void load();
49 DOMString canPlayType(DOMString type, [Default=Undefined, TreatUndefinedAs=N ullString] optional DOMString? keySystem); 49 DOMString canPlayType(DOMString type);
50 [RuntimeEnabled=PrefixedEncryptedMedia, DeprecateAs=CanPlayTypeKeySystem] DO MString canPlayType(DOMString type, [TreatUndefinedAs=NullString] DOMString? key System);
50 51
51 // ready state 52 // ready state
52 const unsigned short HAVE_NOTHING = 0; 53 const unsigned short HAVE_NOTHING = 0;
53 const unsigned short HAVE_METADATA = 1; 54 const unsigned short HAVE_METADATA = 1;
54 const unsigned short HAVE_CURRENT_DATA = 2; 55 const unsigned short HAVE_CURRENT_DATA = 2;
55 const unsigned short HAVE_FUTURE_DATA = 3; 56 const unsigned short HAVE_FUTURE_DATA = 3;
56 const unsigned short HAVE_ENOUGH_DATA = 4; 57 const unsigned short HAVE_ENOUGH_DATA = 4;
57 readonly attribute unsigned short readyState; 58 readonly attribute unsigned short readyState;
58 readonly attribute boolean seeking; 59 readonly attribute boolean seeking;
59 60
(...skipping 28 matching lines...) Expand all
88 [RaisesException] TextTrack addTextTrack(TextTrackKind kind, optional DOMStr ing label = "", optional DOMString language = ""); 89 [RaisesException] TextTrack addTextTrack(TextTrackKind kind, optional DOMStr ing label = "", optional DOMString language = "");
89 90
90 // WebKit extensions 91 // WebKit extensions
91 92
92 // The number of bytes consumed by the media decoder. 93 // The number of bytes consumed by the media decoder.
93 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount; 94 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount;
94 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount; 95 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount;
95 96
96 [Reflect, RuntimeEnabled=SubresourceIntegrity] attribute DOMString integrity ; 97 [Reflect, RuntimeEnabled=SubresourceIntegrity] attribute DOMString integrity ;
97 }; 98 };
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698