Remove ComputedValues argument from with_discrete_layer() and its callers

Yay!

Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/816>

6 files changed, 6 insertions, 23 deletions

diff --git a/src/drawing_ctx.rs b/src/drawing_ctx.rs
index 81d6d7e5..46c98d5b 100644
--- a/src/drawing_ctx.rs
+++ b/src/drawing_ctx.rs
@@ -691,7 +691,6 @@ impl DrawingCtx {
             let res = mask_draw_ctx.with_discrete_layer(
                 &stacking_ctx,
                 acquired_nodes,
-                values,
                 false,
                 None,
                 &mut |an, dc| mask_node.draw_children(an, &cascaded, dc, false),
@@ -716,7 +715,6 @@ impl DrawingCtx {
         &mut self,
         stacking_ctx: &StackingContext,
         acquired_nodes: &mut AcquiredNodes<'_>,
-        _values: &ComputedValues,
         clipping: bool,
         clip_rect: Option<Rect>,
         draw_fn: &mut dyn FnMut(
@@ -1130,7 +1128,6 @@ impl DrawingCtx {
                     dc.with_discrete_layer(
                         &stacking_ctx,
                         acquired_nodes,
-                        pattern_values,
                         false,
                         None,
                         &mut |an, dc| pattern_node.draw_children(an, &pattern_cascaded, dc, false),
@@ -1262,18 +1259,17 @@ impl DrawingCtx {
         &mut self,
         layer: &Layer,
         acquired_nodes: &mut AcquiredNodes<'_>,
-        values: &ComputedValues,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
         match &layer.kind {
             LayerKind::Shape(shape) => {
-                self.draw_shape(shape, &layer.stacking_ctx, acquired_nodes, values, clipping)
+                self.draw_shape(shape, &layer.stacking_ctx, acquired_nodes, clipping)
             }
             LayerKind::Text(text) => {
-                self.draw_text(text, &layer.stacking_ctx, acquired_nodes, values, clipping)
+                self.draw_text(text, &layer.stacking_ctx, acquired_nodes, clipping)
             }
             LayerKind::Image(image) => {
-                self.draw_image(image, &layer.stacking_ctx, acquired_nodes, values, clipping)
+                self.draw_image(image, &layer.stacking_ctx, acquired_nodes, clipping)
             }
         }
     }
@@ -1283,7 +1279,6 @@ impl DrawingCtx {
         shape: &Shape,
         stacking_ctx: &StackingContext,
         acquired_nodes: &mut AcquiredNodes<'_>,
-        values: &ComputedValues,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
         if shape.extents.is_none() {
@@ -1293,7 +1288,6 @@ impl DrawingCtx {
         self.with_discrete_layer(
             stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| {
@@ -1397,7 +1391,6 @@ impl DrawingCtx {
         image: &Image,
         stacking_ctx: &StackingContext,
         acquired_nodes: &mut AcquiredNodes<'_>,
-        values: &ComputedValues,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
         let image_width = image.surface.width();
@@ -1427,7 +1420,6 @@ impl DrawingCtx {
             self.with_discrete_layer(
                 stacking_ctx,
                 acquired_nodes,
-                values,
                 clipping,
                 None,
                 &mut |_an, dc| {
@@ -1549,13 +1541,11 @@ impl DrawingCtx {
         text: &Text,
         stacking_ctx: &StackingContext,
         acquired_nodes: &mut AcquiredNodes<'_>,
-        values: &ComputedValues,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
         self.with_discrete_layer(
             stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| {
@@ -1789,7 +1779,6 @@ impl DrawingCtx {
             self.with_discrete_layer(
                 &stacking_ctx,
                 acquired_nodes,
-                values,
                 clipping,
                 None,
                 &mut |an, dc| {
@@ -1823,7 +1812,6 @@ impl DrawingCtx {
             self.with_discrete_layer(
                 &stacking_ctx,
                 acquired_nodes,
-                values,
                 clipping,
                 None,
                 &mut |an, dc| {
diff --git a/src/image.rs b/src/image.rs
index 781f32fb..282bb3e4 100644
--- a/src/image.rs
+++ b/src/image.rs
@@ -114,6 +114,6 @@ impl ElementTrait for Image {
             stacking_ctx,
         };
 
-        draw_ctx.draw_layer(&layer, acquired_nodes, values, clipping)
+        draw_ctx.draw_layer(&layer, acquired_nodes, clipping)
     }
 }
diff --git a/src/marker.rs b/src/marker.rs
index 5c609127..63b5843f 100644
--- a/src/marker.rs
+++ b/src/marker.rs
@@ -191,7 +191,6 @@ impl Marker {
         draw_ctx.with_discrete_layer(
             &stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             clip,
             &mut |an, dc| node.draw_children(an, &cascaded, dc, clipping),
diff --git a/src/shapes.rs b/src/shapes.rs
index 73ea2fe4..ef01ed4d 100644
--- a/src/shapes.rs
+++ b/src/shapes.rs
@@ -153,7 +153,7 @@ fn draw_basic_shape(
         stacking_ctx,
     };
 
-    draw_ctx.draw_layer(&layer, acquired_nodes, values, clipping)
+    draw_ctx.draw_layer(&layer, acquired_nodes, clipping)
 }
 
 macro_rules! impl_draw {
diff --git a/src/structure.rs b/src/structure.rs
index d45cddd5..8700bcb4 100644
--- a/src/structure.rs
+++ b/src/structure.rs
@@ -46,7 +46,6 @@ impl ElementTrait for Group {
         draw_ctx.with_discrete_layer(
             &stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| node.draw_children(an, cascaded, dc, clipping),
@@ -90,7 +89,6 @@ impl ElementTrait for Switch {
         draw_ctx.with_discrete_layer(
             &stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| {
@@ -305,7 +303,6 @@ impl ElementTrait for Svg {
         draw_ctx.with_discrete_layer(
             &stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| {
@@ -608,7 +605,6 @@ impl ElementTrait for Link {
         draw_ctx.with_discrete_layer(
             &stacking_ctx,
             acquired_nodes,
-            values,
             clipping,
             None,
             &mut |an, dc| node.draw_children(an, &cascaded, dc, clipping),
diff --git a/src/text.rs b/src/text.rs
index e60ade78..a47c2de4 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -876,7 +876,7 @@ impl ElementTrait for Text {
             stacking_ctx,
         };
 
-        draw_ctx.draw_layer(&layer, acquired_nodes, values, clipping)
+        draw_ctx.draw_layer(&layer, acquired_nodes, clipping)
     }
 }