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 |
| 11 * documentation and/or other materials provided with the distribution. | 11 * documentation and/or other materials provided with the distribution. |
| 12 * | 12 * |
| 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY | 13 * THIS SOFTWARE IS PROVIDED BY APPLE COMPUTER, INC. ``AS IS'' AND ANY |
| 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE | 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE |
| 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR | 15 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR |
| 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR | 16 * PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL APPLE COMPUTER, INC. OR |
| 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, | 17 * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, |
| 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, | 18 * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, |
| 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR | 19 * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR |
| 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY | 20 * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY |
| 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | 21 * OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | 22 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | 23 * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| 24 */ | 24 */ |
| 25 | |
| 26 // FIXME: should use typedef instead, but | |
| 27 // requires better union type support: http://crbug.com/240176 | |
| 28 typedef (MediaStream or MediaSource or Blob) MediaProvider; | |
|
philipj_slow
2014/09/16 13:39:51
Remove these bits since they are unused.
perkj_chrome
2014/09/17 19:26:13
Removed but merged the typedef comment with the fi
| |
| 25 | 29 |
| 26 [ | 30 [ |
| 27 ActiveDOMObject, | 31 ActiveDOMObject, |
| 28 RuntimeEnabled=Media, | 32 RuntimeEnabled=Media, |
| 29 SpecialWrapFor=(HTMLAudioElement,HTMLVideoElement), | 33 SpecialWrapFor=(HTMLAudioElement,HTMLVideoElement), |
| 30 TypeChecking=Unrestricted, | 34 TypeChecking=Unrestricted, |
| 31 ] interface HTMLMediaElement : HTMLElement { | 35 ] interface HTMLMediaElement : HTMLElement { |
| 32 | 36 |
| 33 // error state | 37 // error state |
| 34 readonly attribute MediaError? error; | 38 readonly attribute MediaError? error; |
| 35 | 39 |
| 36 // network state | 40 // network state |
| 37 [Reflect, URL] attribute DOMString src; | 41 [Reflect, URL] attribute DOMString src; |
| 42 // FIXME: should be attribute MediaProvider? srcObject; http://crbug.com/240 176 | |
|
philipj_slow
2014/09/16 13:39:51
There's a suspicious non-ASCII "h" here.
perkj_chrome
2014/09/17 19:26:13
Done.
| |
| 43 [Custom] attribute object? srcObject; | |
| 38 [URL] readonly attribute DOMString currentSrc; | 44 [URL] readonly attribute DOMString currentSrc; |
| 39 [Reflect, ReflectOnly=("anonymous","use-credentials"), ReflectEmpty="anonymo us", ReflectInvalid="anonymous"] attribute DOMString crossOrigin; | 45 [Reflect, ReflectOnly=("anonymous","use-credentials"), ReflectEmpty="anonymo us", ReflectInvalid="anonymous"] attribute DOMString crossOrigin; |
| 40 | 46 |
| 41 const unsigned short NETWORK_EMPTY = 0; | 47 const unsigned short NETWORK_EMPTY = 0; |
| 42 const unsigned short NETWORK_IDLE = 1; | 48 const unsigned short NETWORK_IDLE = 1; |
| 43 const unsigned short NETWORK_LOADING = 2; | 49 const unsigned short NETWORK_LOADING = 2; |
| 44 const unsigned short NETWORK_NO_SOURCE = 3; | 50 const unsigned short NETWORK_NO_SOURCE = 3; |
| 45 readonly attribute unsigned short networkState; | 51 readonly attribute unsigned short networkState; |
| 46 attribute DOMString preload; | 52 attribute DOMString preload; |
| 47 | 53 |
| (...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 89 [RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language); | 95 [RaisesException] TextTrack addTextTrack(DOMString kind, optional DOMString label, optional DOMString language); |
| 90 | 96 |
| 91 // WebKit extensions | 97 // WebKit extensions |
| 92 | 98 |
| 93 // The number of bytes consumed by the media decoder. | 99 // The number of bytes consumed by the media decoder. |
| 94 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount; | 100 [MeasureAs=PrefixedAudioDecodedByteCount] readonly attribute unsigned long w ebkitAudioDecodedByteCount; |
| 95 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount; | 101 [MeasureAs=PrefixedVideoDecodedByteCount] readonly attribute unsigned long w ebkitVideoDecodedByteCount; |
| 96 | 102 |
| 97 [Reflect, RuntimeEnabled=SubresourceIntegrity] attribute DOMString integrity ; | 103 [Reflect, RuntimeEnabled=SubresourceIntegrity] attribute DOMString integrity ; |
| 98 }; | 104 }; |
| OLD | NEW |