VR: Rename ContentRectangle to UiElement

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>
 
 #include "base/memory/ptr_util.h"
 #include "base/values.h"
 #include "chrome/browser/android/vr_shell/animation.h"
 #include "chrome/browser/android/vr_shell/easing.h"
-#include "chrome/browser/android/vr_shell/ui_elements.h"
+#include "chrome/browser/android/vr_shell/ui_element.h"
 #include "device/vr/vr_math.h"
 #include "device/vr/vr_types.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 #define TOLERANCE 0.0001
 
 #define EXPECT_VEC3F_NEAR(a, b)         \
   EXPECT_NEAR(a.x(), b.x(), TOLERANCE); \
   EXPECT_NEAR(a.y(), b.y(), TOLERANCE); \
   EXPECT_NEAR(a.z(), b.z(), TOLERANCE);
 
 namespace vr_shell {
 
 namespace {
 
 base::TimeTicks usToTicks(uint64_t us) {
   return base::TimeTicks::FromInternalValue(us);
 }
 
 base::TimeDelta usToDelta(uint64_t us) {
   return base::TimeDelta::FromInternalValue(us);
 }
 
 void addElement(UiScene* scene, int id) {
-  auto element = base::MakeUnique<ContentRectangle>();
+  auto element = base::MakeUnique<UiElement>();
   element->id = id;
   scene->AddUiElement(std::move(element));
 }
 
 void addAnimation(UiScene* scene,
                   int element_id,
                   int animation_id,
                   Animation::Property property) {
   std::unique_ptr<easing::Easing> easing = base::MakeUnique<easing::Linear>();
   std::vector<float> from = {};
@@ skipping 55 matching lines @@
 }
 
 // This test creates a parent and child UI element, each with their own
 // transformations, and ensures that the child's computed total transform
 // incorporates the parent's transform as well as its own.
 TEST(UiScene, ParentTransformAppliesToChild) {
   UiScene scene;
 
   // Add a parent element, with distinct transformations.
   // Size of the parent should be ignored by the child.
-  auto element = base::MakeUnique<ContentRectangle>();
+  auto element = base::MakeUnique<UiElement>();
   element->id = 0;
   element->size = {1000, 1000, 1};
   element->scale = {3, 3, 1};
   element->rotation = {0, 0, 1, M_PI / 2};
   element->translation = {6, 1, 0};
   scene.AddUiElement(std::move(element));
 
   // Add a child to the parent, with different transformations.
-  element = base::MakeUnique<ContentRectangle>();
+  element = base::MakeUnique<UiElement>();
   element->id = 1;
   element->parent_id = 0;
   element->size = {1, 1, 1};
   element->scale = {2, 2, 1};
   element->rotation = {0, 0, 1, M_PI / 2};
   element->translation = {3, 0, 0};
   scene.AddUiElement(std::move(element));
-  const ContentRectangle* child = scene.GetUiElementById(1);
+  const UiElement* child = scene.GetUiElementById(1);
 
   const gfx::Vector3dF origin(0, 0, 0);
   const gfx::Vector3dF point(1, 0, 0);
 
   scene.UpdateTransforms(usToTicks(0));
   auto new_origin = vr::MatrixVectorMul(child->TransformMatrix(), origin);
   auto new_point = vr::MatrixVectorMul(child->TransformMatrix(), point);
   EXPECT_VEC3F_NEAR(gfx::Vector3dF(6, 10, 0), new_origin);
   EXPECT_VEC3F_NEAR(gfx::Vector3dF(0, 10, 0), new_point);
 }
 
 TEST(UiScene, Opacity) {
   UiScene scene;
 
-  auto element = base::MakeUnique<ContentRectangle>();
+  auto element = base::MakeUnique<UiElement>();
   element->id = 0;
   element->opacity = 0.5;
   scene.AddUiElement(std::move(element));
 
-  element = base::MakeUnique<ContentRectangle>();
+  element = base::MakeUnique<UiElement>();
   element->id = 1;
   element->parent_id = 0;
   element->opacity = 0.5;
   scene.AddUiElement(std::move(element));
 
   scene.UpdateTransforms(usToTicks(0));
   EXPECT_EQ(scene.GetUiElementById(0)->computed_opacity, 0.5f);
   EXPECT_EQ(scene.GetUiElementById(1)->computed_opacity, 0.25f);
 }
 
 TEST(UiScene, LockToFov) {
   UiScene scene;
 
-  auto element = base::MakeUnique<ContentRectangle>();
+  auto element = base::MakeUnique<UiElement>();
   element->id = 0;
   element->lock_to_fov = true;
   scene.AddUiElement(std::move(element));
 
-  element = base::MakeUnique<ContentRectangle>();
+  element = base::MakeUnique<UiElement>();
   element->id = 1;
   element->parent_id = 0;
   element->lock_to_fov = false;
   scene.AddUiElement(std::move(element));
 
   scene.UpdateTransforms(usToTicks(0));
   EXPECT_EQ(scene.GetUiElementById(0)->computed_lock_to_fov, true);
   EXPECT_EQ(scene.GetUiElementById(1)->computed_lock_to_fov, true);
 }
 
 typedef struct {
   XAnchoring x_anchoring;
   YAnchoring y_anchoring;
   float expected_x;
   float expected_y;
 } AnchoringTestCase;
 
 class AnchoringTest : public ::testing::TestWithParam<AnchoringTestCase> {};
 
 TEST_P(AnchoringTest, VerifyCorrectPosition) {
   UiScene scene;
 
   // Create a parent element with non-unity size and scale.
-  auto element = base::MakeUnique<ContentRectangle>();
+  auto element = base::MakeUnique<UiElement>();
   element->id = 0;
   element->size = {2, 2, 1};
   element->scale = {2, 2, 1};
   scene.AddUiElement(std::move(element));
 
   // Add a child to the parent, with anchoring.
-  element = base::MakeUnique<ContentRectangle>();
+  element = base::MakeUnique<UiElement>();
   element->id = 1;
   element->parent_id = 0;
   element->x_anchoring = GetParam().x_anchoring;
   element->y_anchoring = GetParam().y_anchoring;
   scene.AddUiElement(std::move(element));
 
   scene.UpdateTransforms(usToTicks(0));
-  const ContentRectangle* child = scene.GetUiElementById(1);
+  const UiElement* 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},
     {XAnchoring::XNONE, YAnchoring::YTOP, 0, 2},
@@ skipping 222 matching lines @@
   EXPECT_FLOAT_EQ(300, animation->from[0]);
   EXPECT_FLOAT_EQ(301, animation->from[1]);
   EXPECT_FLOAT_EQ(302, animation->from[2]);
   EXPECT_FLOAT_EQ(303, animation->from[3]);
 
   EXPECT_EQ(usToTicks(22345000), animation->start);
   EXPECT_EQ(usToDelta(54321000), animation->duration);
 }
 
 }  // namespace vr_shell