From ef41f35a373312a2b3ce0de21cd54714f7071d1b Mon Sep 17 00:00:00 2001
From: Nicolas Silva <nsilva@mozilla.com>
Date: Mon, 14 Oct 2024 16:27:50 +0000
Subject: [PATCH] Bug 1922323 - Rename ColorRenderTarget into RenderTarget.
 r=gfx-reviewers,gw

Differential Revision: https://phabricator.services.mozilla.com/D224782
---
 gfx/wr/webrender/src/frame_builder.rs | 6 +++---
 gfx/wr/webrender/src/render_target.rs | 8 ++++----
 gfx/wr/webrender/src/renderer/mod.rs  | 4 ++--
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/gfx/wr/webrender/src/frame_builder.rs b/gfx/wr/webrender/src/frame_builder.rs
index d6bb87c52e25..dc1c6bd1c0a0 100644
--- a/gfx/wr/webrender/src/frame_builder.rs
+++ b/gfx/wr/webrender/src/frame_builder.rs
@@ -27,7 +27,7 @@ use crate::profiler::{self, TransactionProfile};
 use crate::render_backend::{DataStores, ScratchBuffer};
 use crate::renderer::{GpuBufferF, GpuBufferBuilderF, GpuBufferI, GpuBufferBuilderI, GpuBufferBuilder};
 use crate::render_target::{PictureCacheTarget, TextureCacheRenderTarget, PictureCacheTargetKind};
-use crate::render_target::{RenderTargetContext, RenderTargetKind, ColorRenderTarget};
+use crate::render_target::{RenderTargetContext, RenderTargetKind, RenderTarget};
 use crate::render_task_graph::{RenderTaskGraph, Pass, SubPassSurface};
 use crate::render_task_graph::{RenderPass, RenderTaskGraphBuilder};
 use crate::render_task::{RenderTaskKind, StaticRenderTaskSurface};
@@ -940,7 +940,7 @@ pub fn build_render_pass(
             SubPassSurface::Dynamic { target_kind, texture_id, used_rect } => {
                 match target_kind {
                     RenderTargetKind::Color => {
-                        let mut target = ColorRenderTarget::new(
+                        let mut target = RenderTarget::new(
                             RenderTargetKind::Color,
                             texture_id,
                             screen_size,
@@ -964,7 +964,7 @@ pub fn build_render_pass(
                         pass.color.targets.push(target);
                     }
                     RenderTargetKind::Alpha => {
-                        let mut target = ColorRenderTarget::new(
+                        let mut target = RenderTarget::new(
                             RenderTargetKind::Alpha,
                             texture_id,
                             screen_size,
diff --git a/gfx/wr/webrender/src/render_target.rs b/gfx/wr/webrender/src/render_target.rs
index b81ba4df118d..71f8aa79d87f 100644
--- a/gfx/wr/webrender/src/render_target.rs
+++ b/gfx/wr/webrender/src/render_target.rs
@@ -95,7 +95,7 @@ pub struct RenderTargetContext<'a, 'rc> {
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
 pub struct RenderTargetList {
-    pub targets: FrameVec<ColorRenderTarget>,
+    pub targets: FrameVec<RenderTarget>,
 }
 
 impl RenderTargetList {
@@ -155,7 +155,7 @@ const NUM_PATTERNS: usize = crate::pattern::NUM_PATTERNS as usize;
 /// into draw commands on that surface.
 #[cfg_attr(feature = "capture", derive(Serialize))]
 #[cfg_attr(feature = "replay", derive(Deserialize))]
-pub struct ColorRenderTarget {
+pub struct RenderTarget {
     pub target_kind: RenderTargetKind,
     screen_size: DeviceIntSize,
     pub texture_id: CacheTextureId,
@@ -187,7 +187,7 @@ pub struct ColorRenderTarget {
     pub one_clears: FrameVec<RenderTaskId>,
 }
 
-impl ColorRenderTarget {
+impl RenderTarget {
     pub fn new(
         target_kind: RenderTargetKind,
         texture_id: CacheTextureId,
@@ -196,7 +196,7 @@ impl ColorRenderTarget {
         used_rect: DeviceIntRect,
         memory: &FrameMemory,
     ) -> Self {
-        ColorRenderTarget {
+        RenderTarget {
             target_kind,
             screen_size,
             texture_id,
diff --git a/gfx/wr/webrender/src/renderer/mod.rs b/gfx/wr/webrender/src/renderer/mod.rs
index f012a4dab10e..0504d173562e 100644
--- a/gfx/wr/webrender/src/renderer/mod.rs
+++ b/gfx/wr/webrender/src/renderer/mod.rs
@@ -86,7 +86,7 @@ use crate::render_target::{ResolveOp};
 use crate::render_task_graph::{RenderTaskGraph};
 use crate::render_task::{RenderTask, RenderTaskKind, ReadbackTask};
 use crate::screen_capture::AsyncScreenshotGrabber;
-use crate::render_target::{ColorRenderTarget, PictureCacheTarget, PictureCacheTargetKind};
+use crate::render_target::{RenderTarget, PictureCacheTarget, PictureCacheTargetKind};
 use crate::render_target::{TextureCacheRenderTarget, RenderTargetKind, BlitJob};
 use crate::telemetry::Telemetry;
 use crate::tile_cache::PictureCacheDebugInfo;
@@ -3484,7 +3484,7 @@ impl Renderer {
     fn draw_color_target(
         &mut self,
         draw_target: DrawTarget,
-        target: &ColorRenderTarget,
+        target: &RenderTarget,
         clear_depth: Option<f32>,
         render_tasks: &RenderTaskGraph,
         projection: &default::Transform3D<f32>,