Renaming GradientQuadRenderer to RadialGradientQuadRenderer

This is the first step necessary prior to introduce a LinearGradientQuadRenderer.

Bug: 843239
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: I1be5e6265b99a153c3b7dba6e385f965952bac15
Reviewed-on: https://chromium-review.googlesource.com/1060120
Commit-Queue: Aldo Culquicondor <acondor@chromium.org>
Reviewed-by: Christopher Grant <cjgrant@chromium.org>
Cr-Commit-Position: refs/heads/master@{#559135}

chrome/browser/vr/BUILD.gn

@@ -181,8 +181,8 @@ static_library("vr_common") {
     "renderers/base_renderer.h",
     "renderers/external_textured_quad_renderer.cc",
     "renderers/external_textured_quad_renderer.h",
-    "renderers/gradient_quad_renderer.cc",
-    "renderers/gradient_quad_renderer.h",
+    "renderers/radial_gradient_quad_renderer.cc",
+    "renderers/radial_gradient_quad_renderer.h",
     "renderers/textured_quad_renderer.cc",
     "renderers/textured_quad_renderer.h",
     "renderers/transparent_quad_renderer.cc",

chrome/browser/vr/elements/full_screen_rect.cc

@@ -16,9 +16,9 @@ void FullScreenRect::Render(UiElementRenderer* renderer,
                             const CameraModel& model) const {
   gfx::Transform m;
   m.Scale3d(2.0f, 2.0f, 1.0f);
-  renderer->DrawGradientQuad(m, edge_color(), center_color(), clip_rect(),
-                             computed_opacity(), gfx::SizeF(1.f, 1.f),
-                             corner_radii());
+  renderer->DrawRadialGradientQuad(m, edge_color(), center_color(), clip_rect(),
+                                   computed_opacity(), gfx::SizeF(1.f, 1.f),
+                                   corner_radii());
 }
 
 bool FullScreenRect::IsWorldPositioned() const {

chrome/browser/vr/elements/rect.cc

@@ -44,9 +44,9 @@ void Rect::Render(UiElementRenderer* renderer, const CameraModel& model) const {
   float opacity = computed_opacity() * local_opacity_;
   if (opacity <= 0.f)
     return;
-  renderer->DrawGradientQuad(model.view_proj_matrix * world_space_transform(),
-                             edge_color_, center_color_, clip_rect(), opacity,
-                             size(), corner_radii());
+  renderer->DrawRadialGradientQuad(
+      model.view_proj_matrix * world_space_transform(), edge_color_,
+      center_color_, clip_rect(), opacity, size(), corner_radii());
 }
 
 void Rect::SetLocalOpacity(float opacity) {

chrome/browser/vr/renderers/gradient_quad_renderer.cc → chrome/browser/vr/renderers/radial_gradient_quad_renderer.cc

@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/vr/renderers/gradient_quad_renderer.h"
+#include "chrome/browser/vr/renderers/radial_gradient_quad_renderer.h"
 
 #include "chrome/browser/vr/elements/corner_radii.h"
 #include "chrome/browser/vr/renderers/textured_quad_renderer.h"
@@ -108,7 +108,7 @@ void SetCornerOffset(GLuint handle, float radius, const gfx::SizeF& size) {
 
 }  // namespace
 
-GradientQuadRenderer::GradientQuadRenderer()
+RadialGradientQuadRenderer::RadialGradientQuadRenderer()
     : BaseRenderer(kVertexShader, kFragmentShader) {
   model_view_proj_matrix_handle_ =
       glGetUniformLocation(program_handle_, "u_ModelViewProjMatrix");
@@ -129,15 +129,16 @@ GradientQuadRenderer::GradientQuadRenderer()
   aspect_ratio_handle_ = glGetUniformLocation(program_handle_, "u_AspectRatio");
 }
 
-GradientQuadRenderer::~GradientQuadRenderer() = default;
+RadialGradientQuadRenderer::~RadialGradientQuadRenderer() = default;
 
-void GradientQuadRenderer::Draw(const gfx::Transform& model_view_proj_matrix,
-                                SkColor edge_color,
-                                SkColor center_color,
-                                const gfx::RectF& clip_rect,
-                                float opacity,
-                                const gfx::SizeF& element_size,
-                                const CornerRadii& radii) {
+void RadialGradientQuadRenderer::Draw(
+    const gfx::Transform& model_view_proj_matrix,
+    SkColor edge_color,
+    SkColor center_color,
+    const gfx::RectF& clip_rect,
+    float opacity,
+    const gfx::SizeF& element_size,
+    const CornerRadii& radii) {
   DCHECK(opacity > 0.f);
   if (SkColorGetA(edge_color) == SK_AlphaTRANSPARENT &&
       SkColorGetA(center_color) == SK_AlphaTRANSPARENT) {

chrome/browser/vr/renderers/gradient_quad_renderer.h → chrome/browser/vr/renderers/radial_gradient_quad_renderer.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_VR_RENDERERS_GRADIENT_QUAD_RENDERER_H_
-#define CHROME_BROWSER_VR_RENDERERS_GRADIENT_QUAD_RENDERER_H_
+#ifndef CHROME_BROWSER_VR_RENDERERS_RADIAL_GRADIENT_QUAD_RENDERER_H_
+#define CHROME_BROWSER_VR_RENDERERS_RADIAL_GRADIENT_QUAD_RENDERER_H_
 
 #include "base/macros.h"
 #include "chrome/browser/vr/renderers/base_renderer.h"
@@ -20,10 +20,10 @@ namespace vr {
 
 struct CornerRadii;
 
-class GradientQuadRenderer : public BaseRenderer {
+class RadialGradientQuadRenderer : public BaseRenderer {
  public:
-  GradientQuadRenderer();
-  ~GradientQuadRenderer() override;
+  RadialGradientQuadRenderer();
+  ~RadialGradientQuadRenderer() override;
 
   void Draw(const gfx::Transform& model_view_proj_matrix,
             SkColor edge_color,
@@ -46,9 +46,9 @@ class GradientQuadRenderer : public BaseRenderer {
   GLuint edge_color_handle_;
   GLuint aspect_ratio_handle_;
 
-  DISALLOW_COPY_AND_ASSIGN(GradientQuadRenderer);
+  DISALLOW_COPY_AND_ASSIGN(RadialGradientQuadRenderer);
 };
 
 }  // namespace vr
 
-#endif  // CHROME_BROWSER_VR_RENDERERS_GRADIENT_QUAD_RENDERER_H_
+#endif  // CHROME_BROWSER_VR_RENDERERS_RADIAL_GRADIENT_QUAD_RENDERER_H_

chrome/browser/vr/ui_element_renderer.cc

@@ -13,7 +13,7 @@
 #include "chrome/browser/vr/renderers/base_quad_renderer.h"
 #include "chrome/browser/vr/renderers/base_renderer.h"
 #include "chrome/browser/vr/renderers/external_textured_quad_renderer.h"
-#include "chrome/browser/vr/renderers/gradient_quad_renderer.h"
+#include "chrome/browser/vr/renderers/radial_gradient_quad_renderer.h"
 #include "chrome/browser/vr/renderers/textured_quad_renderer.h"
 #include "chrome/browser/vr/renderers/transparent_quad_renderer.h"
 #include "chrome/browser/vr/renderers/web_vr_renderer.h"
@@ -41,7 +41,8 @@ void UiElementRenderer::Init() {
       std::make_unique<ExternalTexturedQuadRenderer>();
   transparent_quad_renderer_ = std::make_unique<TransparentQuadRenderer>();
   textured_quad_renderer_ = std::make_unique<TexturedQuadRenderer>();
-  gradient_quad_renderer_ = std::make_unique<GradientQuadRenderer>();
+  radial_gradient_quad_renderer_ =
+      std::make_unique<RadialGradientQuadRenderer>();
   webvr_renderer_ = std::make_unique<WebVrRenderer>();
   reticle_renderer_ = std::make_unique<Reticle::Renderer>();
   laser_renderer_ = std::make_unique<Laser::Renderer>();
@@ -83,7 +84,7 @@ void UiElementRenderer::DrawTexturedQuad(
                     corner_radius, blend);
 }
 
-void UiElementRenderer::DrawGradientQuad(
+void UiElementRenderer::DrawRadialGradientQuad(
     const gfx::Transform& model_view_proj_matrix,
     const SkColor edge_color,
     const SkColor center_color,
@@ -91,11 +92,11 @@ void UiElementRenderer::DrawGradientQuad(
     float opacity,
     const gfx::SizeF& element_size,
     const CornerRadii& radii) {
-  TRACE_EVENT0("gpu", "UiElementRenderer::DrawGradientQuad");
-  FlushIfNecessary(gradient_quad_renderer_.get());
-  gradient_quad_renderer_->Draw(model_view_proj_matrix, edge_color,
-                                center_color, clip_rect, opacity, element_size,
-                                radii);
+  TRACE_EVENT0("gpu", "UiElementRenderer::DrawRadialGradientQuad");
+  FlushIfNecessary(radial_gradient_quad_renderer_.get());
+  radial_gradient_quad_renderer_->Draw(model_view_proj_matrix, edge_color,
+                                       center_color, clip_rect, opacity,
+                                       element_size, radii);
 }
 
 void UiElementRenderer::DrawGradientGridQuad(

chrome/browser/vr/ui_element_renderer.h

@@ -36,7 +36,7 @@ namespace vr {
 
 class BaseRenderer;
 class ExternalTexturedQuadRenderer;
-class GradientQuadRenderer;
+class RadialGradientQuadRenderer;
 class TexturedQuadRenderer;
 class TransparentQuadRenderer;
 class WebVrRenderer;
@@ -69,7 +69,7 @@ class UiElementRenderer {
       const gfx::SizeF& element_size,
       float corner_radius,
       bool blend);
-  VIRTUAL_FOR_MOCKS void DrawGradientQuad(
+  VIRTUAL_FOR_MOCKS void DrawRadialGradientQuad(
       const gfx::Transform& model_view_proj_matrix,
       const SkColor edge_color,
       const SkColor center_color,
@@ -144,7 +144,7 @@ class UiElementRenderer {
       external_textured_quad_renderer_;
   std::unique_ptr<TransparentQuadRenderer> transparent_quad_renderer_;
   std::unique_ptr<TexturedQuadRenderer> textured_quad_renderer_;
-  std::unique_ptr<GradientQuadRenderer> gradient_quad_renderer_;
+  std::unique_ptr<RadialGradientQuadRenderer> radial_gradient_quad_renderer_;
   std::unique_ptr<WebVrRenderer> webvr_renderer_;
   std::unique_ptr<Reticle::Renderer> reticle_renderer_;
   std::unique_ptr<Laser::Renderer> laser_renderer_;