Implement UI web contents for Vr Shell

chrome/browser/android/vr_shell/vr_shell.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.h"
 
 #include <thread>
 
 #include "chrome/browser/android/vr_shell/vr_compositor.h"
 #include "chrome/browser/android/vr_shell/vr_gl_util.h"
 #include "chrome/browser/android/vr_shell/vr_math.h"
 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h"
 #include "content/public/browser/android/content_view_core.h"
+#include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
+#include "content/public/common/referrer.h"
 #include "jni/VrShell_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
+#include "ui/base/page_transition_types.h"
 #include "ui/gl/gl_bindings.h"
 #include "ui/gl/init/gl_factory.h"
 
 using base::android::JavaParamRef;
 
 namespace {
 // Constant taken from treasure_hunt demo.
 static constexpr long kPredictionTimeWithoutVsyncNanos = 50000000;
 
 static constexpr float kZNear = 0.1f;
@@ skipping 18 matching lines @@
 // controller orientation is reset. This should match the yaw angle
 // where the main screen is placed.
 static constexpr gvr::Vec3f kNeutralPose = {0.0f, 0.0f, -1.0f};
 
 // In lieu of an elbow model, we assume a position for the user's hand.
 // TODO(mthiesse): Handedness options.
 static constexpr gvr::Vec3f kHandPosition = {0.2f, -0.5f, -0.2f};
 
 static constexpr float kReticleZOffset = 0.01f;
 
+static const char kVrShellUIURL[] = "chrome://vr-shell-ui";
+
 }  // namespace
 
 namespace vr_shell {
 
-VrShell::VrShell(JNIEnv* env, jobject obj,
-                 content::ContentViewCore* content_core,
-                 ui::WindowAndroid* content_window)
+VrShell::VrShell(JNIEnv* env,
+                 jobject obj,
+                 content::ContentViewCore* content_cvc,
+                 ui::WindowAndroid* content_window,
+                 content::ContentViewCore* ui_cvc,
+                 ui::WindowAndroid* ui_window)
     : desktop_screen_tilt_(kDesktopScreenTiltDefault),
       desktop_height_(kDesktopHeightDefault),
       desktop_position_(kDesktopPositionDefault),
-      content_cvc_(content_core) {
+      content_cvc_(content_cvc),
+      ui_cvc_(ui_cvc) {
   j_vr_shell_.Reset(env, obj);
-  content_compositor_view_.reset(new VrCompositor(content_window));
+  content_compositor_.reset(new VrCompositor(content_window));
+  ui_compositor_.reset(new VrCompositor(ui_window));
+
   ui_rects_.emplace_back(new ContentRectangle());
   desktop_plane_ = ui_rects_.back().get();
   desktop_plane_->id = 0;
   desktop_plane_->copy_rect = {0.0f, 0.0f, 1.0f, 1.0f};
   // TODO(cjgrant): If we use the native path for content clicks, fix this.
   desktop_plane_->window_rect = {0, 0, 0, 0};
   desktop_plane_->translation = {0.0f, 0.0f, 0.0f};
   desktop_plane_->x_anchoring = XNONE;
   desktop_plane_->y_anchoring = YNONE;
   desktop_plane_->anchor_z = false;
   desktop_plane_->orientation_axis_angle = {{1.0f, 0.0f, 0.0f, 0.0f}};
   desktop_plane_->rotation_axis_angle = {{0.0f, 0.0f, 0.0f, 0.0f}};
-  content_cvc_->GetWebContents()->GetRenderWidgetHostView()
-      ->GetRenderWidgetHost()->WasResized();
+
+  LoadUIContent();
 }
 
 void VrShell::UpdateCompositorLayers(JNIEnv* env,
                                      const JavaParamRef<jobject>& obj) {
-  content_compositor_view_->SetLayer(content_cvc_);
+  content_compositor_->SetLayer(content_cvc_);
+  ui_compositor_->SetLayer(ui_cvc_);
 }
 
 void VrShell::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
   gl::init::ClearGLBindings();
 }
 
+void VrShell::LoadUIContent() {
+  GURL url(kVrShellUIURL);
+  ui_cvc_->GetWebContents()->GetController().LoadURL(
+      url, content::Referrer(),
+      ui::PageTransition::PAGE_TRANSITION_AUTO_TOPLEVEL, std::string(""));
+}
+
 bool RegisterVrShell(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 VrShell::~VrShell() {
   device::GvrDelegateManager::GetInstance()->Shutdown();
 }
 
 void VrShell::GvrInit(JNIEnv* env,
                       const JavaParamRef<jobject>& obj,
                       jlong native_gvr_api) {
   gvr_api_ =
       gvr::GvrApi::WrapNonOwned(reinterpret_cast<gvr_context*>(native_gvr_api));
 
   device::GvrDelegateManager::GetInstance()->Initialize(this);
 }
 
 void VrShell::InitializeGl(JNIEnv* env,
                            const JavaParamRef<jobject>& obj,
-                           jint texture_data_handle) {
+                           jint content_texture_handle,
+                           jint ui_texture_handle) {
   CHECK(gl::GetGLImplementation() != gl::kGLImplementationNone ||
         gl::init::InitializeGLOneOff());
 
-  content_texture_id_ = texture_data_handle;
+  content_texture_id_ = content_texture_handle;
+  ui_texture_id_ = ui_texture_handle;
+
   gvr_api_->InitializeGl();
   std::vector<gvr::BufferSpec> specs;
   specs.push_back(gvr_api_->CreateBufferSpec());
   render_size_ = specs[0].GetSize();
   swap_chain_.reset(new gvr::SwapChain(gvr_api_->CreateSwapchain(specs)));
 
   desktop_plane_->content_texture_handle = content_texture_id_;
 
   vr_shell_renderer_.reset(new VrShellRenderer());
   buffer_viewport_list_.reset(
@@ skipping 265 matching lines @@
 void VrShell::UpdateWebVRTextureBounds(
     int eye, float left, float top, float width, float height) {
   gvr::Rectf bounds = { left, top, width, height };
   vr_shell_renderer_->GetWebVrRenderer()->UpdateTextureBounds(eye, bounds);
 }
 
 gvr::GvrApi* VrShell::gvr_api() {
   return gvr_api_.get();
 }
 
-void VrShell::ContentSurfaceDestroyed(JNIEnv* env,
-                                      const JavaParamRef<jobject>& object) {
-  content_compositor_view_->SurfaceDestroyed();
-}
-
 void VrShell::ContentSurfaceChanged(JNIEnv* env,
                                     const JavaParamRef<jobject>& object,
                                     jint width,
                                     jint height,
                                     const JavaParamRef<jobject>& surface) {
-  content_compositor_view_->SurfaceChanged((int)width, (int)height, surface);
+  content_compositor_->SurfaceChanged((int)width, (int)height, surface);
+}
+
+void VrShell::UiSurfaceChanged(JNIEnv* env,
+                               const JavaParamRef<jobject>& object,
+                               jint width,
+                               jint height,
+                               const JavaParamRef<jobject>& surface) {
+  ui_compositor_->SurfaceChanged((int)width, (int)height, surface);
 }
 
 void VrShell::UpdateTransforms(float screen_width_meters,
                                float screen_height_meters,
                                float screen_tilt) {
   for (std::unique_ptr<ContentRectangle>& rect : ui_rects_) {
     rect->transform.MakeIdentity();
     rect->transform.Scale(rect->size.x, rect->size.y, rect->size.z);
     float x_anchor_translate;
     switch (rect->x_anchoring) {
@@ skipping 35 matching lines @@
   }
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 jlong Init(JNIEnv* env,
            const JavaParamRef<jobject>& obj,
            const JavaParamRef<jobject>& content_web_contents,
-           jlong content_window_android) {
+           jlong content_window_android,
+           const JavaParamRef<jobject>& ui_web_contents,
+           jlong ui_window_android) {
   content::ContentViewCore* c_core = content::ContentViewCore::FromWebContents(
       content::WebContents::FromJavaWebContents(content_web_contents));
+  content::ContentViewCore* ui_core = content::ContentViewCore::FromWebContents(
+      content::WebContents::FromJavaWebContents(ui_web_contents));
   return reinterpret_cast<intptr_t>(new VrShell(
       env, obj, c_core,
-      reinterpret_cast<ui::WindowAndroid*>(content_window_android)));
+      reinterpret_cast<ui::WindowAndroid*>(content_window_android), ui_core,
+      reinterpret_cast<ui::WindowAndroid*>(ui_window_android)));
 }
 
 }  // namespace vr_shell