rsvg_drawing_ctx_draw_node_from_stack(): Don't take a dominate argument; it was always passed as 0

We'll remove the dominate argument gradually.  The C callers were
always passing 0, so don't make them pass this and instead pass that
value from the Rust implementation of that function.

4 files changed, 5 insertions, 13 deletions

diff --git a/librsvg/rsvg-drawing-ctx.c b/librsvg/rsvg-drawing-ctx.c
index 84893f8f..7bbcff28 100644
--- a/librsvg/rsvg-drawing-ctx.c
+++ b/librsvg/rsvg-drawing-ctx.c
@@ -485,7 +485,7 @@ rsvg_drawing_ctx_draw_node_on_surface (RsvgDrawingCtx *ctx,
     ctx->rect.width = width;
     ctx->rect.height = height;
 
-    rsvg_drawing_ctx_draw_node_from_stack (ctx, node, 0, FALSE);
+    rsvg_drawing_ctx_draw_node_from_stack (ctx, node, FALSE);
 
     cairo_destroy (ctx->cr);
     ctx->cr = save_cr;
diff --git a/librsvg/rsvg-drawing-ctx.h b/librsvg/rsvg-drawing-ctx.h
index 1641f69c..b8729582 100644
--- a/librsvg/rsvg-drawing-ctx.h
+++ b/librsvg/rsvg-drawing-ctx.h
@@ -96,7 +96,6 @@ void rsvg_drawing_ctx_restore_stack (RsvgDrawingCtx *ctx,
 G_GNUC_INTERNAL
 void rsvg_drawing_ctx_draw_node_from_stack (RsvgDrawingCtx *ctx,
                                             RsvgNode *node,
-                                            int dominate,
                                             gboolean clipping);
 
 G_GNUC_INTERNAL
diff --git a/librsvg/rsvg-handle.c b/librsvg/rsvg-handle.c
index 06dc61be..7c7e288c 100644
--- a/librsvg/rsvg-handle.c
+++ b/librsvg/rsvg-handle.c
@@ -813,7 +813,7 @@ rsvg_handle_render_cairo_sub (RsvgHandle * handle, cairo_t * cr, const char *id)
     cairo_save (cr);
 
     rsvg_handle_cascade (handle);
-    rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, 0, FALSE);
+    rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, FALSE);
 
     cairo_restore (cr);
 
@@ -941,7 +941,7 @@ rsvg_handle_get_dimensions_sub (RsvgHandle * handle, RsvgDimensionData * dimensi
         rsvg_drawing_ctx_add_node_and_ancestors_to_stack (draw, sself);
 
         rsvg_handle_cascade (handle);
-        rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, 0, FALSE);
+        rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, FALSE);
 
         bbox = rsvg_drawing_ctx_get_bbox (draw);
         rsvg_bbox_get_rect (bbox, NULL, &ink_rect);
@@ -1028,7 +1028,7 @@ rsvg_handle_get_position_sub (RsvgHandle * handle, RsvgPositionData * position_d
     rsvg_drawing_ctx_add_node_and_ancestors_to_stack (draw, node);
 
     rsvg_handle_cascade (handle);
-    rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, 0, FALSE);
+    rsvg_drawing_ctx_draw_node_from_stack (draw, handle->priv->treebase, FALSE);
     bbox = rsvg_drawing_ctx_get_bbox (draw);
     rsvg_bbox_get_rect (bbox, NULL, &ink_rect);
     rsvg_drawing_ctx_free (draw);
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 39101383..9f2308da 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -512,7 +512,6 @@ pub fn draw_node_from_stack(
 pub extern "C" fn rsvg_drawing_ctx_draw_node_from_stack(
     draw_ctx: *mut RsvgDrawingCtx,
     raw_node: *const RsvgNode,
-    dominate: i32,
     clipping: glib_sys::gboolean,
 ) {
     assert!(!draw_ctx.is_null());
@@ -522,13 +521,7 @@ pub extern "C" fn rsvg_drawing_ctx_draw_node_from_stack(
 
     let clipping: bool = from_glib(clipping);
 
-    draw_node_from_stack(
-        draw_ctx,
-        &node.get_cascaded_values(),
-        node,
-        dominate,
-        clipping,
-    );
+    draw_node_from_stack(draw_ctx, &node.get_cascaded_values(), node, 0, clipping);
 }
 
 pub struct AcquiredNode(*const RsvgDrawingCtx, *mut RsvgNode);