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

Side by Side Diff: third_party/WebKit/LayoutTests/media/encrypted-media/encrypted-media-reset-src-during-setmediakeys.html

Issue 2703993002: media: Resolve pending SetCdm() when WebMediaPlayerImpl is destructed (Closed)
Patch Set: add layout test Created 3 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
(Empty)
1 <!DOCTYPE html>
2 <html>
3 <head>
4 <title>Reset src during setMediaKeys()</title>
5 <script src="encrypted-media-utils.js"></script>
6 <script src="../../resources/testharness.js"></script>
7 <script src="../../resources/testharnessreport.js"></script>
8 </head>
9 <body>
10 <video></video>
11 <script>
12 async_test(function(test)
13 {
14 var mediaKeys;
15 var video = document.querySelector('video');
16 assert_not_equals(video, null);
17 var encryptedEventIndex = 0;
18
19 // Content to be played. These files must be the same format.
20 var content = '../content/test-encrypted.webm';
21 var alternateContent = '../content/test-encrypted-different-av-k eys.webm';
22
23 function setMediaKeys() {
24 // Create a MediaKeys object and assign it to video.
25 video.setMediaKeys(mediaKeys)
26 .then(function(result) {
27 // setMediaKeys() should succeed even if src is reset before setMediaKeys() promise is resolved.
28 assert_not_equals(video.mediaKeys, null, 'set successf ully');
29 assert_true(video.mediaKeys === mediaKeys);
30 })
31 .catch(function(error) {
32 forceTestFailureFromPromise(test, error);
33 });
34 }
35
36 var onEncrypted = function(event)
37 {
38 encryptedEventIndex++;
39
40 // This event is fired once for the audio stream and once
41 // for the video stream each time .src is set.
42 if (encryptedEventIndex == 2) {
jrummell 2017/02/22 00:36:48 Maybe assert that video.mediaKeys == null?
xhwang 2017/02/24 17:37:08 Done.
43 setMediaKeys();
44 video.setMediaKeys(null);
jrummell 2017/02/22 00:36:48 I thought this was bad behavior (setting it again
xhwang 2017/02/24 17:37:08 Removed.
45 // Reset src without waiting for setMediaKeys() to finis h.
46 video.src = alternateContent;
47 } else if (encryptedEventIndex == 4) {
48 // Finished second video.
jrummell 2017/02/22 00:36:48 assert_true(video.mediaKeys === mediaKeys)?
xhwang 2017/02/24 17:37:08 This is not necessarily true. Imagine setMediaKeys
49 test.done();
50 }
51 };
52
53 navigator.requestMediaKeySystemAccess('org.w3.clearkey', getConf igurationForFile(content))
54 .then(function(access) {
55 assert_equals(access.keySystem, 'org.w3.clearkey');
56 return access.createMediaKeys();
57 })
58 .then(function(result) {
59 mediaKeys = result;
60 assert_not_equals(mediaKeys, null);
61
62 // Set src without setMediaKeys().
63 video.src = content;
64 waitForEventAndRunStep('encrypted', video, onEncrypted, test);
65 });
jrummell 2017/02/22 00:36:48 Probably needs a .catch(function(error) { forceTes
xhwang 2017/02/24 17:37:08 Done.
66 }, 'Reset src during setMediaKeys().');
67 </script>
68 </body>
69 </html>
OLDNEW
« no previous file with comments | « media/renderers/renderer_impl.cc ('k') | third_party/WebKit/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698