Commit cab54658 authored by Christopher Grant's avatar Christopher Grant Committed by Commit Bot

VR: Remove fake UI element renderer

This class is no longer used, and can be removed.  acondor@ noticed
this.  Thanks Aldo!

BUG=
R=tiborg

Cq-Include-Trybots: luci.chromium.try:android_optional_gpu_tests_rel;luci.chromium.try:linux_optional_gpu_tests_rel;luci.chromium.try:mac_optional_gpu_tests_rel;luci.chromium.try:win_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_vr
Change-Id: I671c1daedda6fb28d54be7160d2c46e43ed22364
Reviewed-on: https://chromium-review.googlesource.com/1058015Reviewed-by: default avatarTibor Goldschwendt <tiborg@chromium.org>
Commit-Queue: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#558869}
parent 148903c2
...@@ -301,8 +301,6 @@ test("vr_common_unittests") { ...@@ -301,8 +301,6 @@ test("vr_common_unittests") {
"service/vr_device_manager_unittest.cc", "service/vr_device_manager_unittest.cc",
"sliding_average_unittest.cc", "sliding_average_unittest.cc",
"speech_recognizer_unittest.cc", "speech_recognizer_unittest.cc",
"test/fake_ui_element_renderer.cc",
"test/fake_ui_element_renderer.h",
"test/paths.cc", "test/paths.cc",
"test/paths.h", "test/paths.h",
"test/run_all_unittests.cc", "test/run_all_unittests.cc",
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "chrome/browser/vr/elements/ui_texture.h" #include "chrome/browser/vr/elements/ui_texture.h"
#include "chrome/browser/vr/test/animation_utils.h" #include "chrome/browser/vr/test/animation_utils.h"
#include "chrome/browser/vr/test/constants.h" #include "chrome/browser/vr/test/constants.h"
#include "chrome/browser/vr/test/fake_ui_element_renderer.h"
#include "chrome/browser/vr/ui_scene.h" #include "chrome/browser/vr/ui_scene.h"
namespace vr { namespace vr {
......
...@@ -11,7 +11,6 @@ ...@@ -11,7 +11,6 @@
#include "chrome/browser/vr/elements/ui_texture.h" #include "chrome/browser/vr/elements/ui_texture.h"
#include "chrome/browser/vr/test/animation_utils.h" #include "chrome/browser/vr/test/animation_utils.h"
#include "chrome/browser/vr/test/constants.h" #include "chrome/browser/vr/test/constants.h"
#include "chrome/browser/vr/test/fake_ui_element_renderer.h"
#include "chrome/browser/vr/ui_scene.h" #include "chrome/browser/vr/ui_scene.h"
#include "components/vector_icons/vector_icons.h" #include "components/vector_icons/vector_icons.h"
......
// 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/vr/test/fake_ui_element_renderer.h"
#include "ui/gfx/geometry/size_f.h"
namespace vr {
FakeUiElementRenderer::FakeUiElementRenderer() : UiElementRenderer(false) {}
FakeUiElementRenderer::~FakeUiElementRenderer() {}
void FakeUiElementRenderer::DrawTexturedQuad(
int texture_data_handle,
int overlay_texture_data_handle,
TextureLocation texture_location,
const gfx::Transform& view_proj_matrix,
const gfx::RectF& clip_rect,
float opacity,
const gfx::SizeF& element_size,
float corner_radius,
bool blend) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawGradientQuad(
const gfx::Transform& view_proj_matrix,
const SkColor edge_color,
const SkColor center_color,
const gfx::RectF& clip_rect,
float opacity,
const gfx::SizeF& element_size,
const CornerRadii& corner_radii) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawGradientGridQuad(
const gfx::Transform& view_proj_matrix,
const SkColor edge_color,
const SkColor center_color,
const SkColor grid_color,
int gridline_count,
float opacity) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawController(
float opacity,
const gfx::Transform& model_view_proj_matrix) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawLaser(float opacity,
const gfx::Transform& view_proj_matrix) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawReticle(
float opacity,
const gfx::Transform& view_proj_matrix) {
opacity_ = opacity;
called_ = true;
}
void FakeUiElementRenderer::DrawShadow(
const gfx::Transform& model_view_proj_matrix,
const gfx::SizeF& element_size,
float x_padding,
float y_padding,
float y_offset,
SkColor color,
float opacity,
float corner_radius) {
// We do not verify the opacity used by shadows -- they adjust this at the
// last moment before calling into the UiElementRenderer.
}
void FakeUiElementRenderer::DrawStars(
float t,
const gfx::Transform& model_view_proj_matrix) {}
} // namespace vr
// 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.
#ifndef CHROME_BROWSER_VR_TEST_FAKE_UI_ELEMENT_RENDERER_H_
#define CHROME_BROWSER_VR_TEST_FAKE_UI_ELEMENT_RENDERER_H_
#include "base/macros.h"
#include "chrome/browser/vr/ui_element_renderer.h"
namespace vr {
class FakeUiElementRenderer : public UiElementRenderer {
public:
FakeUiElementRenderer();
~FakeUiElementRenderer() override;
bool called() const { return called_; }
float opacity() const { return opacity_; }
void DrawTexturedQuad(int texture_data_handle,
int overlay_texture_data_handle,
TextureLocation texture_location,
const gfx::Transform& view_proj_matrix,
const gfx::RectF& clip_rect,
float opacity,
const gfx::SizeF& element_size,
float corner_radius,
bool blend) override;
void DrawGradientQuad(const gfx::Transform& view_proj_matrix,
const SkColor edge_color,
const SkColor center_color,
const gfx::RectF& clip_rect,
float opacity,
const gfx::SizeF& element_size,
const CornerRadii& corner_radii) override;
void DrawGradientGridQuad(const gfx::Transform& view_proj_matrix,
const SkColor edge_color,
const SkColor center_color,
const SkColor grid_color,
int gridline_count,
float opacity) override;
void DrawController(float opacity,
const gfx::Transform& model_view_proj_matrix) override;
void DrawLaser(float opacity,
const gfx::Transform& view_proj_matrix) override;
void DrawReticle(float opacity,
const gfx::Transform& view_proj_matrix) override;
void DrawShadow(const gfx::Transform& model_view_proj_matrix,
const gfx::SizeF& element_size,
float x_padding,
float y_padding,
float y_offset,
SkColor color,
float opacity,
float corner_radius) override;
void DrawStars(float t,
const gfx::Transform& model_view_proj_matrix) override;
private:
float opacity_ = -1.f;
float called_ = false;
DISALLOW_COPY_AND_ASSIGN(FakeUiElementRenderer);
};
} // namespace vr
#endif // CHROME_BROWSER_VR_TEST_FAKE_UI_ELEMENT_RENDERER_H_
...@@ -8,7 +8,6 @@ ...@@ -8,7 +8,6 @@
#include "chrome/browser/vr/model/model.h" #include "chrome/browser/vr/model/model.h"
#include "chrome/browser/vr/test/animation_utils.h" #include "chrome/browser/vr/test/animation_utils.h"
#include "chrome/browser/vr/test/constants.h" #include "chrome/browser/vr/test/constants.h"
#include "chrome/browser/vr/test/fake_ui_element_renderer.h"
#include "chrome/browser/vr/ui.h" #include "chrome/browser/vr/ui.h"
#include "chrome/browser/vr/ui_renderer.h" #include "chrome/browser/vr/ui_renderer.h"
#include "chrome/browser/vr/ui_scene.h" #include "chrome/browser/vr/ui_scene.h"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment