LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html - Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html

Issue 423633002: Make HTMLMediaElement.setMediaKeys() asynchronous. (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master

Patch Set: Remove clearing (+rebase) Created 6 years, 4 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/media/encrypted-media/encrypted-media-playback-multiple-sessions.html » ('j') | Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.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>Reloading during encrypted media playback</title>	4 <title>Reloading during encrypted media playback</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 <video id="testVideo"></video>	10 <video id="testVideo"></video>

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
72 if (location.hash == '#x') {	72 if (location.hash == '#x') {

73 test.done();	73 test.done();

74 return;	74 return;

75 }	75 }

76	76

77 location.hash += 'x';	77 location.hash += 'x';

78 location.reload();	78 location.reload();

79 }	79 }

80	80

81 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {	81 MediaKeys.create('org.w3.clearkey').then(function(mediaKeys) {

82

83 waitForEventAndRunStep('needkey', video, onNeedKey, test);	82 waitForEventAndRunStep('needkey', video, onNeedKey, test);

84 waitForEventAndRunStep('playing', video, onPlaying, test);	83 waitForEventAndRunStep('playing', video, onPlaying, test);

85

86 video.setMediaKeys(mediaKeys);

87 video.src = '../content/test-encrypted.webm';	84 video.src = '../content/test-encrypted.webm';

	85 return video.setMediaKeys(mediaKeys);

	86 }).then(function(result) {

88 video.play();	87 video.play();

89 }).catch(function(error) {	88 }).catch(function(error) {

90 forceTestFailureFromPromise(test, error);	89 forceTestFailureFromPromise(test, error);

91 });	90 });

92 }, 'Reloading during encrypted media playback.');	91 }, 'Reloading during encrypted media playback.');

93 </script>	92 </script>

94 </body>	93 </body>

95 </html>	94 </html>

OLD	NEW