| Index: media/blink/webmediaplayer_impl.cc
|
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc
|
| index c035e5ea7136976a2ce7510d04e116daf3b17973..7b3a65c791d9d07b2d065e9e46d119637883352c 100644
|
| --- a/media/blink/webmediaplayer_impl.cc
|
| +++ b/media/blink/webmediaplayer_impl.cc
|
| @@ -337,11 +337,13 @@ void WebMediaPlayerImpl::DisableOverlay() {
|
| void WebMediaPlayerImpl::enteredFullscreen() {
|
| if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
|
| EnableOverlay();
|
| + pipeline_controller_.SetFullscreenMode(true);
|
| }
|
|
|
| void WebMediaPlayerImpl::exitedFullscreen() {
|
| if (!force_video_overlays_ && !disable_fullscreen_video_overlays_)
|
| DisableOverlay();
|
| + pipeline_controller_.SetFullscreenMode(false);
|
| }
|
|
|
| void WebMediaPlayerImpl::DoLoad(LoadType load_type,
|
| @@ -912,6 +914,8 @@ void WebMediaPlayerImpl::OnEncryptedMediaInitData(
|
| if (!was_encrypted && watch_time_reporter_)
|
| CreateWatchTimeReporter();
|
|
|
| + pipeline_controller_.SetIsEncryptedContent();
|
| +
|
| encrypted_client_->encrypted(
|
| ConvertToWebInitDataType(init_data_type), init_data.data(),
|
| base::saturated_cast<unsigned int>(init_data.size()));
|
| @@ -1445,6 +1449,10 @@ std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() {
|
| request_surface_cb =
|
| BIND_TO_RENDER_LOOP(&WebMediaPlayerImpl::OnSurfaceRequested);
|
| #endif
|
| + bool is_remoting = pipeline_controller_.ShouldUseRemotingRenderer();
|
| + // TODO(xjz): Pass |is_remoting| to CreateRenderer() to create the proper
|
| + // renderer.
|
| + VLOG(3) << "Create " << (is_remoting ? "Remoting" : "Local") << " renderer.";
|
| return renderer_factory_->CreateRenderer(
|
| media_task_runner_, worker_task_runner_, audio_source_provider_.get(),
|
| compositor_, request_surface_cb);
|
| @@ -1822,4 +1830,12 @@ void WebMediaPlayerImpl::CreateWatchTimeReporter() {
|
| watch_time_reporter_->OnShown();
|
| }
|
|
|
| +void WebMediaPlayerImpl::ancestorEnteredFullscreen() {
|
| + pipeline_controller_.SetFullscreenMode(true);
|
| +}
|
| +
|
| +void WebMediaPlayerImpl::ancestorExitedFullscreen() {
|
| + pipeline_controller_.SetFullscreenMode(false);
|
| +}
|
| +
|
| } // namespace media
|
|
|