[librsvg: 1/6] document: shorten code
- From: Federico Mena Quintero <federico src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [librsvg: 1/6] document: shorten code
- Date: Fri, 1 Nov 2019 19:07:39 +0000 (UTC)
commit 8fc9bf12176102a3f5825723c792a60e037562b2
Author: Paolo Borelli <pborelli gnome org>
Date: Fri Nov 1 12:28:05 2019 +0100
document: shorten code
rsvg_internals/src/document.rs | 34 +++++++++++-----------------------
1 file changed, 11 insertions(+), 23 deletions(-)
---
diff --git a/rsvg_internals/src/document.rs b/rsvg_internals/src/document.rs
index afd18137..abb8ff22 100644
--- a/rsvg_internals/src/document.rs
+++ b/rsvg_internals/src/document.rs
@@ -40,23 +40,6 @@ pub struct Document {
}
impl Document {
- pub fn new(
- mut tree: RsvgNode,
- ids: HashMap<String, RsvgNode>,
- load_options: LoadOptions,
- ) -> Document {
- let values = ComputedValues::default();
- tree.cascade(&values);
-
- Document {
- tree,
- ids,
- externs: RefCell::new(Resources::new()),
- images: RefCell::new(Images::new()),
- load_options,
- }
- }
-
pub fn load_from_stream(
load_options: &LoadOptions,
stream: &gio::InputStream,
@@ -311,16 +294,21 @@ impl DocumentBuilder {
pub fn build(mut self) -> Result<Document, LoadingError> {
match self.tree {
None => Err(LoadingError::SvgHasNoElements),
- Some(ref root) if root.borrow().get_type() == NodeType::Svg => {
+ Some(ref mut root) if root.borrow().get_type() == NodeType::Svg => {
for mut node in root.descendants() {
node.borrow_mut().set_style(&self.css_rules);
}
- Ok(Document::new(
- self.tree.take().unwrap(),
- self.ids,
- self.load_options.clone(),
- ))
+ let values = ComputedValues::default();
+ root.cascade(&values);
+
+ Ok(Document {
+ tree: self.tree.take().unwrap(),
+ ids: self.ids,
+ externs: RefCell::new(Resources::new()),
+ images: RefCell::new(Images::new()),
+ load_options: self.load_options.clone(),
+ })
}
_ => Err(LoadingError::RootElementIsNotSvg),
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]