Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 Loading... | |
| 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); |
|
ddorwin
2015/01/27 18:40:01
Does the generated code automatically call HTMLMed
philipj_slow
2015/01/28 06:10:27
I'm not sure what the <isNull() string> syntax mea
| |
| 50 [RuntimeEnabled=PrefixedEncryptedMedia] DOMString canPlayType(DOMString type , [TreatUndefinedAs=NullString] DOMString? keySystem); | |
|
ddorwin
2015/01/27 18:40:02
Do we still need the '?'?
ddorwin
2015/01/27 18:40:48
Should we move the DeprecateAs here too for consis
philipj_slow
2015/01/28 06:10:27
It was never needed AFAICT, but it doesn't seem wo
philipj_slow
2015/01/28 06:10:27
I'll do it here. It's not exactly equivalent, but
philipj_slow
2015/01/28 06:46:26
Actually the nullability was per the original spec
| |
| 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 Loading... | |
| 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 }; |
| OLD | NEW |