Implement new compositor and ContentViewCore reparenting 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_shell_renderer.h"
 #include "chrome/browser/android/vr_shell/vr_util.h"
+#include "content/public/browser/android/content_view_core.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 "jni/VrShell_jni.h"
+#include "ui/android/view_android.h"
+#include "ui/android/window_android.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;
+static constexpr float kScreenHeightRatio = 1.0f;
+static constexpr float kScreenWidthRatio = 16.0f / 9.0f;
 }  // namespace
 
 namespace vr_shell {
 
-VrShell::VrShell(JNIEnv* env, jobject obj)
+VrShell::VrShell(JNIEnv* env, jobject obj,
+                 content::ContentViewCore* content_core,
+                 ui::WindowAndroid* content_view_core)

[amp, 2016/09/12 22:36:53]

Why is the WindowAndroid the content_view_core?  Isn't that the param above?

[mthiesse, 2016/09/13 19:04:04]

Whoops, typo.

     : desktop_screen_tilt_(kDesktopScreenTiltDefault),
       desktop_height_(kDesktopHeightDefault),
-      desktop_position_(kDesktopPositionDefault) {
+      desktop_position_(kDesktopPositionDefault),
+      content_cvc_(content_core) {
   j_vr_shell_.Reset(env, obj);
+  content_compositor_view_.reset(new VrCompositor(content_view_core));
   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();
+}
+
+void VrShell::UpdateCompositorLayers(JNIEnv* env,
+                                     const JavaParamRef<jobject>& obj) {
+  content_compositor_view_->SetLayer(content_cvc_);
 }
 
 void VrShell::Destroy(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   delete this;
   gl::init::ClearGLBindings();
 }
 
 bool RegisterVrShell(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
@@ skipping 73 matching lines @@
     DrawWebVr();
   } else {
     DrawVrShell();
   }
 
   frame.Unbind();
   frame.Submit(*buffer_viewport_list_, head_pose_);
 }
 
 void VrShell::DrawVrShell() {
-  float screen_width = kScreenWidthMeters * desktop_height_;
-  float screen_height = kScreenHeightMeters * desktop_height_;
+  float screen_width = kScreenWidthRatio * desktop_height_;
+  float screen_height = kScreenHeightRatio * desktop_height_;
 
   float screen_tilt = desktop_screen_tilt_ * M_PI / 180.0f;
 
   gvr::Vec3f headPos = getTranslation(head_pose_);
   if (headPos.x == 0.0f && headPos.y == 0.0f && headPos.z == 0.0f) {
     // This appears to be a 3DOF pose without a neck model. Add one.
     // The head pose has redundant data. Assume we're only using the
     // object_from_reference_matrix, we're not updating position_external.
     // TODO: Not sure what object_from_reference_matrix is. The new api removed
     // it. For now, removing it seems working fine.
@@ skipping 106 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);
+}
+
 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) {
       case XLEFT:
         x_anchor_translate = desktop_position_.x - screen_width_meters * 0.5;
@@ skipping 30 matching lines @@
     // TODO(cjgrant): Establish which exact rotations we'll provide.
     // Adjust for screen tilt.
     rect->transform.Rotate(1.0f, 0.0f, 0.0f, screen_tilt);
   }
 }
 
 // ----------------------------------------------------------------------------
 // Native JNI methods
 // ----------------------------------------------------------------------------
 
-jlong Init(JNIEnv* env, const JavaParamRef<jobject>& obj) {
-  return reinterpret_cast<intptr_t>(new VrShell(env, obj));
+jlong Init(JNIEnv* env,
+           const JavaParamRef<jobject>& obj,
+           const JavaParamRef<jobject>& content_web_contents,
+           jlong content_window_android) {
+  content::ContentViewCore* c_core = content::ContentViewCore::FromWebContents(
+      content::WebContents::FromJavaWebContents(content_web_contents));
+  return reinterpret_cast<intptr_t>(new VrShell(
+      env, obj, c_core,
+      reinterpret_cast<ui::WindowAndroid*>(content_window_android)));
 }
 
 }  // namespace vr_shell