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

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

Issue 10982093: Merge 129397 - MediaStream API: Fix the incorrectly spelled RTCPeerConnection::onnegotiationneeded … (Closed) Base URL: http://svn.webkit.org/repository/webkit/branches/chromium/1271/
Patch Set: Created 8 years, 2 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) 2012 Google Inc. All rights reserved. 2 * Copyright (C) 2012 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 * 7 *
8 * 1. Redistributions of source code must retain the above copyright 8 * 1. Redistributions of source code must retain the above copyright
9 * notice, this list of conditions and the following disclaimer. 9 * notice, this list of conditions and the following disclaimer.
10 * 2. Redistributions in binary form must reproduce the above copyright 10 * 2. Redistributions in binary form must reproduce the above copyright
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 readonly attribute MediaStreamList remoteStreams; 68 readonly attribute MediaStreamList remoteStreams;
69 69
70 [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional= DefaultIsUndefined] Dictionary mediaConstraints) 70 [StrictTypeChecking] void addStream(in MediaStream stream, in [Optional= DefaultIsUndefined] Dictionary mediaConstraints)
71 raises(DOMException); 71 raises(DOMException);
72 [StrictTypeChecking] void removeStream(in MediaStream stream) 72 [StrictTypeChecking] void removeStream(in MediaStream stream)
73 raises(DOMException); 73 raises(DOMException);
74 74
75 void close() 75 void close()
76 raises(DOMException); 76 raises(DOMException);
77 77
78 attribute EventListener onnegotationneeded; 78 attribute EventListener onnegotiationneeded;
79 attribute EventListener onicecandidate; 79 attribute EventListener onicecandidate;
80 attribute EventListener onopen; 80 attribute EventListener onopen;
81 attribute EventListener onstatechange; 81 attribute EventListener onstatechange;
82 attribute EventListener onaddstream; 82 attribute EventListener onaddstream;
83 attribute EventListener onremovestream; 83 attribute EventListener onremovestream;
84 attribute EventListener onicechange; 84 attribute EventListener onicechange;
85 85
86 // EventTarget interface 86 // EventTarget interface
87 void addEventListener(in DOMString type, 87 void addEventListener(in DOMString type,
88 in EventListener listener, 88 in EventListener listener,
89 in [Optional] boolean useCapture); 89 in [Optional] boolean useCapture);
90 void removeEventListener(in DOMString type, 90 void removeEventListener(in DOMString type,
91 in EventListener listener, 91 in EventListener listener,
92 in [Optional] boolean useCapture); 92 in [Optional] boolean useCapture);
93 boolean dispatchEvent(in Event event) 93 boolean dispatchEvent(in Event event)
94 raises(EventException); 94 raises(EventException);
95 }; 95 };
96 96
97 } 97 }
OLDNEW
« no previous file with comments | « Source/WebCore/Modules/mediastream/RTCPeerConnection.cpp ('k') | Source/WebCore/dom/EventNames.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698