| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index ed2b611bed047fcbbfaef807bb92a21c478f094b..b44af9d8459209c16cc92cdf1bf82fb98bb8135c 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -143,6 +143,7 @@
|
| #include "media/blink/url_index.h"
|
| #include "media/blink/webencryptedmediaclient_impl.h"
|
| #include "media/blink/webmediaplayer_impl.h"
|
| +#include "media/media_features.h"
|
| #include "media/renderers/gpu_video_accelerator_factories.h"
|
| #include "mojo/common/url_type_converters.h"
|
| #include "mojo/edk/js/core.h"
|
| @@ -6033,13 +6034,7 @@ shell::mojom::InterfaceProvider* RenderFrameImpl::GetMediaInterfaceProvider() {
|
| #endif // defined(ENABLE_MOJO_MEDIA)
|
|
|
| bool RenderFrameImpl::AreSecureCodecsSupported() {
|
| -#if defined(OS_ANDROID)
|
| - // Hardware-secure codecs are only supported if secure surfaces are enabled.
|
| - return render_view_->renderer_preferences_
|
| - .use_video_overlay_for_embedded_encrypted_video;
|
| -#else
|
| - return false;
|
| -#endif // defined(OS_ANDROID)
|
| + return render_view_->renderer_preferences_.hw_secure_codec_allowed;
|
| }
|
|
|
| media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
|
|
|