VR: Fix cursor draw order.

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/ui_texture.h"
 #include "chrome/browser/android/vr_shell/ui_elements/close_button.h"
@@ skipping 29 matching lines @@
 static constexpr float kFullscreenDistance = 3;
 static constexpr float kFullscreenVerticalOffset = -0.26;
 static constexpr vr::Colorf kFullscreenBackgroundColor = {0.1, 0.1, 0.1, 1.0};
 
 static constexpr float kSceneSize = 25.0;
 static constexpr float kSceneHeight = 4.0;
 static constexpr int kFloorGridlineCount = 40;
 static constexpr vr::Colorf kBackgroundHorizonColor = {0.57, 0.57, 0.57, 1.0};
 static constexpr vr::Colorf kBackgroundCenterColor = {0.48, 0.48, 0.48, 1.0};
 
-// Placeholders to demonstrate UI changes when in CCT.
-static constexpr vr::Colorf kCctBackgroundHorizonColor = {0.2, 0.6, 0.2, 1.0};
-static constexpr vr::Colorf kCctBackgroundCenterColor = {0.13, 0.52, 0.13, 1.0};
-
 // Tiny distance to offset textures that should appear in the same plane.
 static constexpr float kTextureOffset = 0.01;
 
 }  // namespace
 
 UiSceneManager::UiSceneManager(VrBrowserInterface* browser,
                                UiScene* scene,
                                bool in_cct,
                                bool in_web_vr)
     : browser_(browser),
@@ skipping 69 matching lines @@
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Limit reticle distance to a sphere based on content distance.
   scene_->SetBackgroundDistance(main_content_->translation().z() *
                                 -kBackgroundDistanceMultiplier);
 }
 
 void UiSceneManager::CreateBackground() {
   std::unique_ptr<UiElement> element;
-  vr::Colorf horizon =
-      in_cct_ ? kCctBackgroundHorizonColor : kBackgroundHorizonColor;
-  vr::Colorf center =
-      in_cct_ ? kCctBackgroundCenterColor : kBackgroundCenterColor;
 
   // Floor.
   element = base::MakeUnique<UiElement>();
   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_edge_color(horizon);
-  element->set_center_color(center);
+  element->set_edge_color(kBackgroundHorizonColor);
+  element->set_center_color(kBackgroundCenterColor);
   element->set_draw_phase(0);
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Ceiling.
   element = base::MakeUnique<UiElement>();
   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_edge_color(horizon);
-  element->set_center_color(center);
+  element->set_edge_color(kBackgroundHorizonColor);
+  element->set_center_color(kBackgroundCenterColor);
   element->set_draw_phase(0);
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
   // Floor grid.
   element = base::MakeUnique<UiElement>();
   element->set_id(AllocateId());
   element->set_fill(vr_shell::Fill::GRID_GRADIENT);
   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_center_color(horizon);
-  vr::Colorf edge_color = horizon;
+  element->set_center_color(kBackgroundHorizonColor);
+  vr::Colorf edge_color = kBackgroundHorizonColor;
   edge_color.a = 0.0;
   element->set_edge_color(edge_color);
   element->set_gridline_count(kFloorGridlineCount);
   element->set_draw_phase(0);
   browser_ui_elements_.push_back(element.get());
   scene_->AddUiElement(std::move(element));
 
-  scene_->SetBackgroundColor(horizon);
+  scene_->SetBackgroundColor(kBackgroundHorizonColor);
 }
 
 void UiSceneManager::CreateUrlBar() {
   // TODO(cjgrant): Incorporate final size and position.
   // TODO(cjgrant): Add the loading progress indicator element.
   std::unique_ptr<UrlBar> element = base::MakeUnique<UrlBar>(512);
   element->set_id(AllocateId());
   element->set_translation({0, -0.9, -1.8});
   element->set_size({0.9, 0, 1});
   element->SetBackButtonCallback(
@@ skipping 112 matching lines @@
 void UiSceneManager::SetHistoryButtonsEnabled(bool can_go_back,
                                               bool can_go_forward) {}
 
 void UiSceneManager::OnCloseButtonClicked() {}
 
 int UiSceneManager::AllocateId() {
   return next_available_id_++;
 }
 
 }  // namespace vr_shell