[vr] Do not reset content position or size when recentering

This allows minor alignment adjustments via recentering without
affecting the location or size of the content quad.

Bug: 853269
Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel
Change-Id: I3de1b8b727b9c50f60e3dfd791a7a991930f3012
Reviewed-on: https://chromium-review.googlesource.com/1102877
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Michael Thiessen <mthiesse@chromium.org>
Cr-Commit-Position: refs/heads/master@{#567757}

chrome/browser/vr/ui_scene_creator.cc

@@ -1108,9 +1108,6 @@ void UiSceneCreator::Create2dBrowsingSubtreeRoots() {
   repositioner->AddBinding(VR_BIND_FUNC(
       gfx::Vector3dF, Model, model_, model->controller.laser_direction,
       Repositioner, repositioner.get(), set_laser_direction));
-  repositioner->AddBinding(
-      VR_BIND(bool, Model, model_, model->controller.recentered, Repositioner,
-              repositioner.get(), if (value) { view->Reset(); }));
   scene_->AddUiElement(k2dBrowsingRoot, std::move(repositioner));
 
   auto hider = Create<UiElement>(k2dBrowsingVisibiltyHider, kPhaseNone);
@@ -1350,9 +1347,6 @@ void UiSceneCreator::CreateContentQuad() {
   resizer->AddBinding(VR_BIND_FUNC(bool, Model, model_,
                                    model->controller.touching_touchpad, Resizer,
                                    resizer.get(), SetTouchingTouchpad));
-  resizer->AddBinding(VR_BIND(bool, Model, model_, model->controller.recentered,
-                              Resizer, resizer.get(),
-                              if (value) { view->Reset(); }));
 
   auto main_content = std::make_unique<ContentElement>(
       content_input_delegate_,

chrome/browser/vr/ui_unittest.cc

@@ -1230,10 +1230,6 @@ TEST_F(UiTest, ResetRepositioner) {
 
   EXPECT_NE(original, repositioner->world_space_transform());
   repositioner->SetEnabled(false);
-  model_->controller.recentered = true;
-
-  OnBeginFrame();
-  EXPECT_EQ(original, repositioner->world_space_transform());
 }
 
 // No element in the controller root's subtree should be hit testable.
@@ -1311,10 +1307,6 @@ TEST_F(UiTest, RepositionHostedUi) {
 
   EXPECT_NE(original, hosted_ui->world_space_transform());
   repositioner->SetEnabled(false);
-  model_->controller.recentered = true;
-
-  OnBeginFrame();
-  EXPECT_EQ(original, hosted_ui->world_space_transform());
 }
 
 // Ensures that permissions do not appear after showing hosted UI.