VR: Soften the floor grid

chrome/browser/android/vr_shell/ui_scene_manager.cc

Index: chrome/browser/android/vr_shell/ui_scene_manager.cc
diff --git a/chrome/browser/android/vr_shell/ui_scene_manager.cc b/chrome/browser/android/vr_shell/ui_scene_manager.cc
index 925995a81270be72fc69ce95f173cda5305ab38d..f90f4bd6ced57d37cd1701ba0cb0563628573862 100644
--- a/chrome/browser/android/vr_shell/ui_scene_manager.cc
+++ b/chrome/browser/android/vr_shell/ui_scene_manager.cc
@@ -230,8 +230,9 @@ void UiSceneManager::CreateBackground() {
   element->set_size({kSceneSize, kSceneSize, 1.0});
   element->set_translation({0.0, -kSceneHeight / 2, 0.0});
   element->set_rotation({1.0, 0.0, 0.0, -M_PI / 2.0});
-  element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
+  element->set_fill(vr_shell::Fill::GRID_GRADIENT);
   element->set_draw_phase(0);
+  element->set_gridline_count(kFloorGridlineCount);
   floor_ = element.get();
   content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
@@ -240,7 +241,6 @@ void UiSceneManager::CreateBackground() {
   element = base::MakeUnique<UiElement>();
   element->set_debug_id(kCeiling);
   element->set_id(AllocateId());
-  element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
   element->set_size({kSceneSize, kSceneSize, 1.0});
   element->set_translation({0.0, kSceneHeight / 2, 0.0});
   element->set_rotation({1.0, 0.0, 0.0, M_PI / 2});
@@ -250,20 +250,6 @@ void UiSceneManager::CreateBackground() {
   content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
-  // Floor grid.
-  element = base::MakeUnique<UiElement>();
-  element->set_debug_id(kFloorGrid);

[cjgrant, 2017/05/31 14:49:17]

Need to remove kFloorGrid from the debug enum and tests.

[acondor_, 2017/05/31 15:38:30]

Done.

-  element->set_id(AllocateId());
-  element->set_size({kSceneSize, kSceneSize, 1.0});
-  element->set_translation({0.0, -kSceneHeight / 2 + kTextureOffset, 0.0});
-  element->set_rotation({1.0, 0.0, 0.0, -M_PI / 2});
-  element->set_fill(vr_shell::Fill::GRID_GRADIENT);
-  element->set_gridline_count(kFloorGridlineCount);
-  element->set_draw_phase(0);
-  floor_grid_ = element.get();
-  content_elements_.push_back(element.get());
-  scene_->AddUiElement(std::move(element));
-
   UpdateBackgroundColor();
 }
 
@@ -365,9 +351,7 @@ void UiSceneManager::UpdateBackgroundColor() {
   ceiling_->set_edge_color(color_scheme().horizon);
   floor_->set_center_color(color_scheme().floor);
   floor_->set_edge_color(color_scheme().horizon);
-  floor_grid_->set_center_color(color_scheme().floor_grid);
-  SkColor floor_grid_edge_color = SkColorSetA(color_scheme().floor_grid, 0);
-  floor_grid_->set_edge_color(floor_grid_edge_color);
+  floor_->set_grid_color(color_scheme().floor_grid);
 }
 
 void UiSceneManager::SetAudioCapturingIndicator(bool enabled) {