[librsvg: 11/48] Inline rsvg_load_set_node_atts() in its only caller



commit 2cecd9bd1563a8324b4612d6806e07764b16f293
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Sep 6 20:36:09 2018 -0500

    Inline rsvg_load_set_node_atts() in its only caller

 rsvg_internals/src/xml.rs | 15 ++++++++++++---
 1 file changed, 12 insertions(+), 3 deletions(-)
---
diff --git a/rsvg_internals/src/xml.rs b/rsvg_internals/src/xml.rs
index 50a14f1b..3fa36094 100644
--- a/rsvg_internals/src/xml.rs
+++ b/rsvg_internals/src/xml.rs
@@ -6,8 +6,8 @@ use glib::translate::*;
 use glib_sys;
 
 use handle::{self, RsvgHandle};
-use load::{rsvg_load_new_node, rsvg_load_set_node_atts};
-use node::{box_node, Node, RsvgNode};
+use load::rsvg_load_new_node;
+use node::{box_node, Node, NodeType, RsvgNode};
 use property_bag::PropertyBag;
 use tree::{RsvgTree, Tree};
 use util::utf8_cstr;
@@ -102,7 +102,16 @@ impl XmlState {
 
         self.set_current_node(Some(new_node.clone()));
 
-        rsvg_load_set_node_atts(handle, &new_node, name, pbag);
+        new_node.set_atts(&new_node, handle, pbag);
+
+        // The "svg" node is special; it will load its id/class
+        // attributes until the end, when sax_end_element_cb() calls
+        // rsvg_node_svg_apply_atts()
+        if new_node.get_type() != NodeType::Svg {
+            new_node.parse_style_attributes(handle, name, pbag);
+        }
+
+        new_node.set_overridden_properties();
     }
 }
 


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