[librsvg: 66/95] node_set_atts(): Inline register_node_in_defs() here



commit 08807b433e6bb3659aee07c0d0a0512cead2a2d0
Author: Federico Mena Quintero <federico gnome org>
Date:   Wed Feb 21 11:35:01 2018 -0600

    node_set_atts(): Inline register_node_in_defs() here

 rsvg-base.c | 19 +++++--------------
 1 file changed, 5 insertions(+), 14 deletions(-)
---
diff --git a/rsvg-base.c b/rsvg-base.c
index 80c92830..70bae2c9 100644
--- a/rsvg-base.c
+++ b/rsvg-base.c
@@ -218,17 +218,6 @@ add_node_to_handle (RsvgHandle *handle, RsvgNode *node)
     g_ptr_array_add (handle->priv->all_nodes, rsvg_node_ref (node));
 }
 
-static void
-register_node_in_defs (RsvgHandle *handle, RsvgNode *node, RsvgPropertyBag *atts)
-{
-    const char *id;
-
-    id = rsvg_property_bag_lookup (atts, "id");
-    if (id) {
-        rsvg_defs_register_node_by_id (handle->priv->defs, id, node);
-    }
-}
-
 static void
 push_element_name (RsvgHandle *handle, const char *name)
 {
@@ -404,7 +393,11 @@ node_set_atts (RsvgNode * node, RsvgHandle *handle, const NodeCreator *creator,
     const char *id;
     const char *klazz;
 
-    register_node_in_defs (handle, node, atts);
+    id = rsvg_property_bag_lookup (atts, "id");
+    if (id) {
+        rsvg_defs_register_node_by_id (handle->priv->defs, id, node);
+    }
+
     rsvg_node_set_atts (node, handle, atts);
 
     /* The "svg" node is special; it will load its id/class
@@ -412,8 +405,6 @@ node_set_atts (RsvgNode * node, RsvgHandle *handle, const NodeCreator *creator,
      * _rsvg_node_svg_apply_atts()
      */
     if (rsvg_node_get_type (node) != RSVG_NODE_TYPE_SVG) {
-        id = rsvg_property_bag_lookup (atts, "id");
-
         if (creator->supports_class_attribute)
             klazz = rsvg_property_bag_lookup (atts, "class");
         else


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]