[librsvg: 9/31] Pass the NormalizeParams to run_filters()

[Federico Mena Quintero <federico src gnome org>]

commit 7c458b044cac2e6b232482b221684d766125bda8
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Jun 2 16:06:07 2021 -0500

    Pass the NormalizeParams to run_filters()

 src/drawing_ctx.rs | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/src/drawing_ctx.rs b/src/drawing_ctx.rs
index a0ca2a3e..6f8dd894 100644
--- a/src/drawing_ctx.rs
+++ b/src/drawing_ctx.rs
@@ -720,7 +720,7 @@ impl DrawingCtx {
                             .stroke()
                             .0
                             .resolve(acquired_nodes, values.stroke_opacity().0, current_color)?
-                            .to_user_space(&bbox, saved_cr.draw_ctx, values),
+                            .to_user_space(&bbox, &temporary_draw_ctx, values),
                     );
 
                     let fill_paint_source = Rc::new(
@@ -728,16 +728,23 @@ impl DrawingCtx {
                             .fill()
                             .0
                             .resolve(acquired_nodes, values.fill_opacity().0, current_color)?
-                            .to_user_space(&bbox, saved_cr.draw_ctx, values),
+                            .to_user_space(&bbox, &temporary_draw_ctx, values),
                     );
 
+                    // Filter functions (like "blend()", not the <filter> element) require
+                    // being resolved in userSpaceonUse units, since that is the default
+                    // for primitive_units.  So, get the corresponding NormalizeParams
+                    // here and pass them down.
+                    let view_params = temporary_draw_ctx.push_coord_units(CoordUnits::UserSpaceOnUse);
+                    let user_space_params = NormalizeParams::new(values, &view_params);
+
                     (
                         temporary_draw_ctx.run_filters(
                             surface_to_filter,
                             &stacking_ctx.filter,
                             acquired_nodes,
                             &stacking_ctx.element_name,
-                            values,
+                            &user_space_params,
                             stroke_paint_source,
                             fill_paint_source,
                             current_color,
@@ -874,7 +881,7 @@ impl DrawingCtx {
         filters: &Filter,
         acquired_nodes: &mut AcquiredNodes<'_>,
         node_name: &str,
-        values: &ComputedValues,
+        user_space_params: &NormalizeParams,
         stroke_paint_source: Rc<UserSpacePaintSource>,
         fill_paint_source: Rc<UserSpacePaintSource>,
         current_color: RGBA,
@@ -886,16 +893,9 @@ impl DrawingCtx {
                 if let Ok(specs) = filter_list
                     .iter()
                     .map(|filter_value| {
-                        // Filter functions (like "blend()", not the <filter> element)
-                        // require being resolved in userSpaceonUse units, since that is
-                        // the default for primitive_units.  So, get the corresponding
-                        // NormalizeParams here and pass them down.
-                        let view_params = self.push_coord_units(CoordUnits::UserSpaceOnUse);
-                        let user_space_params = NormalizeParams::new(values, &view_params);
-
                         filter_value.to_filter_spec(
                             acquired_nodes,
-                            &user_space_params,
+                            user_space_params,
                             current_color,
                             self,
                             node_name,