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

Issue 600143005: Rename onneedkey event to onencrypted. (Closed)

Created:
6 years, 2 months ago by sandersd (OOO until July 31)
Modified:
6 years, 2 months ago
CC:
blink-reviews, ddorwin, dglazkov+blink, eric.carlson_apple.com, feature-media-reviews_chromium.org, jamesr, mkwst+moarreviews_chromium.org, philipj_slow
Base URL:
https://chromium.googlesource.com/chromium/blink.git@master
Project:
blink
Visibility:
Public.

Description

Remove "needkey" event and add it's 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. BUG=224786 Committed: https://src.chromium.org/viewvc/blink?view=rev&revision=183561

Patch Set 1 #

Total comments: 8

Patch Set 2 : Fixes. #

Total comments: 2

Patch Set 3 : Rename keyNeeded() to encrypted(). #

Total comments: 2

Patch Set 4 : Remove OVERRIDE. #

Total comments: 36

Patch Set 5 : Rebase. #

Patch Set 6 : Fix rebase error. #

Patch Set 7 : Update global-constructors-listing expectations. #

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 2 3 4 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 1 2 3 4 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 1 chunk +2 lines, -2 lines 0 comments Download
M LayoutTests/media/encrypted-media/prefixed/encrypted-media-events-expected.txt View 1 1 chunk +1 line, -1 line 0 comments Download
M LayoutTests/webexposed/global-constructors-listing-expected.txt View 1 2 3 4 5 6 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 2 3 4 1 chunk +2 lines, -2 lines 0 comments Download
M Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp View 1 2 3 4 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 2 3 4 5 1 chunk +20 lines, -20 lines 0 comments Download
A + Source/modules/encryptedmedia/MediaEncryptedEvent.cpp View 1 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 2 3 4 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 1 2 3 4 3 chunks +4 lines, -4 lines 0 comments Download
M Source/web/WebMediaPlayerClientImpl.h View 1 2 3 4 1 chunk +2 lines, -0 lines 0 comments Download
M Source/web/WebMediaPlayerClientImpl.cpp View 1 2 2 chunks +6 lines, -2 lines 0 comments Download
M public/platform/WebMediaPlayerClient.h View 1 2 3 1 chunk +2 lines, -0 lines 0 comments Download

Messages

