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

Side by Side Diff: LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded.html

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
« no previous file with comments | « no previous file | LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN"> 1 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
2 <html> 2 <html>
3 <head> 3 <head>
4 <script src="../js/resources/js-test-pre.js"></script> 4 <script src="../js/resources/js-test-pre.js"></script>
5 </head> 5 </head>
6 <body> 6 <body>
7 <script> 7 <script>
8 description("Tests RTCPeerConnection onnegotiationneeded."); 8 description("Tests RTCPeerConnection onnegotiationneeded.");
9 9
10 var stream = null; 10 var stream = null;
11 var pc = null; 11 var pc = null;
12 12
13 function error() { 13 function error() {
14 testFailed('Stream generation failed.'); 14 testFailed('Stream generation failed.');
15 finishJSTest(); 15 finishJSTest();
16 } 16 }
17 17
18 function getUserMedia(dictionary, callback) { 18 function getUserMedia(dictionary, callback) {
19 try { 19 try {
20 navigator.webkitGetUserMedia(dictionary, callback, error); 20 navigator.webkitGetUserMedia(dictionary, callback, error);
21 } catch (e) { 21 } catch (e) {
22 testFailed('webkitGetUserMedia threw exception :' + e); 22 testFailed('webkitGetUserMedia threw exception :' + e);
23 finishJSTest(); 23 finishJSTest();
24 } 24 }
25 } 25 }
26 26
27 function onNegotationNeeded(event) { 27 function onNegotiationNeeded(event) {
28 testPassed('onNegotationNeeded was called.'); 28 testPassed('onNegotiationNeeded was called.');
29 29
30 finishJSTest(); 30 finishJSTest();
31 } 31 }
32 32
33 function gotStream(s) { 33 function gotStream(s) {
34 testPassed('Got a stream.'); 34 testPassed('Got a stream.');
35 stream = s; 35 stream = s;
36 36
37 pc = new webkitRTCPeerConnection(null, null); 37 pc = new webkitRTCPeerConnection(null, null);
38 pc.onnegotationneeded = onNegotationNeeded; 38 pc.onnegotiationneeded = onNegotiationNeeded;
39 39
40 pc.addStream(stream); 40 pc.addStream(stream);
41 } 41 }
42 42
43 getUserMedia({audio:true, video:true}, gotStream); 43 getUserMedia({audio:true, video:true}, gotStream);
44 44
45 window.jsTestIsAsync = true; 45 window.jsTestIsAsync = true;
46 window.successfullyParsed = true; 46 window.successfullyParsed = true;
47 </script> 47 </script>
48 <script src="../js/resources/js-test-post.js"></script> 48 <script src="../js/resources/js-test-post.js"></script>
49 </body> 49 </body>
50 </html> 50 </html>
OLDNEW
« no previous file with comments | « no previous file | LayoutTests/fast/mediastream/RTCPeerConnection-onnegotiationneeded-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698