|
Reland: Remove "needkey" event and add its replacement, "encrypted".
This new event is of type MediaEncryptedEvent, which has initDataType instead of contentType (but this CL just renames one to the other, without translation), and changes the type of initData from Uint8Array to ArrayBuffer as per the WD EME spec.
Also in this CL:
- Start renaming keyNeeded() to encrypted() by renaming the it on HTMLMediaElementEncryptedMedia.
- Remove unused contentType argument from createWebkitNeedKeyEvent() (good thing it's unused or the contentType to initDataType change would be a lot harder).
- Fix prefixed/encrypted-media-events.html test to test the prefixed needkey event instead of the unprefixed one.
TBR=jochen@chromium.org,ddorwin@chromium.org
BUG= 224786
(cherry picked from commit ad09c3ed1914691ee4a089cfe95988892ed42407)
Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=183628
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+120 lines, -318 lines) |
Patch |
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html
|
View
|
|
3 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload-expected.txt
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
D |
LayoutTests/media/encrypted-media/encrypted-media-needkey.html
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
D |
LayoutTests/media/encrypted-media/encrypted-media-needkey-expected.txt
|
View
|
|
1 chunk |
+0 lines, -8 lines |
0 comments
|
Download
|
 |
A + |
LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html
|
View
|
|
3 chunks |
+9 lines, -8 lines |
0 comments
|
Download
|
 |
A |
LayoutTests/media/encrypted-media/encrypted-media-onencrypted-expected.txt
|
View
|
|
1 chunk |
+8 lines, -0 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-multiple-sessions.html
|
View
|
|
2 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-multiple-sessions-expected.txt
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src.html
|
View
|
|
3 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-after-src-expected.txt
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src.html
|
View
|
|
3 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-playback-setmediakeys-before-src-expected.txt
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-v2-syntax.html
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key.html
|
View
|
|
3 chunks |
+5 lines, -5 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/encrypted-media-waiting-for-a-key-expected.txt
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
LayoutTests/media/encrypted-media/prefixed/encrypted-media-events-expected.txt
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
LayoutTests/webexposed/global-constructors-listing-expected.txt
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
Source/core/events/EventTypeNames.in
|
View
|
|
2 chunks |
+1 line, -1 line |
0 comments
|
Download
|
 |
M |
Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.h
|
View
|
|
1 chunk |
+2 lines, -2 lines |
0 comments
|
Download
|
 |
M |
Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp
|
View
|
|
3 chunks |
+14 lines, -12 lines |
0 comments
|
Download
|
 |
M |
Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.idl
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
A + |
Source/modules/encryptedmedia/MediaEncryptedEvent.h
|
View
|
|
1 chunk |
+20 lines, -20 lines |
0 comments
|
Download
|
 |
A + |
Source/modules/encryptedmedia/MediaEncryptedEvent.cpp
|
View
|
|
1 chunk |
+9 lines, -11 lines |
0 comments
|
Download
|
 |
A + |
Source/modules/encryptedmedia/MediaEncryptedEvent.idl
|
View
|
|
1 chunk |
+3 lines, -3 lines |
0 comments
|
Download
|
 |
D |
Source/modules/encryptedmedia/MediaKeyNeededEvent.h
|
View
|
|
1 chunk |
+0 lines, -73 lines |
0 comments
|
Download
|
 |
D |
Source/modules/encryptedmedia/MediaKeyNeededEvent.cpp
|
View
|
|
1 chunk |
+0 lines, -62 lines |
0 comments
|
Download
|
 |
D |
Source/modules/encryptedmedia/MediaKeyNeededEvent.idl
|
View
|
|
1 chunk |
+0 lines, -33 lines |
0 comments
|
Download
|
 |
M |
Source/modules/modules.gypi
|
View
|
|
3 chunks |
+4 lines, -4 lines |
0 comments
|
Download
|
 |
M |
Source/web/WebMediaPlayerClientImpl.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
Source/web/WebMediaPlayerClientImpl.cpp
|
View
|
|
2 chunks |
+6 lines, -2 lines |
0 comments
|
Download
|
 |
M |
public/platform/WebMediaPlayerClient.h
|
View
|
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
Total messages: 8 (3 generated)
|