[vr] Rename screen_space_transform to world_space_transform

Change-Id: I5deb66ac6e55448dfdc0536524ebe56d6cd51c22
Reviewed-on: https://chromium-review.googlesource.com/594874
Commit-Queue: Tibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Ian Vollick <vollick@chromium.org>
Reviewed-by: Ian Vollick <vollick@chromium.org>
Cr-Commit-Position: refs/heads/master@{#490811}

chrome/browser/vr/elements/ui_element.cc

@@ -175,7 +175,7 @@ void UiElement::AddChild(UiElement* child) {
 
 gfx::Point3F UiElement::GetCenter() const {
   gfx::Point3F center;
-  screen_space_transform_.TransformPoint(&center);
+  world_space_transform_.TransformPoint(&center);
   return center;
 }
 
@@ -185,9 +185,9 @@ gfx::PointF UiElement::GetUnitRectangleCoordinates(
   gfx::Point3F origin(0, 0, 0);
   gfx::Vector3dF x_axis(1, 0, 0);
   gfx::Vector3dF y_axis(0, 1, 0);
-  screen_space_transform_.TransformPoint(&origin);
-  screen_space_transform_.TransformVector(&x_axis);
-  screen_space_transform_.TransformVector(&y_axis);
+  world_space_transform_.TransformPoint(&origin);
+  world_space_transform_.TransformVector(&x_axis);
+  world_space_transform_.TransformVector(&y_axis);
   gfx::Vector3dF origin_to_world = world_point - origin;
   float x = gfx::DotProduct(origin_to_world, x_axis) /
             gfx::DotProduct(x_axis, x_axis);
@@ -199,8 +199,8 @@ gfx::PointF UiElement::GetUnitRectangleCoordinates(
 gfx::Vector3dF UiElement::GetNormal() const {
   gfx::Vector3dF x_axis(1, 0, 0);
   gfx::Vector3dF y_axis(0, 1, 0);
-  screen_space_transform_.TransformVector(&x_axis);
-  screen_space_transform_.TransformVector(&y_axis);
+  world_space_transform_.TransformVector(&x_axis);
+  world_space_transform_.TransformVector(&y_axis);
   gfx::Vector3dF normal = CrossProduct(y_axis, x_axis);
   normal.GetNormalized(&normal);
   return normal;

chrome/browser/vr/elements/ui_element.h

@@ -235,11 +235,11 @@ class UiElement : public cc::AnimationTarget {
   void SetMode(ColorScheme::Mode mode);
   ColorScheme::Mode mode() const { return mode_; }
 
-  const gfx::Transform& screen_space_transform() const {
-    return screen_space_transform_;
+  const gfx::Transform& world_space_transform() const {
+    return world_space_transform_;
   }
-  void set_screen_space_transform(const gfx::Transform& transform) {
-    screen_space_transform_ = transform;
+  void set_world_space_transform(const gfx::Transform& transform) {
+    world_space_transform_ = transform;
   }
 
   // Transformations are applied relative to the parent element, rather than
@@ -369,9 +369,9 @@ class UiElement : public cc::AnimationTarget {
   // This is set by the parent and is combined into LocalTransform()
   cc::TransformOperations layout_offset_;
 
-  // This is the combined, local to screen transform. It includes
+  // This is the combined, local to world transform. It includes
   // |inheritable_transform_|, |transform_|, and anchoring adjustments.
-  gfx::Transform screen_space_transform_;
+  gfx::Transform world_space_transform_;
 
   ColorScheme::Mode mode_ = ColorScheme::kModeNormal;
 

chrome/browser/vr/ui_input_manager_unittest.cc

@@ -39,7 +39,7 @@ TEST_F(UiInputManagerTest, NoMouseMovesDuringClick) {
   UiElement* content_quad =
       scene_->GetUiElementByDebugId(UiElementDebugId::kContentQuad);
   gfx::Point3F content_quad_center;
-  content_quad->screen_space_transform().TransformPoint(&content_quad_center);
+  content_quad->world_space_transform().TransformPoint(&content_quad_center);
   gfx::Point3F origin;
   GestureList gesture_list;
   gfx::Point3F out_target_point;

chrome/browser/vr/ui_renderer.cc

@@ -161,8 +161,7 @@ void UiRenderer::DrawElements(const gfx::Transform& view_proj_matrix,
 void UiRenderer::DrawElement(const gfx::Transform& view_proj_matrix,
                              const UiElement& element) {
   DCHECK_GE(element.draw_phase(), 0);
-  gfx::Transform transform =
-      view_proj_matrix * element.screen_space_transform();
+  gfx::Transform transform = view_proj_matrix * element.world_space_transform();
 
   switch (element.fill()) {
     case Fill::OPAQUE_GRADIENT: {
@@ -203,8 +202,8 @@ std::vector<const UiElement*> UiRenderer::GetElementsInDrawOrder(
               if (first->draw_phase() != second->draw_phase()) {
                 return first->draw_phase() < second->draw_phase();
               } else {
-                return first->screen_space_transform().matrix().get(2, 3) <
-                       second->screen_space_transform().matrix().get(2, 3);
+                return first->world_space_transform().matrix().get(2, 3) <
+                       second->world_space_transform().matrix().get(2, 3);
               }
             });
 

chrome/browser/vr/ui_scene.cc

@@ -153,7 +153,7 @@ void UiScene::ApplyRecursiveTransforms(UiElement* element) {
   }
 
   transform.ConcatTransform(inheritable);
-  element->set_screen_space_transform(transform);
+  element->set_world_space_transform(transform);
   element->set_inheritable_transform(inheritable);
   element->set_dirty(false);
 }

chrome/browser/vr/ui_scene_unittest.cc

@@ -96,8 +96,8 @@ TEST(UiScene, ParentTransformAppliesToChild) {
   gfx::Point3F point(1, 0, 0);
 
   scene.OnBeginFrame(MicrosecondsToTicks(1));
-  child->screen_space_transform().TransformPoint(&origin);
-  child->screen_space_transform().TransformPoint(&point);
+  child->world_space_transform().TransformPoint(&origin);
+  child->world_space_transform().TransformPoint(&point);
   EXPECT_VEC3F_NEAR(gfx::Point3F(6, 10, 0), origin);
   EXPECT_VEC3F_NEAR(gfx::Point3F(0, 10, 0), point);
 }