Total messages: 50 (18 generated)
sandersd (OOO until July 31)
6 years, 2 months ago (2014-09-26 21:39:01 UTC) #2
jrummell
lgtm w/nits. https://codereview.chromium.org/600143005/diff/1/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html File LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html (right): https://codereview.chromium.org/600143005/diff/1/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html#newcode17 LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html:17: var keyNeededEvent = document.createEvent("MediaEncryptedEvent"); s/keyNeededEvent/encryptedEvent/ ? https://codereview.chromium.org/600143005/diff/1/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp ...
6 years, 2 months ago (2014-09-26 22:16:23 UTC) #3
ddorwin
As discussed, the Chromium browser tests need to be updated to handle both event names ...
6 years, 2 months ago (2014-09-26 22:42:17 UTC) #4
sandersd (OOO until July 31)
https://codereview.chromium.org/600143005/diff/1/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html File LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html (right): https://codereview.chromium.org/600143005/diff/1/LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html#newcode17 LayoutTests/media/encrypted-media/prefixed/encrypted-media-events.html:17: var keyNeededEvent = document.createEvent("MediaEncryptedEvent"); On 2014/09/26 22:16:23, jrummell wrote: ...
6 years, 2 months ago (2014-09-26 22:49:22 UTC) #5
sandersd (OOO until July 31)
On 2014/09/26 22:42:17, ddorwin wrote: > As discussed, the Chromium browser tests need to be ...
6 years, 2 months ago (2014-09-29 23:03:18 UTC) #6
ddorwin
Adding wolenetz and removing myself.
6 years, 2 months ago (2014-09-29 23:13:10 UTC) #8
ddorwin
I reviewed Source/. modules/encryptedmedia LG % comment. https://codereview.chromium.org/600143005/diff/20001/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp File Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp (right): https://codereview.chromium.org/600143005/diff/20001/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp#newcode504 Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp:504: void HTMLMediaElementEncryptedMedia::keyNeeded(HTMLMediaElement& ...
6 years, 2 months ago (2014-09-29 23:26:42 UTC) #10
sandersd (OOO until July 31)
https://codereview.chromium.org/600143005/diff/20001/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp File Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp (right): https://codereview.chromium.org/600143005/diff/20001/Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp#newcode504 Source/modules/encryptedmedia/HTMLMediaElementEncryptedMedia.cpp:504: void HTMLMediaElementEncryptedMedia::keyNeeded(HTMLMediaElement& element, const String& initDataType, const unsigned char* ...
6 years, 2 months ago (2014-09-30 19:14:03 UTC) #11
Mike West
One quick drive-by comment on public/. https://codereview.chromium.org/600143005/diff/40001/public/platform/WebMediaPlayerClient.h File public/platform/WebMediaPlayerClient.h (right): https://codereview.chromium.org/600143005/diff/40001/public/platform/WebMediaPlayerClient.h#newcode87 public/platform/WebMediaPlayerClient.h:87: virtual void keyNeeded(const ...
6 years, 2 months ago (2014-09-30 19:27:11 UTC) #13
sandersd (OOO until July 31)
https://codereview.chromium.org/600143005/diff/40001/public/platform/WebMediaPlayerClient.h File public/platform/WebMediaPlayerClient.h (right): https://codereview.chromium.org/600143005/diff/40001/public/platform/WebMediaPlayerClient.h#newcode87 public/platform/WebMediaPlayerClient.h:87: virtual void keyNeeded(const WebString& contentType, const unsigned char* initData, ...
6 years, 2 months ago (2014-09-30 19:39:13 UTC) #14
wolenetz
Looks pretty good: I mostly have just noob-to-eme questions (and nits that are mostly confirming ...
6 years, 2 months ago (2014-10-02 00:15:21 UTC) #15
sandersd (OOO until July 31)
https://codereview.chromium.org/600143005/diff/60001/LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html File LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html (right): https://codereview.chromium.org/600143005/diff/60001/LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html#newcode38 LayoutTests/media/encrypted-media/encrypted-media-lifetime-reload.html:38: mediaKeySession.generateRequest(event.initDataType, event.initData).catch(function(error) { On 2014/10/02 00:15:20, wolenetz wrote: > ...
6 years, 2 months ago (2014-10-02 17:48:17 UTC) #16
wolenetz
Thank you for the clarifications. Verbosity can be the enemy of agility, though sometimes it ...
6 years, 2 months ago (2014-10-02 18:11:34 UTC) #17
sandersd (OOO until July 31)
jamesr@chromium.org: Please review changes in Source/web and public/platform.
6 years, 2 months ago (2014-10-02 18:17:23 UTC) #19
ddorwin
lgtm
6 years, 2 months ago (2014-10-02 18:39:22 UTC) #20
sandersd (OOO until July 31)
jochen: Please review changes in Source/web, Source/core/events, and public/platform.
6 years, 2 months ago (2014-10-07 19:38:34 UTC) #22
jochen (gone - plz use gerrit)
lgtm
6 years, 2 months ago (2014-10-08 14:46:02 UTC) #23
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/60001
6 years, 2 months ago (2014-10-08 17:33:39 UTC) #25
commit-bot: I haz the power
Failed to apply patch for LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html: While running patch -p1 --forward --force --no-backup-if-mismatch; A LayoutTests/media/encrypted-media/encrypted-media-onencrypted.html ...
6 years, 2 months ago (2014-10-08 17:33:57 UTC) #27
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/100001
6 years, 2 months ago (2014-10-08 18:07:17 UTC) #29
commit-bot: I haz the power
Exceeded time limit waiting for builds to trigger.
6 years, 2 months ago (2014-10-08 20:15:32 UTC) #31
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/100001
6 years, 2 months ago (2014-10-08 20:41:32 UTC) #33
commit-bot: I haz the power
Try jobs failed on following builders: mac_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/mac_blink_rel/builds/26337)
6 years, 2 months ago (2014-10-09 05:19:55 UTC) #35
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/100001
6 years, 2 months ago (2014-10-09 22:34:03 UTC) #37
commit-bot: I haz the power
Try jobs failed on following builders: linux_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/28598)
6 years, 2 months ago (2014-10-10 01:21:49 UTC) #39
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/100001
6 years, 2 months ago (2014-10-10 18:02:00 UTC) #41
commit-bot: I haz the power
Try jobs failed on following builders: linux_blink_rel on tryserver.blink (http://build.chromium.org/p/tryserver.blink/builders/linux_blink_rel/builds/28752)
6 years, 2 months ago (2014-10-10 19:07:08 UTC) #43
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/100001
6 years, 2 months ago (2014-10-10 20:07:55 UTC) #45
wolenetz
On 2014/10/10 20:07:55, I haz the power (commit-bot) wrote: > CQ is trying da patch. ...
6 years, 2 months ago (2014-10-10 20:41:39 UTC) #46
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/600143005/400001
6 years, 2 months ago (2014-10-10 20:50:20 UTC) #48
commit-bot: I haz the power
Committed patchset #7 (id:400001) as 183561
6 years, 2 months ago (2014-10-10 21:53:24 UTC) #49
Stephen White
6 years, 2 months ago (2014-10-12 14:38:19 UTC) #50
Message was sent while issue was closed.
On 2014/10/10 21:53:24, I haz the power (commit-bot) wrote:
> Committed patchset #7 (id:400001) as 183561

Looks like the Chrome side of this was reverted in
de394fa4553674e0aa522ce7c3483394f0f40d3d (r297538), which means this is now
causing browser_tests failures in the Blink canaries and blocking the Blink
roll. I'm going to try a speculative revert.

Powered by Google App Engine
This is Rietveld 408576698