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

Issue 2681383003: media: Add a web preference to enable encrypted media (Closed)

Created:
3 years, 10 months ago by xhwang
Modified:
3 years, 10 months ago
Reviewers:
jrummell, jam, dcheng, tommycli
CC:
chromium-reviews
Target Ref:
refs/pending/branch-heads/2987
Project:
chromium
Visibility:
Public.

Description

media: Add a web preference to enable encrypted media Add a WebPreference encrypted_media_enabled. If it's set to false, all requestMediaKeySystemAccess() calls will return a rejected promise with NotSupportedError. Also connect |encrypted_media_enabled| with a new Chrome preference kWebKitEncryptedMediaEnabled and make sure when user changes that preference, the Web preference in the renderer process will get updated. Note that the check is only done in requestMediaKeySystemAccess(). So if a user disabled the preference after a protected content playback already started, the playback session will not be affected. However, all newer protected content playback attempt will fail. NOTRY=true NOPRESUBMIT=true TBR=tommycli@chromium.org,jam@chromium.org,dcheng@chromium.org,jrummell@chromium.org BUG=689778 TEST=Manually tested. Review-Url: https://codereview.chromium.org/2676633006 Cr-Commit-Position: refs/heads/master@{#449048} (cherry picked from commit d252d7b55af16f3edbb90d1132cf6ff360f7d11f) Review-Url: https://codereview.chromium.org/2681383003 Cr-Commit-Position: refs/branch-heads/2987@{#412} Cr-Branched-From: ad51088c0e8776e8dcd963dbe752c4035ba6dab6-refs/heads/master@{#444943} Committed: https://chromium.googlesource.com/chromium/src/+/60a11504bbae8e3ed2a790668bf7da6e5f1c353b

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+54 lines, -3 lines) Patch
M chrome/browser/chrome_content_browser_client.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M chrome/browser/media/encrypted_media_browsertest.cc View 3 chunks +16 lines, -0 lines 0 comments Download
M chrome/browser/ui/prefs/prefs_tab_helper.cc View 2 chunks +3 lines, -0 lines 0 comments Download
M chrome/common/pref_names.h View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/common/pref_names.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M content/public/common/common_param_traits_macros.h View 1 chunk +1 line, -0 lines 0 comments Download
M content/public/common/web_preferences.h View 1 chunk +1 line, -0 lines 0 comments Download
M content/public/common/web_preferences.cc View 1 chunk +1 line, -0 lines 0 comments Download
M content/renderer/render_view_impl.cc View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/Source/core/frame/Settings.json5 View 1 chunk +5 lines, -0 lines 0 comments Download
M third_party/WebKit/Source/modules/encryptedmedia/NavigatorRequestMediaKeySystemAccess.cpp View 6 chunks +15 lines, -3 lines 0 comments Download
M third_party/WebKit/Source/web/WebSettingsImpl.h View 1 chunk +1 line, -0 lines 0 comments Download
M third_party/WebKit/Source/web/WebSettingsImpl.cpp View 1 chunk +4 lines, -0 lines 0 comments Download
M third_party/WebKit/public/web/WebSettings.h View 1 chunk +1 line, -0 lines 0 comments Download

Messages

Total messages: 5 (3 generated)
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/2681383003/1
3 years, 10 months ago (2017-02-09 19:20:02 UTC) #2
commit-bot: I haz the power
3 years, 10 months ago (2017-02-09 19:22:12 UTC) #5
Message was sent while issue was closed.
Committed patchset #1 (id:1) as
https://chromium.googlesource.com/chromium/src/+/60a11504bbae8e3ed2a790668bf7...

Powered by Google App Engine
This is Rietveld 408576698