Bug 1892201 - Remove unused RenderTaskParent::Surface field. r=gfx-reviewers,gw

Differential Revision: https://phabricator.services.mozilla.com/D208313

Author: nical

gfx/wr/webrender/src/prepare.rs

@@ -394,7 +394,7 @@ fn prepare_interned_prim_for_render(
                     frame_state.rg_builder,
                     None,
                     false,
-                    RenderTaskParent::Surface(pic_context.surface_index),
+                    RenderTaskParent::Surface,
                     &mut frame_state.surface_builder,
                     |rg_builder, _| {
                         rg_builder.add().init(RenderTask::new_dynamic(
@@ -549,7 +549,7 @@ fn prepare_interned_prim_for_render(
                     frame_state.rg_builder,
                     None,
                     false,          // TODO(gw): We don't calculate opacity for borders yet!
-                    RenderTaskParent::Surface(pic_context.surface_index),
+                    RenderTaskParent::Surface,
                     &mut frame_state.surface_builder,
                     |rg_builder, _| {
                         rg_builder.add().init(RenderTask::new_dynamic(

gfx/wr/webrender/src/prim_store/gradient/conic.rs

@@ -259,7 +259,7 @@ impl ConicGradientTemplate {
             frame_state.rg_builder,
             None,
             false,
-            RenderTaskParent::Surface(parent_surface),
+            RenderTaskParent::Surface,
             &mut frame_state.surface_builder,
             |rg_builder, gpu_buffer_builder| {
                 let stops = GradientGpuBlockBuilder::build(

gfx/wr/webrender/src/prim_store/gradient/linear.rs

@@ -526,7 +526,7 @@ impl LinearGradientTemplate {
                 frame_state.rg_builder,
                 None,
                 false,
-                RenderTaskParent::Surface(parent_surface),
+                RenderTaskParent::Surface,
                 &mut frame_state.surface_builder,
                 |rg_builder, _| {
                     rg_builder.add().init(RenderTask::new_dynamic(
@@ -556,7 +556,7 @@ impl LinearGradientTemplate {
                 frame_state.rg_builder,
                 None,
                 false,
-                RenderTaskParent::Surface(parent_surface),
+                RenderTaskParent::Surface,
                 &mut frame_state.surface_builder,
                 |rg_builder, gpu_buffer_builder| {
                     let stops = Some(GradientGpuBlockBuilder::build(

gfx/wr/webrender/src/prim_store/gradient/radial.rs

@@ -225,7 +225,7 @@ impl RadialGradientTemplate {
             frame_state.rg_builder,
             None,
             false,
-            RenderTaskParent::Surface(parent_surface),
+            RenderTaskParent::Surface,
             &mut frame_state.surface_builder,
             |rg_builder, gpu_buffer_builder| {
                 let stops = GradientGpuBlockBuilder::build(

gfx/wr/webrender/src/prim_store/image.rs

@@ -261,7 +261,7 @@ impl ImageData {
                         frame_state.rg_builder,
                         None,
                         descriptor.is_opaque(),
-                        RenderTaskParent::Surface(parent_surface),
+                        RenderTaskParent::Surface,
                         &mut frame_state.surface_builder,
                         |rg_builder, _| {
                             // Create a task to blit from the texture cache to

gfx/wr/webrender/src/render_task_cache.rs

@@ -36,7 +36,7 @@ const MAX_CACHE_TASK_SIZE: f32 = 4096.0;
 /// box-shadow input).
 pub enum RenderTaskParent {
     /// Parent is a surface
-    Surface(SurfaceIndex),
+    Surface,
     /// Parent is a render task
     RenderTask(RenderTaskId),
 }
@@ -288,9 +288,7 @@ impl RenderTaskCache {
         // an input source.
         if let Some(render_task_id) = cache_entry.render_task_id {
             match parent {
-                // TODO(gw): Remove surface from here as a follow up patch, as it's now implicit
-                //           due to using SurfaceBuilder
-                RenderTaskParent::Surface(_surface_index) => {
+                RenderTaskParent::Surface => {
                     // If parent is a surface, use helper fn to add this dependency,
                     // which correctly takes account of the render task configuration
                     // of the surface.