VR: Soften the floor grid

chrome/browser/android/vr_shell/ui_scene_manager.cc

 // Copyright 2017 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_manager.h"
 
 #include "base/callback.h"
 #include "base/memory/ptr_util.h"
 #include "chrome/browser/android/vr_shell/textures/close_button_texture.h"
 #include "chrome/browser/android/vr_shell/textures/ui_texture.h"
@@ skipping 212 matching lines @@
 void UiSceneManager::CreateBackground() {
   std::unique_ptr<UiElement> element;
 
   // Floor.
   element = base::MakeUnique<UiElement>();
   element->set_debug_id(kFloor);
   element->set_id(AllocateId());
   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));
 
   // Ceiling.
   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});
   element->set_fill(vr_shell::Fill::OPAQUE_GRADIENT);
   element->set_draw_phase(0);
   ceiling_ = element.get();
   content_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
-  // Floor grid.
-  element = base::MakeUnique<UiElement>();
-  element->set_debug_id(kFloorGrid);
-  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();
 }
 
 void UiSceneManager::CreateUrlBar() {
   // TODO(cjgrant): Incorporate final size and position.
   auto url_bar = base::MakeUnique<UrlBar>(
       512,
       base::Bind(&UiSceneManager::OnUnsupportedMode, base::Unretained(this)));
   url_bar->set_debug_id(kUrlBar);
   url_bar->set_id(AllocateId());
@@ skipping 78 matching lines @@
   UpdateBackgroundColor();
 }
 
 void UiSceneManager::UpdateBackgroundColor() {
   // TODO(vollick): it would be nice if ceiling, floor and the grid were
   // UiElement subclasses and could respond to the OnSetMode signal.
   ceiling_->set_center_color(color_scheme().ceiling);
   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) {
   audio_capture_indicator_->set_visible(enabled);
 }
 
 void UiSceneManager::SetVideoCapturingIndicator(bool enabled) {
   video_capture_indicator_->set_visible(enabled);
 }
 
@@ skipping 96 matching lines @@
   if (fullscreen_)
     return ColorScheme::kModeFullscreen;
   return ColorScheme::kModeNormal;
 }
 
 const ColorScheme& UiSceneManager::color_scheme() const {
   return ColorScheme::GetColorScheme(mode());
 }
 
 }  // namespace vr_shell