Support rendering Android Native Pages in VR Shell.

chrome/browser/android/vr_shell/vr_shell_gl.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 "chrome/browser/android/vr_shell/vr_shell_gl.h"
 
 #include <limits>
 #include <utility>
 
 #include "base/android/jni_android.h"
@@ skipping 224 matching lines @@
     ForceExitVr();
     return;
   }
 
   unsigned int textures[2];
   glGenTextures(2, textures);
   ui_texture_id_ = textures[0];
   content_texture_id_ = textures[1];
   ui_surface_texture_ = gl::SurfaceTexture::Create(ui_texture_id_);
   content_surface_texture_ = gl::SurfaceTexture::Create(content_texture_id_);
-  ui_surface_.reset(new gl::ScopedJavaSurface(ui_surface_texture_.get()));
-  content_surface_.reset(new gl::ScopedJavaSurface(
-      content_surface_texture_.get()));
+  CreateUiSurface();
+  CreateContentSurface();
   ui_surface_texture_->SetFrameAvailableCallback(base::Bind(
-        &VrShellGl::OnUIFrameAvailable, weak_ptr_factory_.GetWeakPtr()));
+      &VrShellGl::OnUIFrameAvailable, weak_ptr_factory_.GetWeakPtr()));
   content_surface_texture_->SetFrameAvailableCallback(base::Bind(
         &VrShellGl::OnContentFrameAvailable, weak_ptr_factory_.GetWeakPtr()));
-
   content_surface_texture_->SetDefaultBufferSize(
       content_tex_physical_size_.width, content_tex_physical_size_.height);
   ui_surface_texture_->SetDefaultBufferSize(ui_tex_physical_size_.width,
                                             ui_tex_physical_size_.height);
-
-  main_thread_task_runner_->PostTask(FROM_HERE, base::Bind(
-      &VrShell::SurfacesChanged, weak_vr_shell_,
-      content_surface_->j_surface().obj(),
-      ui_surface_->j_surface().obj()));
-
   InitializeRenderer();
 
   vsync_task_.Reset(base::Bind(&VrShellGl::OnVSync, base::Unretained(this)));
   OnVSync();
 
   ready_to_draw_ = true;
 }
 
+void VrShellGl::CreateContentSurface() {
+  content_surface_ =
+      base::MakeUnique<gl::ScopedJavaSurface>(content_surface_texture_.get());
+  main_thread_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&VrShell::ContentSurfaceChanged, weak_vr_shell_,
+                            content_surface_->j_surface().obj()));
+}
+
+void VrShellGl::CreateUiSurface() {
+  ui_surface_ =
+      base::MakeUnique<gl::ScopedJavaSurface>(ui_surface_texture_.get());
+  main_thread_task_runner_->PostTask(
+      FROM_HERE, base::Bind(&VrShell::UiSurfaceChanged, weak_vr_shell_,
+                            ui_surface_->j_surface().obj()));
+}
+
 void VrShellGl::OnUIFrameAvailable() {
   ui_surface_texture_->UpdateTexImage();
 }
 
 void VrShellGl::OnContentFrameAvailable() {
   content_surface_texture_->UpdateTexImage();
   received_frame_ = true;
 }
 
 bool VrShellGl::GetPixelEncodedFrameIndex(uint16_t* frame_index) {
@@ skipping 803 matching lines @@
     const base::Callback<void(device::mojom::VRDisplayInfoPtr)>& callback,
     uint32_t device_id) {
   device::mojom::VRDisplayInfoPtr info = VrShell::CreateVRDisplayInfo(
       gvr_api_.get(), content_tex_physical_size_, device_id);
   main_thread_task_runner_->PostTask(
       FROM_HERE,
       base::Bind(&RunVRDisplayInfoCallback, callback, base::Passed(&info)));
 }
 
 }  // namespace vr_shell