| Index: content/browser/media/android/browser_surface_view_manager.cc
|
| diff --git a/content/browser/media/android/browser_surface_view_manager.cc b/content/browser/media/android/browser_surface_view_manager.cc
|
| index 4a73cd2f86c8a0d67a01b0c907fa8157d045dd46..483ec0a56e9bb7e01bb967099f1fca8abe4b12be 100644
|
| --- a/content/browser/media/android/browser_surface_view_manager.cc
|
| +++ b/content/browser/media/android/browser_surface_view_manager.cc
|
| @@ -63,6 +63,16 @@ void BrowserSurfaceViewManager::DidExitFullscreen(bool release_media_player) {
|
|
|
| void BrowserSurfaceViewManager::OnCreateFullscreenSurface(
|
| const gfx::Size& video_natural_size) {
|
| + // If we are in virtual reality, no surface view is needed so just return.
|
| + // TODO(http://crbug.com/673886): Support overlay surfaces in VR using GVR
|
| + // reprojection video surface.
|
| + RenderWidgetHostViewBase * rwhvb =
|
| + static_cast<RenderWidgetHostViewBase*>(render_frame_host_->GetView());
|
| + if (rwhvb->IsInVR()) {
|
| + SendSurfaceID(media::SurfaceManager::kNoSurfaceID);
|
| + return;
|
| + }
|
| +
|
| // It's valid to get this call if we already own the fullscreen view. We just
|
| // return the existing surface id.
|
| if (content_video_view_) {
|
| @@ -84,8 +94,10 @@ void BrowserSurfaceViewManager::OnCreateFullscreenSurface(
|
|
|
| WebContents* web_contents =
|
| WebContents::FromRenderFrameHost(render_frame_host_);
|
| - if (!web_contents->GetDelegate())
|
| + if (!web_contents->GetDelegate()) {
|
| + SendSurfaceID(media::SurfaceManager::kNoSurfaceID);
|
| return;
|
| + }
|
| ContentViewCore* cvc = ContentViewCore::FromWebContents(web_contents);
|
| content_video_view_.reset(
|
| new ContentVideoView(this, cvc,
|
|
|