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

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: third_party/WebKit/LayoutTests/fast/mediastream/getusermedia.html

Issue 2045193003: Make ready to unprefix getUserMedia, and counters (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Another counter renumbering Created 4 years, 6 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 | third_party/WebKit/LayoutTests/fast/mediastream/getusermedia-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="../../resources/js-test.js"></script> 4 <script src="../../resources/js-test.js"></script>
5 </head> 5 </head>
6 <body> 6 <body>
7 <p id="description"></p> 7 <p id="description"></p>
8 <div id="console"></div> 8 <div id="console"></div>
9 <script> 9 <script>
10 description("Tests webkitGetUserMedia."); 10 description("Tests webkitGetUserMedia.");
11 11
12 var stream; 12 var stream;
13 var errorArg; 13 var errorArg;
14 14
15 function error() { 15 function error() {
16 testFailed('Error callback called.'); 16 testFailed('Error callback called.');
17 finishJSTest(); 17 finishJSTest();
18 } 18 }
19 19
20 function gotStreamInError(s) { 20 function gotStreamInError(s) {
21 testFailed('Stream generated.'); 21 testFailed('Stream generated.');
22 finishJSTest(); 22 finishJSTest();
23 } 23 }
24 24
25 function gotStream5(s) { 25 function gotStream5(s) {
26 stream = s; 26 stream = s;
27 testPassed('Stream generated.'); 27 testPassed('Stream generated.');
28 shouldBe('stream.getAudioTracks().length', '1'); 28 shouldBe('stream.getAudioTracks().length', '1');
29 shouldBe('stream.getVideoTracks().length', '1'); 29 shouldBe('stream.getVideoTracks().length', '1');
30
30 finishJSTest(); 31 finishJSTest();
31 } 32 }
32 33
33 function error1(e) { 34 function error1(e) {
34 errorArg = e; 35 errorArg = e;
35 testPassed('Error callback called.'); 36 testPassed('Error callback called.');
36 shouldBeEqualToString('errorArg.name', 'ConstraintNotSatisfiedError'); 37 shouldBeEqualToString('errorArg.name', 'ConstraintNotSatisfiedError');
37 shouldBeEqualToString('errorArg.constraintName', 'valid_but_unsupported_1'); 38 shouldBeEqualToString('errorArg.constraintName', 'valid_but_unsupported_1');
38 39
39 shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_and_s upported_1':1}, optional:[{'valid_but_unsupported_1':0}]}, video:true}, gotStrea m5, error);"); 40 shouldNotThrow("navigator.getUserMedia({audio:{mandatory:{'valid_and_support ed_1':1}, optional:[{'valid_but_unsupported_1':0}]}, video:true}, gotStream5, er ror);");
40 } 41 }
41 42
42 function gotStream4(s) { 43 function gotStream4(s) {
43 stream = s; 44 stream = s;
44 testPassed('Stream generated.'); 45 testPassed('Stream generated.');
45 shouldBe('stream.getAudioTracks().length', '1'); 46 shouldBe('stream.getAudioTracks().length', '1');
46 shouldBe('stream.getVideoTracks().length', '1'); 47 shouldBe('stream.getVideoTracks().length', '1');
47 48
48 shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{'valid_but_u nsupported_1':0}, optional:[]}, video:true}, gotStreamInError, error1);"); 49 shouldNotThrow("navigator.getUserMedia({audio:{mandatory:{'valid_but_unsuppo rted_1':0}, optional:[]}, video:true}, gotStreamInError, error1);");
49 } 50 }
50 51
51 function gotStream3(s) { 52 function gotStream3(s) {
52 stream = s; 53 stream = s;
53 testPassed('Stream generated.'); 54 testPassed('Stream generated.');
54 shouldBe('stream.getAudioTracks().length', '1'); 55 shouldBe('stream.getAudioTracks().length', '1');
55 shouldBe('stream.getVideoTracks().length', '1'); 56 shouldBe('stream.getVideoTracks().length', '1');
56 57
57 shouldNotThrow("navigator.webkitGetUserMedia({audio:{mandatory:{}, optional: []}, video:true}, gotStream4, error);"); 58 shouldNotThrow("navigator.getUserMedia({audio:{mandatory:{}, optional:[]}, v ideo:true}, gotStream4, error);");
58 } 59 }
59 60
60 function gotStream2(s) { 61 function gotStream2(s) {
61 stream = s; 62 stream = s;
62 testPassed('Stream generated.'); 63 testPassed('Stream generated.');
63 shouldBe('stream.getAudioTracks().length', '0'); 64 shouldBe('stream.getAudioTracks().length', '0');
64 shouldBe('stream.getVideoTracks().length', '1'); 65 shouldBe('stream.getVideoTracks().length', '1');
65 66
66 shouldNotThrow("navigator.webkitGetUserMedia({audio:true, video:true}, gotSt ream3, error);"); 67 shouldNotThrow("navigator.getUserMedia({audio:true, video:true}, gotStream3, error);");
67 } 68 }
68 69
69 function gotStream1(s) { 70 function gotStream1(s) {
70 stream = s; 71 stream = s;
71 testPassed('Stream generated.'); 72 testPassed('Stream generated.');
72 shouldBe('stream.getAudioTracks().length', '1'); 73 shouldBe('stream.getAudioTracks().length', '1');
73 shouldBe('stream.getVideoTracks().length', '0'); 74 shouldBe('stream.getVideoTracks().length', '0');
74 75
75 shouldNotThrow("navigator.webkitGetUserMedia({video:true}, gotStream2, error );") 76 shouldNotThrow("navigator.getUserMedia({video:true}, gotStream2, error);")
76 } 77 }
77 78
79 function gotStreamNoMore(s) {
80 stream = s;
81 testPassed('Stream generated.');
82 shouldBe('stream.getAudioTracks().length', '1');
83 shouldBe('stream.getVideoTracks().length', '0');
84 }
85
86 var GetUserMediaPrefixed = 1400;
87 var GetUserMediaLegacy = 1401;
88 var GetUserMediaPromise = 1402;
89
90 if (window.internals) {
91 shouldBeFalse('window.internals.isUseCounted(document, GetUserMediaPrefixed)') ;
92 shouldBeFalse('window.internals.isUseCounted(document, GetUserMediaLegacy)');
93 }
94
95 // Prefixed version
78 shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, err or);") 96 shouldThrow("navigator.webkitGetUserMedia({audio:false, video:false}, error, err or);")
79 shouldNotThrow("navigator.webkitGetUserMedia({audio:true}, gotStream1, error);") ; 97 shouldNotThrow("navigator.webkitGetUserMedia({audio:true}, gotStreamNoMore, erro r);");
98 // Unprefixed version
99 shouldThrow("navigator.getUserMedia({audio:false, video:false}, error, error);")
100 shouldNotThrow("navigator.getUserMedia({audio:true}, gotStream1, error);");
101
102 if (window.internals) {
103 shouldBeTrue('window.internals.isUseCounted(document, GetUserMediaPrefixed)');
104 shouldBeTrue('window.internals.isUseCounted(document, GetUserMediaLegacy)');
105 shouldBeFalse('window.internals.isUseCounted(document, GetUserMediaPromise)');
106 }
80 107
81 window.jsTestIsAsync = true; 108 window.jsTestIsAsync = true;
82 window.successfullyParsed = true; 109 window.successfullyParsed = true;
83 </script> 110 </script>
84 </body> 111 </body>
85 </html> 112 </html>
OLDNEW
« no previous file with comments | « no previous file | third_party/WebKit/LayoutTests/fast/mediastream/getusermedia-expected.txt » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698