| Index: content/renderer/render_frame_impl.cc
|
| diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc
|
| index 997e3a17f7d31947fb9b9278a3cdc7ece1624bcf..bf90b0ae15404e326ea89b1e84085293b60788ed 100644
|
| --- a/content/renderer/render_frame_impl.cc
|
| +++ b/content/renderer/render_frame_impl.cc
|
| @@ -263,19 +263,19 @@
|
| #include "content/renderer/media/cdm/render_cdm_factory.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_MEDIA)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA)
|
| #include "content/renderer/media/media_interface_provider.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_CDM)
|
| +#if BUILDFLAG(ENABLE_MOJO_CDM)
|
| #include "media/mojo/clients/mojo_cdm_factory.h" // nogncheck
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_RENDERER)
|
| +#if BUILDFLAG(ENABLE_MOJO_RENDERER)
|
| #include "media/mojo/clients/mojo_renderer_factory.h" // nogncheck
|
| #endif
|
|
|
| -#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
|
| +#if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER) || BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
|
| #include "media/mojo/clients/mojo_decoder_factory.h" // nogncheck
|
| #endif
|
|
|
| @@ -2910,7 +2910,7 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
|
| #endif // defined(OS_ANDROID)
|
|
|
| bool use_mojo_renderer_factory = false;
|
| -#if defined(ENABLE_MOJO_RENDERER)
|
| +#if BUILDFLAG(ENABLE_MOJO_RENDERER)
|
| #if BUILDFLAG(ENABLE_RUNTIME_MEDIA_RENDERER_SELECTION)
|
| use_mojo_renderer_factory =
|
| !base::CommandLine::ForCurrentProcess()->HasSwitch(
|
| @@ -2929,7 +2929,7 @@ blink::WebMediaPlayer* RenderFrameImpl::CreateMediaPlayer(
|
| factory_selector->SetBaseFactoryType(
|
| media::RendererFactorySelector::FactoryType::MOJO);
|
| }
|
| -#endif // defined(ENABLE_MOJO_RENDERER)
|
| +#endif // BUILDFLAG(ENABLE_MOJO_RENDERER)
|
|
|
| if (!use_mojo_renderer_factory) {
|
| factory_selector->AddFactory(
|
| @@ -6733,7 +6733,7 @@ media::MediaPermission* RenderFrameImpl::GetMediaPermission() {
|
| return media_permission_dispatcher_.get();
|
| }
|
|
|
| -#if defined(ENABLE_MOJO_MEDIA)
|
| +#if BUILDFLAG(ENABLE_MOJO_MEDIA)
|
| service_manager::mojom::InterfaceProvider*
|
| RenderFrameImpl::GetMediaInterfaceProvider() {
|
| if (!media_interface_provider_) {
|
| @@ -6743,7 +6743,7 @@ RenderFrameImpl::GetMediaInterfaceProvider() {
|
|
|
| return media_interface_provider_.get();
|
| }
|
| -#endif // defined(ENABLE_MOJO_MEDIA)
|
| +#endif // BUILDFLAG(ENABLE_MOJO_MEDIA)
|
|
|
| bool RenderFrameImpl::AreSecureCodecsSupported() {
|
| #if defined(OS_ANDROID)
|
| @@ -6767,10 +6767,10 @@ media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
|
| if (cdm_factory_)
|
| return cdm_factory_.get();
|
|
|
| -#if defined(ENABLE_MOJO_CDM)
|
| +#if BUILDFLAG(ENABLE_MOJO_CDM)
|
| cdm_factory_.reset(new media::MojoCdmFactory(GetMediaInterfaceProvider()));
|
| return cdm_factory_.get();
|
| -#endif // defined(ENABLE_MOJO_CDM)
|
| +#endif // BUILDFLAG(ENABLE_MOJO_CDM)
|
|
|
| #if BUILDFLAG(ENABLE_PEPPER_CDMS)
|
| DCHECK(frame_);
|
| @@ -6788,7 +6788,7 @@ media::CdmFactory* RenderFrameImpl::GetCdmFactory() {
|
| }
|
|
|
| media::DecoderFactory* RenderFrameImpl::GetDecoderFactory() {
|
| -#if defined(ENABLE_MOJO_AUDIO_DECODER) || defined(ENABLE_MOJO_VIDEO_DECODER)
|
| +#if BUILDFLAG(ENABLE_MOJO_AUDIO_DECODER) || BUILDFLAG(ENABLE_MOJO_VIDEO_DECODER)
|
| if (!decoder_factory_) {
|
| decoder_factory_.reset(
|
| new media::MojoDecoderFactory(GetMediaInterfaceProvider()));
|
|
|