Switch WebVR to handle GvrApi management through VrShellDelegate

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_gl_util.h"
 #include "chrome/browser/android/vr_shell/vr_math.h"
+#include "chrome/browser/android/vr_shell/vr_shell_delegate.h"
 #include "chrome/browser/android/vr_shell/vr_shell_renderer.h"
 #include "jni/VrShell_jni.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;
 static constexpr float kZFar = 1000.0f;
 
 static constexpr gvr::Vec3f kDesktopPositionDefault = {0.0f, 0.0f, -2.0f};
 static constexpr float kDesktopHeightDefault = 1.6f;
 
 // Screen angle in degrees. 0 = vertical, positive = top closer.
 static constexpr float kDesktopScreenTiltDefault = 0;
 
 static constexpr float kScreenHeightMeters = 2.0f;
 static constexpr float kScreenWidthMeters = 2.0f;
 }  // namespace
 
 namespace vr_shell {
 
 VrShell::VrShell(JNIEnv* env, jobject obj)
     : desktop_screen_tilt_(kDesktopScreenTiltDefault),
       desktop_height_(kDesktopHeightDefault),
-      desktop_position_(kDesktopPositionDefault) {
+      desktop_position_(kDesktopPositionDefault),
+      delegate_(nullptr) {
   j_vr_shell_.Reset(env, obj);
   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}};
 }
 
 void VrShell::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
   gl::init::ClearGLBindings();
 }
 
 bool RegisterVrShell(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 VrShell::~VrShell() {
-  device::GvrDelegateManager::GetInstance()->Shutdown();
+}
+
+void VrShell::SetDelegate(JNIEnv* env,
+                          const base::android::JavaParamRef<jobject>& obj,
+                          jlong native_delegate) {
+  delegate_ = reinterpret_cast<VrShellDelegate*>(native_delegate);
 }
 
 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);
+  if (delegate_)
+    delegate_->OnVrShellReady(this);
 }
 
 void VrShell::InitializeGl(JNIEnv* env,
                            const JavaParamRef<jobject>& obj,
                            jint texture_data_handle) {
   CHECK(gl::GetGLImplementation() != gl::kGLImplementationNone ||
         gl::init::InitializeGLOneOff());
 
   content_texture_id_ = texture_data_handle;
   gvr_api_->InitializeGl();
@@ skipping 158 matching lines @@
 }
 
 void VrShell::OnResume(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   if (gvr_api_ == nullptr)
     return;
 
   gvr_api_->RefreshViewerProfile();
   gvr_api_->ResumeTracking();
 }
 
-void VrShell::RequestWebVRPresent() {
-  webvr_mode_ = true;
-}
-
-void VrShell::ExitWebVRPresent() {
-  webvr_mode_ = false;
+void VrShell::SetWebVrMode(JNIEnv* env,
+                           const base::android::JavaParamRef<jobject>& obj,
+                           bool enabled) {
+  webvr_mode_ = enabled;
 }
 
 void VrShell::SubmitWebVRFrame() {
 }
 
 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);
 }
@@ skipping 50 matching lines @@
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
 jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   return reinterpret_cast<intptr_t>(new VrShell(env, obj));
 }
 
 }  // namespace vr_shell