Index: media/blink/webmediaplayer_impl.cc |
diff --git a/media/blink/webmediaplayer_impl.cc b/media/blink/webmediaplayer_impl.cc |
index fdb43c9b95f20f2f20306af96881bb45bbe2a27d..bb32fe27c7a06d7906f7515e8667ab2286f1a8c4 100644 |
--- a/media/blink/webmediaplayer_impl.cc |
+++ b/media/blink/webmediaplayer_impl.cc |
@@ -225,6 +225,7 @@ WebMediaPlayerImpl::WebMediaPlayerImpl( |
renderer_factory_(std::move(renderer_factory)), |
surface_manager_(params.surface_manager()), |
overlay_surface_id_(SurfaceManager::kNoSurfaceID), |
+ in_vr_(false), |
suppress_destruction_errors_(false), |
can_suspend_state_(CanSuspendState::UNKNOWN), |
use_fallback_path_(false), |
@@ -338,14 +339,14 @@ void WebMediaPlayerImpl::DisableOverlay() { |
} |
void WebMediaPlayerImpl::enteredFullscreen() { |
- if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) |
+ if (!force_video_overlays_ && !disable_fullscreen_video_overlays_ && !in_vr_) |
EnableOverlay(); |
if (observer_) |
observer_->OnEnteredFullscreen(); |
} |
void WebMediaPlayerImpl::exitedFullscreen() { |
- if (!force_video_overlays_ && !disable_fullscreen_video_overlays_) |
+ if (!force_video_overlays_ && !disable_fullscreen_video_overlays_ && !in_vr_) |
DisableOverlay(); |
if (observer_) |
observer_->OnExitedFullscreen(); |
@@ -1398,6 +1399,11 @@ void WebMediaPlayerImpl::SetDeviceScaleFactor(float scale_factor) { |
cast_impl_.SetDeviceScaleFactor(scale_factor); |
} |
+void WebMediaPlayerImpl::SetInVr(bool in_vr) { |
+ LOG(ERROR) << "===amp=== Setting screen info, in vr = " << in_vr; |
+ in_vr_ = in_vr; |
liberato (no reviews please)
2016/12/06 17:54:43
this might need to change the overlay state immedi
|
+} |
+ |
void WebMediaPlayerImpl::setPoster(const blink::WebURL& poster) { |
cast_impl_.setPoster(poster); |
} |
@@ -1496,7 +1502,7 @@ void WebMediaPlayerImpl::OnSurfaceRequested( |
} |
std::unique_ptr<Renderer> WebMediaPlayerImpl::CreateRenderer() { |
- if (force_video_overlays_) |
+ if (force_video_overlays_ && !in_vr_) |
EnableOverlay(); |
RequestSurfaceCB request_surface_cb; |