[librsvg: 3/8] RsvgNode.element_name() - Moved from NodeType
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 3/8] RsvgNode.element_name() - Moved from NodeType
- Date: Tue, 21 May 2019 00:46:45 +0000 (UTC)
commit 8cd79f4b4f189cf1cb14fc874c052279aca776fe
Author: Federico Mena Quintero <federico gnome org>
Date: Thu May 16 19:00:31 2019 -0500
RsvgNode.element_name() - Moved from NodeType
rsvg_internals/src/css.rs | 2 +-
rsvg_internals/src/node.rs | 14 ++++++--------
2 files changed, 7 insertions(+), 9 deletions(-)
---
diff --git a/rsvg_internals/src/css.rs b/rsvg_internals/src/css.rs
index a6f4cd0b..05c9bb74 100644
--- a/rsvg_internals/src/css.rs
+++ b/rsvg_internals/src/css.rs
@@ -225,7 +225,7 @@ impl CssRules {
//
// This is basically a semi-compliant CSS2 selection engine
- let element_name = node.get_type().element_name();
+ let element_name = node.element_name();
let id = node.get_id();
// *
diff --git a/rsvg_internals/src/node.rs b/rsvg_internals/src/node.rs
index d09fc90f..1d4db0e3 100644
--- a/rsvg_internals/src/node.rs
+++ b/rsvg_internals/src/node.rs
@@ -410,9 +410,13 @@ pub enum NodeType {
FilterPrimitiveTurbulence,
}
-impl NodeType {
+impl RsvgNode {
+ pub fn get_type(&self) -> NodeType {
+ self.borrow().node_type
+ }
+
pub fn element_name(&self) -> &'static str {
- match self {
+ match self.get_type() {
NodeType::Chars => "rsvg-chars", // Dummy element name for chars
NodeType::Circle => "circle",
NodeType::ClipPath => "clipPath",
@@ -468,12 +472,6 @@ impl NodeType {
NodeType::FilterPrimitiveTurbulence => "feTurbulence",
}
}
-}
-
-impl RsvgNode {
- pub fn get_type(&self) -> NodeType {
- self.borrow().node_type
- }
pub fn get_id(&self) -> Option<&str> {
self.borrow().id.as_ref().map(String::as_str)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]