VrShell: implement insecure content warning display

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/ui_scene.h"
 #include "chrome/browser/android/vr_shell/vr_compositor.h"
@@ skipping 49 matching lines @@
 // TODO(mthiesse): Handedness options.
 static constexpr gvr::Vec3f kHandPosition = {0.2f, -0.5f, -0.2f};
 
 // Fraction of the z-distance to the object the cursor is drawn at to avoid
 // rounding errors drawing the cursor behind the object.
 static constexpr float kReticleZOffset = 0.99f;
 
 // UI element 0 is the browser content rectangle.
 static constexpr int kBrowserUiElementId = 0;
 
+// Positions and sizes of statically placed UI elements in the UI texture.
+// TODO(klausw): replace the hardcoded positions with JS position/offset
+// retrieval once the infrastructure for that is hooked up.
+static constexpr vr_shell::Recti kWebVrWarningTransientRect = {0, 0, 256, 128};
+static constexpr vr_shell::Recti kWebVrWarningPermanentRect = {256, 0, 128, 64};
+
 vr_shell::VrShell* g_instance;
 
 static const char kVrShellUIURL[] = "chrome://vr-shell-ui";
 
 }  // namespace
 
 namespace vr_shell {
 
 VrShell::VrShell(JNIEnv* env,
                  jobject obj,
@@ skipping 163 matching lines @@
   gvr::ClockTimePoint target_time = gvr::GvrApi::GetTimePointNow();
   target_time.monotonic_system_time_nanos += kPredictionTimeWithoutVsyncNanos;
   head_pose_ = gvr_api_->GetHeadSpaceFromStartSpaceRotation(target_time);
   head_pose_ = gvr_api_->ApplyNeckModel(head_pose_, 1.0f);
 
   // Bind back to the default framebuffer.
   frame.BindBuffer(0);
 
   if (webvr_mode_) {
     DrawWebVr();
+    if (!webvr_secure_origin_) {
+      DrawWebVrOverlay(target_time.monotonic_system_time_nanos);
+    }
   } else {
     DrawVrShell(target_time.monotonic_system_time_nanos);
   }
 
   frame.Unbind();
   frame.Submit(*buffer_viewport_list_, head_pose_);
 }
 
 void VrShell::DrawVrShell(int64_t time) {
   float screen_tilt = desktop_screen_tilt_ * M_PI / 180.0f;
@@ skipping 46 matching lines @@
   projection_matrix_ =
       PerspectiveMatrixFromView(params.GetSourceFov(), kZNear, kZFar);
 
   glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
   // TODO(mthiesse): Draw order for transparency.
   DrawUI();
   DrawCursor();
 }
 
+bool VrShell::IsUiTextureReady() {
+  return ui_tex_width_ > 0 && ui_tex_height_ > 0;
+}
+
+/**
+ * Converts a pixel rectangle to (0..1) float texture coordinates.
+ *
+ * Callers need to ensure that the texture width/height is initialized
+ * by checking IsUiTextureReady() first.
+ */
+Rectf VrShell::MakeUiPixelCopyRect(Recti pixel_rect) {
+  DCHECK(IsUiTextureReady());
+  Rectf copy_rect = {(float)pixel_rect.x / ui_tex_width_,

[cjgrant, 2016/09/28 17:48:04]

nits:
- Should use C++ casts as per style guide.
- Can probably lost the intermediate variable, return Rectf({...}), if you wish.

+                     (float)pixel_rect.y / ui_tex_height_,
+                     (float)pixel_rect.width / ui_tex_width_,
+                     (float)pixel_rect.height / ui_tex_height_};
+  return copy_rect;
+}
+
 void VrShell::DrawUI() {
   for (const auto& rect : scene_.GetUiElements()) {
     if (!rect->visible) {
       continue;
     }
 
     gvr::Mat4f combined_matrix = MatrixMul(view_matrix_,
                                            rect->transform.to_world);
     combined_matrix = MatrixMul(projection_matrix_, combined_matrix);
 
@@ skipping 69 matching lines @@
   glDisable(GL_DEPTH_TEST);
   glDisable(GL_SCISSOR_TEST);
   glDisable(GL_BLEND);
   glDisable(GL_POLYGON_OFFSET_FILL);
 
   // Don't need to clear, since we're drawing over the entire render target.
   glClear(GL_COLOR_BUFFER_BIT);
 
   glViewport(0, 0, render_size_.width, render_size_.height);
   vr_shell_renderer_->GetWebVrRenderer()->Draw(content_texture_id_);
+}
 
-  if (!webvr_secure_origin_) {
-    // TODO(klausw): Draw the insecure origin warning here.
+void VrShell::DrawWebVrOverlay(int64_t present_time_nanos) {
+  // Draw WebVR security warning overlays for each eye. This uses
+  // the eye-from-head matrices but not the pose, goal is to place
+  // the icons in an eye-relative position so that they follow along
+  // with head rotations.
+
+  gvr::Mat4f left_eye_view_matrix =
+      gvr_api_->GetEyeFromHeadMatrix(GVR_LEFT_EYE);
+  gvr::Mat4f right_eye_view_matrix =
+      gvr_api_->GetEyeFromHeadMatrix(GVR_RIGHT_EYE);
+
+  buffer_viewport_list_->GetBufferViewport(GVR_LEFT_EYE,
+                                           buffer_viewport_.get());
+  DrawWebVrEye(left_eye_view_matrix, *buffer_viewport_, present_time_nanos);
+  buffer_viewport_list_->GetBufferViewport(GVR_RIGHT_EYE,
+                                           buffer_viewport_.get());
+  DrawWebVrEye(right_eye_view_matrix, *buffer_viewport_, present_time_nanos);
+}
+
+void VrShell::DrawWebVrEye(const gvr::Mat4f& view_matrix,
+                           const gvr::BufferViewport& params,
+                           int64_t present_time_nanos) {
+  gvr::Recti pixel_rect =
+      CalculatePixelSpaceRect(render_size_, params.GetSourceUv());
+  glViewport(pixel_rect.left, pixel_rect.bottom,
+             pixel_rect.right - pixel_rect.left,
+             pixel_rect.top - pixel_rect.bottom);
+  glScissor(pixel_rect.left, pixel_rect.bottom,
+            pixel_rect.right - pixel_rect.left,
+            pixel_rect.top - pixel_rect.bottom);
+
+  gvr::Mat4f projection_matrix =
+      PerspectiveMatrixFromView(params.GetSourceFov(), kZNear, kZFar);
+
+  if (!IsUiTextureReady()) {
+    // If the UI texture hasn't been initialized yet, we can't draw the overlay.
+    return;
   }
+
+  // Draw insecure content warning icons.
+  const float warning_depth = 0.7f;  // Distance in meters.
+
+  // Show IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_PERMANENT text.
+  gvr::Mat4f icon_pos;
+  SetIdentityM(icon_pos);
+  const float small_icon_width = 2 * 0.15f * warning_depth;
+  const float small_icon_height = small_icon_width / 2.0f;  // 2:1 aspect.
+  const float small_icon_angle = 20.0f * M_PI / 180.f;  // Degrees to radians.
+  ScaleM(icon_pos, icon_pos, small_icon_width, small_icon_height, 1.0f);
+  TranslateM(icon_pos, icon_pos, 0.0f, 0.0f, -warning_depth);
+  icon_pos = MatrixMul(
+      QuatToMatrix(QuatFromAxisAngle(1.f, 0.f, 0.f, small_icon_angle)),
+      icon_pos);
+  gvr::Mat4f combined = MatrixMul(projection_matrix,
+                                  MatrixMul(view_matrix, icon_pos));
+  vr_shell_renderer_->GetTexturedQuadRenderer()->Draw(
+      ui_texture_id_, combined,
+      MakeUiPixelCopyRect(kWebVrWarningPermanentRect));

[cjgrant, 2016/09/28 17:48:04]

This isn't making a pixel copy-rect, it's making a GL copy-rect.  Shouldn't it
be MakeUiGlCopyRect?

+
+  // Check if we also need to show the transient warning.
+  if (present_time_nanos > webvr_warning_end_nanos_) {
+    return;
+  }
+
+  // Show IDS_WEBSITE_SETTINGS_INSECURE_WEBVR_CONTENT_TRANSIENT text.
+  SetIdentityM(icon_pos);
+  const float large_icon_width = 2 * 0.25f * warning_depth;
+  const float large_icon_height = large_icon_width / 2.0f;  // 2:1 aspect.
+  ScaleM(icon_pos, icon_pos, large_icon_width, large_icon_height, 1.0f);
+  TranslateM(icon_pos, icon_pos, 0.0f, 0.0f, -warning_depth);
+  combined = MatrixMul(projection_matrix,
+                       MatrixMul(view_matrix, icon_pos));
+  vr_shell_renderer_->GetTexturedQuadRenderer()->Draw(
+      ui_texture_id_, combined,
+      MakeUiPixelCopyRect(kWebVrWarningTransientRect));
+
 }
 
 void VrShell::OnPause(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   if (gvr_api_ == nullptr)
     return;
   gvr_api_->PauseTracking();
 }
 
 void VrShell::OnResume(JNIEnv* env, const JavaParamRef<jobject>& obj) {
   if (gvr_api_ == nullptr)
@@ skipping 18 matching lines @@
   // TODO(bshe): ui_text_width_ and ui_tex_height_ should be only used on render
   // thread.
   ui_tex_width_ = width;
   ui_tex_height_ = height;
 }
 
 void VrShell::SetWebVrMode(JNIEnv* env,
                            const base::android::JavaParamRef<jobject>& obj,
                            bool enabled) {
   webvr_mode_ = enabled;
+  if (enabled) {
+    const int64_t warning_seconds = 30;
+    int64_t now = gvr::GvrApi::GetTimePointNow().monotonic_system_time_nanos;
+    webvr_warning_end_nanos_ = now + warning_seconds * 1000 * 1000 * 1000;
+  } else {
+    webvr_warning_end_nanos_ = 0;
+  }
 }
 
 void VrShell::SetWebVRSecureOrigin(bool secure_origin) {
   webvr_secure_origin_ = secure_origin;
 }
 
 void VrShell::SubmitWebVRFrame() {
 }
 
 void VrShell::UpdateWebVRTextureBounds(
@@ skipping 36 matching lines @@
       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), ui_core,
       reinterpret_cast<ui::WindowAndroid*>(ui_window_android)));
 }
 
 }  // namespace vr_shell