third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html - Issue 1911953003: EME: Correctly handle container-only contentType strings

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-requestmediakeysystemaccess.html

Issue 1911953003: EME: Correctly handle container-only contentType strings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 8 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

« media/blink/key_system_config_selector.cc ('K') | « media/blink/key_system_config_selector.cc ('k') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('j') | third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 <!DOCTYPE html>	1 <!DOCTYPE html>

2 <html>	2 <html>

3 <head>	3 <head>

4 <title>Test navigator.requestMediaKeySystemAccess()</title>	4 <title>Test navigator.requestMediaKeySystemAccess()</title>

5 <script src="encrypted-media-utils.js"></script>	5 <script src="encrypted-media-utils.js"></script>

6 <script src="../../resources/testharness.js"></script>	6 <script src="../../resources/testharness.js"></script>

7 <script src="../../resources/testharnessreport.js"></script>	7 <script src="../../resources/testharnessreport.js"></script>

8 </head>	8 </head>

9 <body>	9 <body>

10 <div id="log"></div>	10 <div id="log"></div>

(...skipping 236 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
247 videoCapabilities: [{contentType: 'video/Webm; codecs="vp8"'}],	247 videoCapabilities: [{contentType: 'video/Webm; codecs="vp8"'}],

248 }, 'video/Webm');	248 }, 'video/Webm');

249	249

250 expect_config('org.w3.clearkey', [{	250 expect_config('org.w3.clearkey', [{

251 videoCapabilities: [{contentType: 'video/webm; Codecs="vp8"'}],	251 videoCapabilities: [{contentType: 'video/webm; Codecs="vp8"'}],

252 }], {	252 }], {

253 videoCapabilities: [{contentType: 'video/webm; Codecs="vp8"'}],	253 videoCapabilities: [{contentType: 'video/webm; Codecs="vp8"'}],

254 }, 'Codecs=');	254 }, 'Codecs=');

255	255

256 expect_config('org.w3.clearkey', [{	256 expect_config('org.w3.clearkey', [{

	257 videoCapabilities: [{contentType: 'VIDEO/WEBM; codecs="vp8"'}],

	258 }], {

	259 videoCapabilities: [{contentType: 'VIDEO/WEBM; codecs="vp8"'}],

	260 }, 'VIDEO/WEBM');

	261

	262 expect_error('org.w3.clearkey', [{

257 videoCapabilities: [{contentType: 'VIDEO/WEBM; CODECS="vp8"'}],	263 videoCapabilities: [{contentType: 'VIDEO/WEBM; CODECS="vp8"'}],
	ddorwin 2016/04/25 22:58:51 This fails because of a bug in the next file. It s This fails because of a bug in the next file. It should pass. Unfortunately, that means we can't have a test for the deprecation. Since this is specifically testing "CODECS", use the more common "video/webm" used for other tests. It appears we are missing a test where "codecs" is just not present. Please add that too and add a TODO for both of these tests that they should fail with a reference to the bug. jrummell 2016/04/26 21:23:56 Converted to a successful test. There are existin Show quoted text On 2016/04/25 22:58:51, ddorwin wrote: > This fails because of a bug in the next file. It should pass. Unfortunately, > that means we can't have a test for the deprecation. > > Since this is specifically testing "CODECS", use the more common "video/webm" > used for other tests. > > It appears we are missing a test where "codecs" is just not present. Please add > that too and add a TODO for both of these tests that they should fail with a > reference to the bug. Converted to a successful test. There are existing tests without codecs. I've added a comment to those tests.
258 }], {	264 }], 'NotSupportedError', 'VIDEO/WEBM, CODECS');
	ddorwin 2016/04/25 22:58:51 Update the name too. Update the name too. jrummell 2016/04/26 21:23:56 Done. Show quoted text On 2016/04/25 22:58:51, ddorwin wrote: > Update the name too. Done.
259 videoCapabilities: [{contentType: 'VIDEO/WEBM; CODECS="vp8"'}],

260 }, 'VIDEO/WEBM');

261	265

262 // Unrecognized attributes are not allowed.	266 // Unrecognized attributes are not allowed.

263 // TODO(jrummell): Unrecognized attributes are ignored currently.	267 // TODO(jrummell): Unrecognized attributes are ignored currently.

264 // http://crbug.com/449690	268 // http://crbug.com/449690

265 // expect_error('org.w3.clearkey', [{	269 // expect_error('org.w3.clearkey', [{

266 // videoCapabilities: [{contentType: 'video/webm; foo="bar"'}],	270 // videoCapabilities: [{contentType: 'video/webm; foo="bar"'}],

267 // }], 'NotSupportedError', 'Unrecognized foo');	271 // }], 'NotSupportedError', 'Unrecognized foo');

268 // expect_error('org.w3.clearkey', [{	272 // expect_error('org.w3.clearkey', [{

269 // videoCapabilities: [{contentType: 'video/webm; foo="bar"; codecs ="vp8"'}],	273 // videoCapabilities: [{contentType: 'video/webm; foo="bar"; codecs ="vp8"'}],

270 // }], 'NotSupportedError', 'Unrecognized foo with codecs');	274 // }], 'NotSupportedError', 'Unrecognized foo with codecs');

(...skipping 28 matching lines...) Expand all Loading...
299 expect_error('org.w3.clearkey', [{	303 expect_error('org.w3.clearkey', [{

300 videoCapabilities: [{contentType: 'video/webm; codecs="vp8,"'}],	304 videoCapabilities: [{contentType: 'video/webm; codecs="vp8,"'}],

301 }], 'NotSupportedError', 'Trailing , in codecs');	305 }], 'NotSupportedError', 'Trailing , in codecs');

302	306

303 expect_error('org.w3.clearkey', [{	307 expect_error('org.w3.clearkey', [{

304 videoCapabilities: [{contentType: 'video/webm; codecs=",vp8,"'}] ,	308 videoCapabilities: [{contentType: 'video/webm; codecs=",vp8,"'}] ,

305 }], 'NotSupportedError', 'Leading and trailing , in codecs');	309 }], 'NotSupportedError', 'Leading and trailing , in codecs');

306 </script>	310 </script>

307 </body>	311 </body>

308 </html>	312 </html>

OLD	NEW