Remove unnecessary UI element math.

chrome/browser/android/vr_shell/ui_scene_unittest.cc

 // Copyright (c) 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/ui_scene.h"
 
 #define _USE_MATH_DEFINES  // For M_PI in MSVC.
 #include <cmath>
 #include <utility>
 #include <vector>
@@ skipping 107 matching lines @@
   element->scale = {2, 2, 1};
   element->rotation = {0, 0, 1, M_PI / 2};
   element->translation = {3, 0, 0};
   scene.AddUiElement(element);
   const ContentRectangle* child = scene.GetUiElementById(1);
 
   const gvr::Vec3f origin({0, 0, 0});
   const gvr::Vec3f point({1, 0, 0});
 
   // Check resulting transform with no screen tilt.
-  scene.UpdateTransforms(0, 0);
-  auto new_origin = MatrixVectorMul(child->transform.to_world, origin);
-  auto new_point = MatrixVectorMul(child->transform.to_world, point);
+  scene.UpdateTransforms(0);
+  auto new_origin = MatrixVectorMul(child->TransformMatrix(), origin);
+  auto new_point = MatrixVectorMul(child->TransformMatrix(), point);
   EXPECT_VEC3F_NEAR(gvr::Vec3f({6, 10, 0}), new_origin);
   EXPECT_VEC3F_NEAR(gvr::Vec3f({0, 10, 0}), new_point);
-
-  // Check with screen tilt (use 90 degrees for simplicity).
-  scene.UpdateTransforms(M_PI / 2, 0);
-  new_origin = MatrixVectorMul(child->transform.to_world, origin);
-  new_point = MatrixVectorMul(child->transform.to_world, point);
-  EXPECT_VEC3F_NEAR(gvr::Vec3f({6, 0, 10}), new_origin);
-  EXPECT_VEC3F_NEAR(gvr::Vec3f({0, 0, 10}), new_point);
 }
 
 TEST(UiScene, Opacity) {
   UiScene scene;
   std::unique_ptr<ContentRectangle> element;
 
   element.reset(new ContentRectangle);
   element->id = 0;
   element->opacity = 0.5;
   scene.AddUiElement(element);
 
   element.reset(new ContentRectangle);
   element->id = 1;
   element->parent_id = 0;
   element->opacity = 0.5;
   scene.AddUiElement(element);
 
-  scene.UpdateTransforms(0, 0);
+  scene.UpdateTransforms(0);
   EXPECT_EQ(scene.GetUiElementById(0)->computed_opacity, 0.5f);
   EXPECT_EQ(scene.GetUiElementById(1)->computed_opacity, 0.25f);
 }
 
 typedef struct {
   XAnchoring x_anchoring;
   YAnchoring y_anchoring;
   float expected_x;
   float expected_y;
 } AnchoringTestCase;
@@ skipping 11 matching lines @@
   scene.AddUiElement(element);
 
   // Add a child to the parent, with anchoring.
   element.reset(new ContentRectangle);
   element->id = 1;
   element->parent_id = 0;
   element->x_anchoring = GetParam().x_anchoring;
   element->y_anchoring = GetParam().y_anchoring;
   scene.AddUiElement(element);
 
-  scene.UpdateTransforms(0, 0);
+  scene.UpdateTransforms(0);
   const ContentRectangle* child = scene.GetUiElementById(1);
   EXPECT_NEAR(child->GetCenter().x, GetParam().expected_x, TOLERANCE);
   EXPECT_NEAR(child->GetCenter().y, GetParam().expected_y, TOLERANCE);
   scene.RemoveUiElement(1);
 }
 
 const std::vector<AnchoringTestCase> anchoring_test_cases = {
     {XAnchoring::XNONE, YAnchoring::YNONE, 0, 0},
     {XAnchoring::XLEFT, YAnchoring::YNONE, -2, 0},
     {XAnchoring::XRIGHT, YAnchoring::YNONE, 2, 0},
@@ skipping 212 matching lines @@
   EXPECT_FLOAT_EQ(animation->from[0], 300);
   EXPECT_FLOAT_EQ(animation->from[1], 301);
   EXPECT_FLOAT_EQ(animation->from[2], 302);
   EXPECT_FLOAT_EQ(animation->from[3], 303);
 
   EXPECT_EQ(animation->start, 22345000);
   EXPECT_EQ(animation->duration, 54321000);
 }
 
 }  // namespace vr_shell