Revert "[vr] Implement controller quiescence"

This reverts commit 820c5377.

Reason for revert: Appears to have caused a performance regression.

Original change's description:
> [vr] Implement controller quiescence
>
> When the controller is inactive, we should fade it out.
>
> Also includes some minor changes in VrShellGl to reuse
> the current time rather than recomputing it.
>
> Bug: 776521
> Change-Id: I5ce7708b3eddc04b9ad65d176eb544be7446cbca
> Reviewed-on: https://chromium-review.googlesource.com/752344
> Reviewed-by: Christopher Grant <cjgrant@chromium.org>
> Commit-Queue: Ian Vollick <vollick@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#513937}

TBR=vollick@chromium.org,mthiesse@chromium.org,cjgrant@chromium.org

Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
Change-Id: Ibccc146d4af04cffdff14a8af9ba74e34fd19b2c
Reviewed-on: https://chromium-review.googlesource.com/764671
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#515829}

chrome/browser/android/vr_shell/vr_shell_gl.cc

@@ -414,7 +414,7 @@ void VrShellGl::OnWebVRFrameAvailable() {
 
   ui_->OnWebVrFrameAvailable();
 
-  DrawFrame(frame_index, base::TimeTicks::Now());
+  DrawFrame(frame_index);
   if (web_vr_mode_)
     ++webvr_frames_received_;
   ScheduleOrCancelWebVrFrameTimeout();
@@ -543,8 +543,7 @@ void VrShellGl::InitializeRenderer() {
   browser_->GvrDelegateReady(gvr_api_->GetViewerType());
 }
 
-void VrShellGl::UpdateController(const gfx::Transform& head_pose,
-                                 base::TimeTicks current_time) {
+void VrShellGl::UpdateController(const gfx::Transform& head_pose) {
   TRACE_EVENT0("gpu", "VrShellGl::UpdateController");
   gvr::Mat4f gvr_head_pose;
   TransformToGvrMat(head_pose, &gvr_head_pose);
@@ -556,13 +555,11 @@ void VrShellGl::UpdateController(const gfx::Transform& head_pose,
     controller_data.connected = false;
   browser_->UpdateGamepadData(controller_data);
 
-  HandleControllerInput(laser_origin, vr::GetForwardVector(head_pose),
-                        current_time);
+  HandleControllerInput(laser_origin, vr::GetForwardVector(head_pose));
 }
 
 void VrShellGl::HandleControllerInput(const gfx::Point3F& laser_origin,
-                                      const gfx::Vector3dF& head_direction,
-                                      base::TimeTicks current_time) {
+                                      const gfx::Vector3dF& head_direction) {
   if (is_exiting_) {
     // When we're exiting, we don't show the reticle and the only input
     // processing we do is to handle immediate exits.
@@ -616,8 +613,8 @@ void VrShellGl::HandleControllerInput(const gfx::Point3F& laser_origin,
   controller_model.laser_origin = laser_origin;
 
   vr::ReticleModel reticle_model;
-  ui_->input_manager()->HandleInput(current_time, controller_model,
-                                    &reticle_model, &gesture_list);
+  ui_->input_manager()->HandleInput(controller_model, &reticle_model,
+                                    &gesture_list);
   ui_->OnControllerUpdated(controller_model, reticle_model);
 }
 
@@ -763,14 +760,16 @@ void VrShellGl::UpdateEyeInfos(const gfx::Transform& head_pose,
   }
 }
 
-void VrShellGl::DrawFrame(int16_t frame_index, base::TimeTicks current_time) {
+void VrShellGl::DrawFrame(int16_t frame_index) {
   TRACE_EVENT1("gpu", "VrShellGl::DrawFrame", "frame", frame_index);
   if (!webvr_delayed_frame_submit_.IsCancelled()) {
     webvr_delayed_frame_submit_.Cancel();
-    DrawIntoAcquiredFrame(frame_index, current_time);
+    DrawIntoAcquiredFrame(frame_index);
     return;
   }
 
+  base::TimeTicks current_time = base::TimeTicks::Now();
+
   CHECK(!acquired_frame_);
 
   // Reset the viewport list to just the pair of viewports for the
@@ -827,17 +826,18 @@ void VrShellGl::DrawFrame(int16_t frame_index, base::TimeTicks current_time) {
 
   // WebVR handles controller input in OnVsync.
   if (!ShouldDrawWebVr())
-    UpdateController(render_info_primary_.head_pose, current_time);
+    UpdateController(render_info_primary_.head_pose);
 
   bool textures_changed = ui_->scene()->UpdateTextures();
 
-  // TODO(mthiesse): Determine if a visible controller is actually drawn in the
-  // viewport.
-  bool controller_dirty = ui_->IsControllerVisible();
+  // TODO(mthiesse): For now, just pretend the controller isn't dirty, even
+  // though it is, so that we can measure/test this rendering path that avoids
+  // redaws. This is fine because this is still behind a flag.
+  static bool controller_dirty_ = false;
 
   // TODO(mthiesse): Refine this notion of when we need to redraw. If only a
   // portion of the screen is dirtied, we can update just redraw that portion.
-  bool redraw_needed = controller_dirty || scene_changed || textures_changed ||
+  bool redraw_needed = controller_dirty_ || scene_changed || textures_changed ||
                        content_frame_available_;
 
   bool head_moved = vr::HeadMoveExceedsThreshold(last_used_head_pose_,
@@ -855,11 +855,10 @@ void VrShellGl::DrawFrame(int16_t frame_index, base::TimeTicks current_time) {
   if (!acquired_frame_)
     return;
 
-  DrawIntoAcquiredFrame(frame_index, current_time);
+  DrawIntoAcquiredFrame(frame_index);
 }
 
-void VrShellGl::DrawIntoAcquiredFrame(int16_t frame_index,
-                                      base::TimeTicks current_time) {
+void VrShellGl::DrawIntoAcquiredFrame(int16_t frame_index) {
   TRACE_EVENT1("gpu", "VrShellGl::DrawIntoAcquiredFrame", "frame", frame_index);
 
   last_used_head_pose_ = render_info_primary_.head_pose;
@@ -1150,9 +1149,9 @@ void VrShellGl::OnVSync(base::TimeTicks frame_time) {
     // DrawFrame.
     gfx::Transform head_pose;
     device::GvrDelegate::GetGvrPoseWithNeckModel(gvr_api_.get(), &head_pose);
-    UpdateController(head_pose, frame_time);
+    UpdateController(head_pose);
   } else {
-    DrawFrame(-1, frame_time);
+    DrawFrame(-1);
   }
 }
 

chrome/browser/android/vr_shell/vr_shell_gl.h

@@ -19,7 +19,6 @@
 #include "chrome/browser/android/vr_shell/vr_controller.h"
 #include "chrome/browser/vr/content_input_delegate.h"
 #include "chrome/browser/vr/controller_mesh.h"
-#include "chrome/browser/vr/model/controller_model.h"
 #include "chrome/browser/vr/ui_input_manager.h"
 #include "chrome/browser/vr/ui_renderer.h"
 #include "device/vr/vr_service.mojom.h"
@@ -122,8 +121,8 @@ class VrShellGl : public device::mojom::VRPresentationProvider {
                       int viewport_offset,
                       const gfx::Size& render_size,
                       vr::RenderInfo* out_render_info);
-  void DrawFrame(int16_t frame_index, base::TimeTicks current_time);
-  void DrawIntoAcquiredFrame(int16_t frame_index, base::TimeTicks current_time);
+  void DrawFrame(int16_t frame_index);
+  void DrawIntoAcquiredFrame(int16_t frame_index);
   void DrawFrameSubmitWhenReady(int16_t frame_index,
                                 const gfx::Transform& head_pose,
                                 std::unique_ptr<gl::GLFenceEGL> fence);
@@ -132,13 +131,11 @@ class VrShellGl : public device::mojom::VRPresentationProvider {
   void DrawWebVr();
   bool WebVrPoseByteIsValid(int pose_index_byte);
 
-  void UpdateController(const gfx::Transform& head_pose,
-                        base::TimeTicks current_time);
+  void UpdateController(const gfx::Transform& head_pose);
 
   void SendImmediateExitRequestIfNecessary();
   void HandleControllerInput(const gfx::Point3F& laser_origin,
-                             const gfx::Vector3dF& head_direction,
-                             base::TimeTicks current_time);
+                             const gfx::Vector3dF& head_direction);
   void HandleControllerAppButtonActivity(
       const gfx::Vector3dF& controller_direction);
 

chrome/browser/vr/elements/ui_element_name.cc

@@ -21,7 +21,6 @@ static const char* g_ui_element_name_strings[] = {
     "kWebVrRoot",
     "kWebVrViewportAwareRoot",
     "kContentQuad",
-    "kControllerRoot",
     "kControllerGroup",
     "kLaser",
     "kController",

chrome/browser/vr/elements/ui_element_name.h

@@ -21,7 +21,6 @@ enum UiElementName {
   kWebVrRoot,
   kWebVrViewportAwareRoot,
   kContentQuad,
-  kControllerRoot,
   kControllerGroup,
   kLaser,
   kController,

chrome/browser/vr/model/controller_model.h

@@ -23,7 +23,6 @@ struct ControllerModel {
   UiInputManager::ButtonState app_button_state = UiInputManager::UP;
   UiInputManager::ButtonState home_button_state = UiInputManager::UP;
   float opacity = 1.0f;
-  bool quiescent = false;
 };
 
 }  // namespace vr

chrome/browser/vr/test/ui_pixel_test.cc

@@ -8,7 +8,6 @@
 #include "build/build_config.h"
 #include "chrome/browser/vr/browser_ui_interface.h"
 #include "chrome/browser/vr/model/model.h"
-#include "chrome/browser/vr/test/animation_utils.h"
 #include "chrome/browser/vr/test/constants.h"
 #include "chrome/browser/vr/ui_browser_interface.h"
 #include "chrome/browser/vr/ui_input_manager.h"
@@ -96,8 +95,8 @@ void UiPixelTest::DrawUi(const gfx::Vector3dF& laser_direction,
       gfx::Vector3dF(-render_info.head_pose.matrix().get(2, 0),
                      -render_info.head_pose.matrix().get(2, 1),
                      -render_info.head_pose.matrix().get(2, 2))));
-  ui_->input_manager()->HandleInput(MsToTicks(1), controller_model,
-                                    &reticle_model, &gesture_list);
+  ui_->input_manager()->HandleInput(controller_model, &reticle_model,
+                                    &gesture_list);
   ui_->OnControllerUpdated(controller_model, reticle_model);
   ui_->ui_renderer()->Draw(render_info);
 

chrome/browser/vr/testapp/vr_test_context.cc

@@ -223,8 +223,8 @@ ControllerModel VrTestContext::UpdateController() {
   // Hit testing is done in terms of this synthesized controller model.
   GestureList gesture_list;
   ReticleModel reticle_model;
-  ui_->input_manager()->HandleInput(base::TimeTicks::Now(), controller_model,
-                                    &reticle_model, &gesture_list);
+  ui_->input_manager()->HandleInput(controller_model, &reticle_model,
+                                    &gesture_list);
 
   // Now that we have accurate hit information, we use this to construct a
   // controller model for display.

chrome/browser/vr/testapp/vr_test_context.h

@@ -10,7 +10,6 @@
 #include <cstdint>
 
 #include "chrome/browser/vr/content_input_delegate.h"
-#include "chrome/browser/vr/model/controller_model.h"
 #include "chrome/browser/vr/ui_browser_interface.h"
 #include "ui/gfx/transform.h"
 
@@ -67,8 +66,6 @@ class VrTestContext : public vr::UiBrowserInterface {
   bool fullscreen_ = false;
   bool incognito_ = false;
 
-  ControllerModel last_controller_model_;
-
   DISALLOW_COPY_AND_ASSIGN(VrTestContext);
 };
 

chrome/browser/vr/ui.cc

@@ -161,7 +161,6 @@ void Ui::OnControllerUpdated(const ControllerModel& controller_model,
                              const ReticleModel& reticle_model) {
   model_->controller = controller_model;
   model_->reticle = reticle_model;
-  model_->controller.quiescent = input_manager_->controller_quiescent();
 }
 
 void Ui::OnProjMatrixChanged(const gfx::Transform& proj_matrix) {

chrome/browser/vr/ui_input_manager.cc

@@ -24,9 +24,6 @@ static constexpr gfx::PointF kInvalidTargetPoint =
                 std::numeric_limits<float>::max());
 static constexpr gfx::Point3F kOrigin = {0.0f, 0.0f, 0.0f};
 
-static constexpr float kControllerQuiescenceAngularThresholdDegrees = 3.5f;
-static constexpr float kControllerQuiescenceTemporalThresholdSeconds = 1.2f;
-
 gfx::Point3F GetRayPoint(const gfx::Point3F& rayOrigin,
                          const gfx::Vector3dF& rayVector,
                          float scale) {
@@ -111,11 +108,9 @@ UiInputManager::UiInputManager(UiScene* scene) : scene_(scene) {}
 
 UiInputManager::~UiInputManager() {}
 
-void UiInputManager::HandleInput(base::TimeTicks current_time,
-                                 const ControllerModel& controller_model,
+void UiInputManager::HandleInput(const ControllerModel& controller_model,
                                  ReticleModel* reticle_model,
                                  GestureList* gesture_list) {
-  UpdateQuiescenceState(current_time, controller_model);
   gfx::Vector3dF eye_to_target;
   reticle_model->target_element_id = 0;
   reticle_model->target_local_point = kInvalidTargetPoint;
@@ -412,34 +407,4 @@ void UiInputManager::GetVisualTargetElement(
                   &closest_element_distance);
 }
 
-void UiInputManager::UpdateQuiescenceState(
-    base::TimeTicks current_time,
-    const ControllerModel& controller_model) {
-  // Update quiescence state.
-  gfx::Point3F old_position;
-  gfx::Point3F old_forward_position(0, 0, -1);
-  last_significant_controller_transform_.TransformPoint(&old_position);
-  last_significant_controller_transform_.TransformPoint(&old_forward_position);
-  gfx::Vector3dF old_forward = old_forward_position - old_position;
-  old_forward.GetNormalized(&old_forward);
-  gfx::Point3F new_position;
-  gfx::Point3F new_forward_position(0, 0, -1);
-  controller_model.transform.TransformPoint(&new_position);
-  controller_model.transform.TransformPoint(&new_forward_position);
-  gfx::Vector3dF new_forward = new_forward_position - new_position;
-  new_forward.GetNormalized(&new_forward);
-
-  float angle = AngleBetweenVectorsInDegrees(old_forward, new_forward);
-  if (angle > kControllerQuiescenceAngularThresholdDegrees || in_click_ ||
-      in_scroll_) {
-    controller_quiescent_ = false;
-    last_significant_controller_transform_ = controller_model.transform;
-    last_significant_controller_update_time_ = current_time;
-  } else if ((current_time - last_significant_controller_update_time_)
-                 .InSecondsF() >
-             kControllerQuiescenceTemporalThresholdSeconds) {
-    controller_quiescent_ = true;
-  }
-}
-
 }  // namespace vr

chrome/browser/vr/ui_input_manager.h

@@ -8,11 +8,9 @@
 #include <memory>
 #include <vector>
 
-#include "base/time/time.h"
 #include "ui/gfx/geometry/point3_f.h"
 #include "ui/gfx/geometry/point_f.h"
 #include "ui/gfx/geometry/vector3d_f.h"
-#include "ui/gfx/transform.h"
 
 namespace blink {
 class WebGestureEvent;
@@ -40,13 +38,10 @@ class UiInputManager {
   explicit UiInputManager(UiScene* scene);
   ~UiInputManager();
   // TODO(tiborg): Use generic gesture type instead of blink::WebGestureEvent.
-  void HandleInput(base::TimeTicks current_time,
-                   const ControllerModel& controller_model,
+  void HandleInput(const ControllerModel& controller_model,
                    ReticleModel* reticle_model,
                    GestureList* gesture_list);
 
-  bool controller_quiescent() const { return controller_quiescent_; }
-
  private:
   void SendFlingCancel(GestureList* gesture_list,
                        const gfx::PointF& target_point);
@@ -70,8 +65,6 @@ class UiInputManager {
   void GetVisualTargetElement(const ControllerModel& controller_model,
                               ReticleModel* reticle_model,
                               gfx::Vector3dF* out_eye_to_target) const;
-  void UpdateQuiescenceState(base::TimeTicks current_time,
-                             const ControllerModel& controller_model);
 
   UiScene* scene_;
   int hover_target_id_ = 0;
@@ -84,10 +77,6 @@ class UiInputManager {
   bool in_scroll_ = false;
 
   ButtonState previous_button_state_ = ButtonState::UP;
-
-  base::TimeTicks last_significant_controller_update_time_;
-  gfx::Transform last_significant_controller_transform_;
-  bool controller_quiescent_ = false;
 };
 
 }  // namespace vr

chrome/browser/vr/ui_input_manager_unittest.cc

@@ -75,7 +75,7 @@ class UiInputManagerTest : public testing::Test {
     controller_model.touchpad_button_state = button_state;
     ReticleModel reticle_model;
     GestureList gesture_list;
-    input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
+    input_manager_->HandleInput(controller_model, &reticle_model,
                                 &gesture_list);
   }
 
@@ -113,13 +113,11 @@ TEST_F(UiInputManagerTest, ReticleRenderTarget) {
   ReticleModel reticle_model;
   GestureList gesture_list;
 
-  input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
-                              &gesture_list);
+  input_manager_->HandleInput(controller_model, &reticle_model, &gesture_list);
   EXPECT_EQ(0, reticle_model.target_element_id);
 
   controller_model.laser_direction = kForwardVector;
-  input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
-                              &gesture_list);
+  input_manager_->HandleInput(controller_model, &reticle_model, &gesture_list);
   EXPECT_EQ(p_element->id(), reticle_model.target_element_id);
   EXPECT_NEAR(-1.0, reticle_model.target_point.z(), kEpsilon);
 }
@@ -249,8 +247,7 @@ TEST_F(UiInputManagerContentTest, NoMouseMovesDuringClick) {
   controller_model.touchpad_button_state = UiInputManager::ButtonState::DOWN;
   ReticleModel reticle_model;
   GestureList gesture_list;
-  input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
-                              &gesture_list);
+  input_manager_->HandleInput(controller_model, &reticle_model, &gesture_list);
 
   // We should have hit the content quad if our math was correct.
   ASSERT_NE(0, reticle_model.target_element_id);
@@ -261,8 +258,7 @@ TEST_F(UiInputManagerContentTest, NoMouseMovesDuringClick) {
   // set the expected number of calls to zero.
   EXPECT_CALL(*content_input_delegate_, OnContentMove(testing::_)).Times(0);
 
-  input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
-                              &gesture_list);
+  input_manager_->HandleInput(controller_model, &reticle_model, &gesture_list);
 }
 
 TEST_F(UiInputManagerContentTest, ExitPromptHitTesting) {
@@ -281,8 +277,7 @@ TEST_F(UiInputManagerContentTest, ExitPromptHitTesting) {
   controller_model.touchpad_button_state = UiInputManager::ButtonState::DOWN;
   ReticleModel reticle_model;
   GestureList gesture_list;
-  input_manager_->HandleInput(MsToTicks(1), controller_model, &reticle_model,
-                              &gesture_list);
+  input_manager_->HandleInput(controller_model, &reticle_model, &gesture_list);
 
   // We should have hit the exit prompt if our math was correct.
   ASSERT_NE(0, reticle_model.target_element_id);

chrome/browser/vr/ui_scene_constants.h

@@ -195,9 +195,6 @@ static constexpr float kSuggestionTextFieldWidth = 0.3f;
 static constexpr float kSuggestionContentTextHeight = 0.02f;
 static constexpr float kSuggestionDescriptionTextHeight = 0.015f;
 
-static constexpr int kControllerFadeInMs = 200;
-static constexpr int kControllerFadeOutMs = 550;
-
 static constexpr float kSpeechRecognitionResultTextYOffset = 0.5f;
 static constexpr int kSpeechRecognitionResultTimeoutSeconds = 2;
 

chrome/browser/vr/ui_scene_manager.cc

@@ -719,37 +719,20 @@ void UiSceneManager::CreateVoiceSearchUiGroup(Model* model) {
 }
 
 void UiSceneManager::CreateController(Model* model) {
-  auto root = base::MakeUnique<UiElement>();
-  root->set_name(kControllerRoot);
-  root->SetVisible(true);
-  root->set_hit_testable(false);
-  root->AddBinding(base::MakeUnique<Binding<bool>>(
-      base::Bind(
-          [](Model* m, UiSceneManager* mgr) {
-            return mgr->browsing_mode() ||
-                   m->web_vr_timeout_state == kWebVrTimedOut;
-          },
-          base::Unretained(model), base::Unretained(this)),
-      base::Bind([](UiElement* v, const bool& b) { v->SetVisible(b); },
-                 base::Unretained(root.get()))));
-  scene_->AddUiElement(kRoot, std::move(root));
-
   auto group = base::MakeUnique<UiElement>();
   group->set_name(kControllerGroup);
   group->SetVisible(true);
   group->set_hit_testable(false);
-  group->SetTransitionedProperties({OPACITY});
   group->AddBinding(base::MakeUnique<Binding<bool>>(
-      base::Bind([](Model* m) { return !m->controller.quiescent; },
-                 base::Unretained(model)),
       base::Bind(
-          [](UiElement* e, const bool& visible) {
-            e->SetTransitionDuration(base::TimeDelta::FromMilliseconds(
-                visible ? kControllerFadeInMs : kControllerFadeOutMs));
-            e->SetVisible(visible);
+          [](Model* m, UiSceneManager* mgr) {
+            return mgr->browsing_mode() ||
+                   m->web_vr_timeout_state == kWebVrTimedOut;
           },
-          base::Unretained(group.get()))));
-  scene_->AddUiElement(kControllerRoot, std::move(group));
+          base::Unretained(model), base::Unretained(this)),
+      base::Bind([](UiElement* v, const bool& b) { v->SetVisible(b); },
+                 base::Unretained(group.get()))));
+  scene_->AddUiElement(kRoot, std::move(group));
 
   auto controller = base::MakeUnique<Controller>();
   controller->set_draw_phase(kPhaseForeground);

chrome/browser/vr/ui_scene_manager_unittest.cc

@@ -779,24 +779,6 @@ TEST_F(UiSceneManagerTest, OmniboxSuggestionBindings) {
   EXPECT_EQ(NumVisibleChildren(kSuggestionLayout), initially_visible);
 }
 
-TEST_F(UiSceneManagerTest, ControllerQuiescence) {
-  MakeManager(kNotInCct, kNotInWebVr);
-  OnBeginFrame();
-  EXPECT_TRUE(IsVisible(kControllerGroup));
-  model_->controller.quiescent = true;
-  EXPECT_TRUE(AnimateBy(MsToDelta(500)));
-  EXPECT_TRUE(IsVisible(kControllerGroup));
-  EXPECT_TRUE(AnimateBy(MsToDelta(100)));
-  EXPECT_FALSE(IsVisible(kControllerGroup));
-
-  UiElement* controller_group = scene_->GetUiElementByName(kControllerGroup);
-  model_->controller.quiescent = false;
-  EXPECT_TRUE(AnimateBy(MsToDelta(100)));
-  EXPECT_GT(1.0f, controller_group->computed_opacity());
-  EXPECT_TRUE(AnimateBy(MsToDelta(150)));
-  EXPECT_EQ(1.0f, controller_group->computed_opacity());
-}
-
 TEST_F(UiSceneManagerTest, CloseButtonColorBindings) {
   MakeManager(kInCct, kNotInWebVr);
   EXPECT_TRUE(IsVisible(kCloseButton));