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

Issue 2568463003: media: Rename MediaKeys to ContentDecryptionModule (Closed)

Created:
4 years ago by xhwang
Modified:
4 years ago
CC:
Aaron Boodman, abarth-chromium, alokp+watch_chromium.org, apacible+watch_chromium.org, avayvod+watch_chromium.org, chromium-reviews, chromoting-reviews_chromium.org, darin (slow to review), darin-cc_chromium.org, eme-reviews_chromium.org, feature-media-reviews_chromium.org, halliwell+watch_chromium.org, jam, lcwu+watch_chromium.org, mcasas+watch+vc_chromium.org, miu+watch_chromium.org, mlamouri+watch-media_chromium.org, mlamouri+watch-content_chromium.org, piman+watch_chromium.org, posciak+watch_chromium.org, qsr+mojo_chromium.org, viettrungluu+watch_chromium.org, xjz+watch_chromium.org, yzshen+watch_chromium.org, ddorwin
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

media: Rename MediaKeys to ContentDecryptionModule This class is really implementing the Content Decryption Module (CDM) in the spec (https://w3c.github.io/encrypted-media/#definitions). In the code, it's implementing WebContentDecryptionModule. TBR=bbudge@chromium.org, dcheng@chromium.org BUG=309237 TEST=No functionality change. Rename only. CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel Committed: https://crrev.com/79b19304442fdea7d869b860095d68a633dfb541 Cr-Commit-Position: refs/heads/master@{#438242}

Patch Set 1 #

Total comments: 34

Patch Set 2 : comments addressed #

Unified diffs Side-by-side diffs Delta from patch set Stats (+439 lines, -602 lines) Patch
M chromecast/media/cdm/cast_cdm.h View 3 chunks +8 lines, -7 lines 0 comments Download
M chromecast/media/cdm/cast_cdm.cc View 1 chunk +4 lines, -3 lines 0 comments Download
M chromecast/media/cdm/cast_cdm_factory.h View 1 chunk +0 lines, -1 line 0 comments Download
M chromecast/media/cdm/cast_cdm_proxy.h View 1 3 chunks +8 lines, -7 lines 0 comments Download
M chromecast/media/cdm/cast_cdm_proxy.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M content/renderer/media/android/webmediaplayer_android.cc View 1 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/media/cdm/ppapi_decryptor.h View 1 4 chunks +6 lines, -6 lines 0 comments Download
M content/renderer/media/cdm/render_cdm_factory.h View 1 chunk +0 lines, -1 line 0 comments Download
M content/renderer/media/cdm/render_cdm_factory.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M content/renderer/pepper/content_decryptor_delegate.h View 2 chunks +3 lines, -3 lines 0 comments Download
M content/renderer/pepper/content_decryptor_delegate.cc View 5 chunks +12 lines, -12 lines 0 comments Download
M media/base/BUILD.gn View 2 chunks +2 lines, -2 lines 0 comments Download
M media/base/android/android_cdm_factory.cc View 1 2 chunks +2 lines, -1 line 0 comments Download
M media/base/android/media_drm_bridge.h View 3 chunks +4 lines, -3 lines 0 comments Download
M media/base/android/media_drm_bridge.cc View 3 chunks +7 lines, -7 lines 0 comments Download
M media/base/android/media_player_android.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/base/android/media_player_android.cc View 1 chunk +2 lines, -1 line 0 comments Download
M media/base/cdm_callback_promise.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M media/base/cdm_factory.h View 1 chunk +5 lines, -4 lines 0 comments Download
M media/base/cdm_initialized_promise.h View 2 chunks +6 lines, -6 lines 0 comments Download
M media/base/cdm_initialized_promise.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/base/cdm_promise.h View 1 1 chunk +2 lines, -1 line 0 comments Download
M media/base/cdm_promise_adapter.cc View 1 chunk +0 lines, -2 lines 0 comments Download
M media/base/cdm_session_tracker.h View 1 chunk +1 line, -1 line 0 comments Download
A + media/base/content_decryption_module.h View 1 7 chunks +18 lines, -18 lines 0 comments Download
A media/base/content_decryption_module.cc View 1 chunk +27 lines, -0 lines 0 comments Download
M media/base/decryptor.h View 1 chunk +2 lines, -2 lines 0 comments Download
M media/base/ipc/media_param_traits_macros.h View 2 chunks +5 lines, -5 lines 0 comments Download
D media/base/media_keys.h View 1 chunk +0 lines, -197 lines 0 comments Download
D media/base/media_keys.cc View 1 chunk +0 lines, -26 lines 0 comments Download
M media/base/mock_filters.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/blink/cdm_result_promise_helper.h View 1 chunk +4 lines, -3 lines 0 comments Download
M media/blink/cdm_session_adapter.h View 6 chunks +10 lines, -10 lines 0 comments Download
M media/blink/cdm_session_adapter.cc View 4 chunks +12 lines, -10 lines 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/blink/webcontentdecryptionmodule_impl.cc View 2 chunks +3 lines, -2 lines 0 comments Download
M media/blink/webcontentdecryptionmodulesession_impl.h View 1 3 chunks +2 lines, -3 lines 0 comments Download
M media/blink/webcontentdecryptionmodulesession_impl.cc View 6 chunks +14 lines, -13 lines 0 comments Download
M media/blink/webmediaplayer_impl.h View 2 chunks +3 lines, -3 lines 0 comments Download
M media/blink/webmediaplayer_impl.cc View 4 chunks +5 lines, -4 lines 0 comments Download
M media/cdm/aes_decryptor.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/cdm/aes_decryptor.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/cdm/aes_decryptor_unittest.cc View 7 chunks +18 lines, -18 lines 0 comments Download
M media/cdm/cdm_adapter.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/cdm/cdm_adapter.cc View 2 chunks +11 lines, -9 lines 0 comments Download
M media/cdm/cdm_adapter_unittest.cc View 5 chunks +6 lines, -6 lines 0 comments Download
M media/cdm/default_cdm_factory.cc View 1 2 chunks +2 lines, -1 line 0 comments Download
M media/cdm/json_web_key.h View 3 chunks +12 lines, -9 lines 0 comments Download
M media/cdm/json_web_key.cc View 6 chunks +13 lines, -13 lines 0 comments Download
M media/cdm/json_web_key_unittest.cc View 1 9 chunks +32 lines, -26 lines 0 comments Download
M media/cdm/ppapi/external_clear_key/clear_key_cdm.h View 1 2 chunks +2 lines, -2 lines 0 comments Download
M media/cdm/ppapi/external_clear_key/clear_key_cdm.cc View 3 chunks +12 lines, -11 lines 0 comments Download
M media/gpu/android_video_decode_accelerator.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/mojo/clients/mojo_cdm.h View 3 chunks +6 lines, -6 lines 0 comments Download
M media/mojo/clients/mojo_cdm_factory.cc View 1 2 chunks +2 lines, -1 line 0 comments Download
M media/mojo/clients/mojo_cdm_unittest.cc View 1 3 chunks +3 lines, -2 lines 0 comments Download
M media/mojo/interfaces/content_decryption_module.mojom View 2 chunks +5 lines, -4 lines 0 comments Download
M media/mojo/interfaces/content_decryption_module.typemap View 2 chunks +3 lines, -3 lines 0 comments Download
M media/mojo/services/mojo_audio_decoder_service.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/mojo/services/mojo_audio_decoder_service.cc View 3 chunks +6 lines, -5 lines 0 comments Download
M media/mojo/services/mojo_cdm_service.h View 5 chunks +12 lines, -10 lines 0 comments Download
M media/mojo/services/mojo_cdm_service.cc View 5 chunks +15 lines, -11 lines 0 comments Download
M media/mojo/services/mojo_cdm_service_context.h View 2 chunks +2 lines, -2 lines 0 comments Download
M media/mojo/services/mojo_cdm_service_context.cc View 2 chunks +3 lines, -2 lines 0 comments Download
M media/mojo/services/mojo_decryptor_service.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/mojo/services/mojo_decryptor_service.cc View 2 chunks +2 lines, -2 lines 0 comments Download
M media/mojo/services/mojo_renderer_service.h View 3 chunks +3 lines, -3 lines 0 comments Download
M media/mojo/services/mojo_renderer_service.cc View 3 chunks +4 lines, -3 lines 0 comments Download
M media/remoting/proto/remoting_rpc_message.proto View 4 chunks +9 lines, -9 lines 0 comments Download
M media/remoting/remote_renderer_impl.cc View 1 1 chunk +0 lines, -1 line 0 comments Download
M media/remoting/remoting_cdm.h View 2 chunks +3 lines, -3 lines 0 comments Download
M media/remoting/rpc/proto_enum_utils.h View 2 chunks +11 lines, -11 lines 0 comments Download
M media/remoting/rpc/proto_enum_utils.cc View 6 chunks +20 lines, -20 lines 0 comments Download
M media/remoting/rpc/proto_utils.h View 1 1 chunk +0 lines, -1 line 0 comments Download
M media/remoting/rpc/proto_utils.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/remoting/rpc/proto_utils_unittest.cc View 1 chunk +1 line, -1 line 0 comments Download
M media/test/pipeline_integration_test.cc View 7 chunks +15 lines, -13 lines 0 comments Download
M media/test/pipeline_integration_test_base.h View 1 chunk +0 lines, -1 line 0 comments Download

Messages

Total messages: 48 (33 generated)
xhwang
jrummell: Another renaming CL. PTAL
4 years ago (2016-12-12 19:48:51 UTC) #19
DaleCurtis
Might try adding an entry to the hyper-blame list so that blame works correctly in ...
4 years ago (2016-12-12 20:38:55 UTC) #20
DaleCurtis
Well, after I said that, despite the large size, I realized you're only actually renaming ...
4 years ago (2016-12-12 20:39:29 UTC) #21
xhwang
On 2016/12/12 20:39:29, DaleCurtis wrote: > Well, after I said that, despite the large size, ...
4 years ago (2016-12-12 20:51:53 UTC) #22
jrummell
lgtm with lots of nit about including/not including the header. https://codereview.chromium.org/2568463003/diff/60001/chromecast/media/cdm/cast_cdm_factory.h File chromecast/media/cdm/cast_cdm_factory.h (right): https://codereview.chromium.org/2568463003/diff/60001/chromecast/media/cdm/cast_cdm_factory.h#newcode11 ...
4 years ago (2016-12-12 22:08:40 UTC) #23
xhwang
Thanks for the comments! PTAL again https://codereview.chromium.org/2568463003/diff/60001/chromecast/media/cdm/cast_cdm_factory.h File chromecast/media/cdm/cast_cdm_factory.h (right): https://codereview.chromium.org/2568463003/diff/60001/chromecast/media/cdm/cast_cdm_factory.h#newcode11 chromecast/media/cdm/cast_cdm_factory.h:11: #include "media/base/cdm_factory.h" On ...
4 years ago (2016-12-12 22:32:51 UTC) #24
xhwang
slan: Please OWNERS review chromecast/ erickung: Please OWNERS review media/remoting/ bbudge: You are TBRed on ...
4 years ago (2016-12-13 06:06:18 UTC) #30
dcheng
ipc rs lgtm
4 years ago (2016-12-13 06:07:14 UTC) #32
slan
On 2016/12/13 06:07:14, dcheng wrote: > ipc rs lgtm cast rs lgtm
4 years ago (2016-12-13 06:23:12 UTC) #33
bbudge
content/renderer/pepper lgtm
4 years ago (2016-12-13 15:10:19 UTC) #34
erickung1
media/remoting LGTM
4 years ago (2016-12-13 18:11:25 UTC) #37
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2568463003/80001
4 years ago (2016-12-13 18:19:41 UTC) #41
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.org/2568463003/80001
4 years ago (2016-12-13 18:20:31 UTC) #43
commit-bot: I haz the power
Committed patchset #2 (id:80001)
4 years ago (2016-12-13 18:53:17 UTC) #46
commit-bot: I haz the power
4 years ago (2016-12-13 18:56:29 UTC) #48
Message was sent while issue was closed.
Patchset 2 (id:??) landed as
https://crrev.com/79b19304442fdea7d869b860095d68a633dfb541
Cr-Commit-Position: refs/heads/master@{#438242}

Powered by Google App Engine
This is Rietveld 408576698