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

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

Issue 100103008: Remove ENCRYPTED_MEDIA_V2 as it is always set. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years 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/core/html/HTMLMediaElement.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 82 matching lines...) Expand 10 before | Expand all | Expand 10 after
93 // FIXME: add DeprecateAs=PrefixedMediaGenerateKeyRequest when MediaKeys is ready. 93 // FIXME: add DeprecateAs=PrefixedMediaGenerateKeyRequest when MediaKeys is ready.
94 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitGenerate KeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySy stem, optional Uint8Array initData); 94 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitGenerate KeyRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySy stem, optional Uint8Array initData);
95 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitAddKey([ TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8A rray key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId); 95 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitAddKey([ TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySystem, Uint8A rray key, optional Uint8Array initData, [Default=NullString] optional DOMString sessionId);
96 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitCancelKe yRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySyst em, [Default=NullString] optional DOMString sessionId); 96 [RuntimeEnabled=PrefixedEncryptedMedia, RaisesException] void webkitCancelKe yRequest([TreatNullAs=NullString, TreatUndefinedAs=NullString] DOMString keySyst em, [Default=NullString] optional DOMString sessionId);
97 97
98 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyad ded; 98 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyad ded;
99 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyer ror; 99 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyer ror;
100 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyme ssage; 100 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitkeyme ssage;
101 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitneedk ey; 101 [RuntimeEnabled=PrefixedEncryptedMedia] attribute EventHandler onwebkitneedk ey;
102 102
103 [RuntimeEnabled=EncryptedMedia, Conditional=ENCRYPTED_MEDIA_V2] attribute Me diaKeys mediaKeys; 103 [RuntimeEnabled=EncryptedMedia] attribute MediaKeys mediaKeys;
104 }; 104 };
OLDNEW
« no previous file with comments | « Source/core/html/HTMLMediaElement.cpp ('k') | Source/core/html/MediaKeyError.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698