Skip video overlay surface management when in VR.

content/browser/media/android/browser_surface_view_manager.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/media/android/browser_surface_view_manager.h"
 
 #include "base/android/build_info.h"
 #include "base/trace_event/trace_event.h"
 #include "content/browser/android/content_view_core_impl.h"
 #include "content/browser/gpu/gpu_process_host.h"
@@ skipping 45 matching lines @@
   }
 }
 
 void BrowserSurfaceViewManager::DidExitFullscreen(bool release_media_player) {
   DVLOG(3) << __func__;
   content_video_view_.reset();
 }
 
 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_) {
     // Send the surface now if we have it. Otherwise it will be returned by
     // |SetVideoSurface|.
     if (surface_id_ != media::SurfaceManager::kNoSurfaceID) {
       SendSurfaceID(surface_id_);
       OnNaturalSizeChanged(video_natural_size);
       return;
     }
   }
 
   // If we don't own the fullscreen view, but one exists, it means another
   // WebContents has it. Ignore this request and return a null surface id.
   if (ContentVideoView::GetInstance()) {
     SendSurfaceID(media::SurfaceManager::kNoSurfaceID);
     return;
   }
 
   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,
           web_contents->GetDelegate()->GetContentVideoViewEmbedder(),
           video_natural_size));
 }
 
 void BrowserSurfaceViewManager::OnNaturalSizeChanged(const gfx::Size& size) {
   if (content_video_view_)
     content_video_view_->OnVideoSizeChanged(size.width(), size.height());
@@ skipping 13 matching lines @@
           BrowserThread::IO, FROM_HERE,
           base::Bind(&SendDestroyingVideoSurfaceOnIO, surface_id,
                      base::Bind(&base::WaitableEvent::Signal,
                                 base::Unretained(&waiter))))) {
     base::ThreadRestrictions::ScopedAllowWait allow_wait;
     waiter.Wait();
   }
 }
 
 }  // namespace content