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

Side by Side Diff: Source/WebCore/Modules/mediastream/MediaStream.idl

Issue 12251015: Merge 141034 (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1364/
Patch Set: Created 7 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
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2011 Google Inc. All rights reserved. 2 * Copyright (C) 2011 Google 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 INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y 13 * THIS SOFTWARE IS PROVIDED BY APPLE INC. AND ITS CONTRIBUTORS ``AS IS'' AND AN Y
14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 14 * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 15 * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y 16 * DISCLAIMED. IN NO EVENT SHALL APPLE INC. OR ITS CONTRIBUTORS BE LIABLE FOR AN Y
17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES 17 * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; 18 * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N 19 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND O N
20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT 20 * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS 21 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 22 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
23 */ 23 */
24 24
25 [ 25 [
26 Conditional=MEDIA_STREAM, 26 Conditional=MEDIA_STREAM,
27 EventTarget, 27 EventTarget,
28 Constructor(in MediaStreamTrackList audioTracks, in MediaStreamTrackList vid eoTracks), 28 Constructor(in MediaStreamTrackList audioTracks, in MediaStreamTrackList vid eoTracks),
29 CallWith=ScriptExecutionContext, 29 CallWith=ScriptExecutionContext,
30 ConstructorRaisesException 30 ConstructorRaisesException,
31 V8SkipVTableValidation
31 ] interface MediaStream { 32 ] interface MediaStream {
32 readonly attribute DOMString label; 33 readonly attribute DOMString label;
33 readonly attribute MediaStreamTrackList audioTracks; 34 readonly attribute MediaStreamTrackList audioTracks;
34 readonly attribute MediaStreamTrackList videoTracks; 35 readonly attribute MediaStreamTrackList videoTracks;
35 36
36 // FIXME: implement the record method when MediaStreamRecorder is available. 37 // FIXME: implement the record method when MediaStreamRecorder is available.
37 38
38 const unsigned short LIVE = 1; 39 const unsigned short LIVE = 1;
39 const unsigned short ENDED = 2; 40 const unsigned short ENDED = 2;
40 readonly attribute unsigned short readyState; 41 readonly attribute unsigned short readyState;
41 attribute EventListener onended; 42 attribute EventListener onended;
42 43
43 // EventTarget interface 44 // EventTarget interface
44 void addEventListener(in DOMString type, 45 void addEventListener(in DOMString type,
45 in EventListener listener, 46 in EventListener listener,
46 in [Optional] boolean useCapture); 47 in [Optional] boolean useCapture);
47 void removeEventListener(in DOMString type, 48 void removeEventListener(in DOMString type,
48 in EventListener listener, 49 in EventListener listener,
49 in [Optional] boolean useCapture); 50 in [Optional] boolean useCapture);
50 boolean dispatchEvent(in Event event) 51 boolean dispatchEvent(in Event event)
51 raises(EventException); 52 raises(EventException);
52 }; 53 };
53 54
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/indexeddb/IDBObjectStore.idl ('k') | Source/WebCore/Modules/mediastream/RTCStatsElement.idl » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698