Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(779)

Unified Diff: content/browser/media/android/browser_surface_view_manager.cc

Issue 2643893002: Skip video overlay surface management when in VR. (Closed)
Patch Set: Also send back no surface id when there is no web contents delegate. Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..c3919325f52e676518de4285c92f8da7c2e493b8 100644
--- a/content/browser/media/android/browser_surface_view_manager.cc
+++ b/content/browser/media/android/browser_surface_view_manager.cc
@@ -63,6 +63,14 @@ 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.
+ if (render_frame_host_->GetView()->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 +92,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,

Powered by Google App Engine
This is Rietveld 408576698