Chromium Code Reviews| Index: media/blink/webmediaplayer_impl.cc |
| diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc |
| index af8d74c1a027f7a5f14a07eb8dc33f0d41529a15..e1d0f00cfd4ef6c5981eb5084dd1071ae15b4369 100644 |
| --- a/media/blink/webmediaplayer_impl.cc |
| +++ b/media/blink/webmediaplayer_impl.cc |
| @@ -341,6 +341,7 @@ bool WebMediaPlayerImpl::SupportsOverlayFullscreenVideo() { |
| void WebMediaPlayerImpl::EnableOverlay() { |
| overlay_enabled_ = true; |
| if (surface_manager_) { |
| + overlay_surface_id_.reset(); |
| surface_created_cb_.Reset( |
| base::Bind(&WebMediaPlayerImpl::OnSurfaceCreated, AsWeakPtr())); |
| surface_manager_->CreateFullscreenSurface(pipeline_metadata_.natural_size, |
| @@ -359,7 +360,7 @@ void WebMediaPlayerImpl::DisableOverlay() { |
| if (decoder_requires_restart_for_overlay_) |
| ScheduleRestart(); |
| else if (!set_surface_cb_.is_null()) |
| - set_surface_cb_.Run(overlay_surface_id_); |
| + set_surface_cb_.Run(*overlay_surface_id_); |
| } |
| void WebMediaPlayerImpl::EnteredFullscreen() { |
| @@ -1708,10 +1709,10 @@ void WebMediaPlayerImpl::OnSurfaceRequested( |
| // If we're waiting for the surface to arrive, OnSurfaceCreated() will be |
| // called later when it arrives; so do nothing for now. |
| - if (overlay_enabled_ && overlay_surface_id_ == SurfaceManager::kNoSurfaceID) |
| + if (overlay_enabled_ && !overlay_surface_id_) |
|
watk
2017/05/01 20:34:58
overlay_enabled_ is redundant I believe
liberato (no reviews please)
2017/05/01 20:42:42
Done.
|
| return; |
| - OnSurfaceCreated(overlay_surface_id_); |
| + OnSurfaceCreated(*overlay_surface_id_); |
| } |
| std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() { |