|
(reland) media: Add OutputProtectionProxy
This reverts commit 7ce3db959f0f5b8d3837ac028ef8e150d4ac7147 and relands
22f8a43cae802c102b5e31211ca19466294a0157 without changes. I believe the
failure would be fixed after the bots are clobbered.
Original Description:
This class handles output protection query and request in the browser
process on all platforms. On ChromeOS, it delegates the operations on
the hardware displays to OutputProtectionDelegate. On other platforms,
it does not check hardware displays. On all platforms, it checks
whether there is any network link and adds it to the existing link mask.
This class will also be used to implement mojo OutputProtection service
on all platforms.
This CL also updated PPAPI cdm adapter and PPAPI code to enable output
protection calls on all platforms. A unit test is added via external
clear key tests.
TBR=ddorwin@chromium.org, jrummell@chromium.org, oshima@chromium.org, bbudge@chromium.org
BUG= 592122, 589618, 623214
TEST=Added new tests.
Committed: https://crrev.com/640ef5dcf6481ba1af50d37ee2c57039d08ed2aa
Cr-Commit-Position: refs/heads/master@{#412560}
|
Unified diffs |
Side-by-side diffs |
Delta from patch set |
Stats (+330 lines, -142 lines) |
Patch |
 |
M |
chrome/browser/chromeos/display/output_protection_delegate.cc
|
View
|
1
|
2 chunks |
+1 line, -13 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/media/encrypted_media_browsertest.cc
|
View
|
|
3 chunks |
+17 lines, -3 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/media/output_protection_proxy.h
|
View
|
|
1 chunk |
+70 lines, -0 lines |
0 comments
|
Download
|
 |
A |
chrome/browser/media/output_protection_proxy.cc
|
View
|
|
1 chunk |
+89 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.cc
|
View
|
|
2 chunks |
+0 lines, -2 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.h
|
View
|
|
3 chunks |
+8 lines, -10 lines |
0 comments
|
Download
|
 |
M |
chrome/browser/renderer_host/pepper/pepper_output_protection_message_filter.cc
|
View
|
1
|
6 chunks |
+16 lines, -42 lines |
0 comments
|
Download
|
 |
M |
chrome/chrome_browser.gypi
|
View
|
1
|
1 chunk |
+2 lines, -0 lines |
0 comments
|
Download
|
 |
M |
chrome/renderer/media/chrome_key_systems.cc
|
View
|
|
2 chunks |
+7 lines, -1 line |
0 comments
|
Download
|
 |
M |
media/cdm/ppapi/external_clear_key/clear_key_cdm.h
|
View
|
|
2 chunks |
+6 lines, -0 lines |
0 comments
|
Download
|
 |
M |
media/cdm/ppapi/external_clear_key/clear_key_cdm.cc
|
View
|
|
9 chunks |
+49 lines, -11 lines |
0 comments
|
Download
|
 |
M |
media/cdm/ppapi/ppapi_cdm_adapter.h
|
View
|
|
4 chunks |
+9 lines, -5 lines |
0 comments
|
Download
|
 |
M |
media/cdm/ppapi/ppapi_cdm_adapter.cc
|
View
|
|
9 chunks |
+7 lines, -11 lines |
0 comments
|
Download
|
 |
M |
media/test/data/eme_player_js/app_loader.js
|
View
|
|
1 chunk |
+1 line, -1 line |
0 comments
|
Download
|
 |
D |
media/test/data/eme_player_js/file_io_test_player.js
|
View
|
|
1 chunk |
+0 lines, -39 lines |
0 comments
|
Download
|
 |
M |
media/test/data/eme_player_js/globals.js
|
View
|
|
2 chunks |
+5 lines, -3 lines |
0 comments
|
Download
|
 |
M |
media/test/data/eme_player_js/player_utils.js
|
View
|
|
1 chunk |
+2 lines, -1 line |
0 comments
|
Download
|
 |
A |
media/test/data/eme_player_js/unit_test_player.js
|
View
|
|
1 chunk |
+41 lines, -0 lines |
0 comments
|
Download
|
Total messages: 17 (11 generated)
|