[librsvg] use: shorten code



commit 824af3fc6ef56bb34cd6f029d1cc2c68f692554c
Author: Paolo Borelli <pborelli gnome org>
Date:   Sat Apr 18 09:38:00 2020 +0200

    use: shorten code

 rsvg_internals/src/drawing_ctx.rs | 6 ++----
 rsvg_internals/src/structure.rs   | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)
---
diff --git a/rsvg_internals/src/drawing_ctx.rs b/rsvg_internals/src/drawing_ctx.rs
index 142bfffb..903f0359 100644
--- a/rsvg_internals/src/drawing_ctx.rs
+++ b/rsvg_internals/src/drawing_ctx.rs
@@ -1118,6 +1118,7 @@ impl DrawingCtx {
         node: &Node,
         acquired_nodes: &mut AcquiredNodes,
         cascaded: &CascadedValues<'_>,
+        link: Option<&Fragment>,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
         // <use> is an element that is used directly, unlike
@@ -1136,9 +1137,6 @@ impl DrawingCtx {
             }
         })?;
 
-        let use_ = borrow_element_as!(node, Use);
-        let link = use_.get_link();
-
         if link.is_none() {
             return Ok(self.empty_bbox());
         }
@@ -1165,7 +1163,7 @@ impl DrawingCtx {
 
         let values = cascaded.get();
         let params = self.get_view_params();
-        let use_rect = use_.get_rect(values, &params);
+        let use_rect = borrow_element_as!(node, Use).get_rect(values, &params);
 
         // width or height set to 0 disables rendering of the element
         // https://www.w3.org/TR/SVG/struct.html#UseElementWidthAttribute
diff --git a/rsvg_internals/src/structure.rs b/rsvg_internals/src/structure.rs
index 4614cfc9..d1325bbb 100644
--- a/rsvg_internals/src/structure.rs
+++ b/rsvg_internals/src/structure.rs
@@ -273,10 +273,6 @@ pub struct Use {
 }
 
 impl Use {
-    pub fn get_link(&self) -> Option<&Fragment> {
-        self.link.as_ref()
-    }
-
     pub fn get_rect(&self, values: &ComputedValues, params: &ViewParams) -> Rect {
         let x = self.x.normalize(values, &params);
         let y = self.y.normalize(values, &params);
@@ -335,7 +331,7 @@ impl Draw for Use {
         draw_ctx: &mut DrawingCtx,
         clipping: bool,
     ) -> Result<BoundingBox, RenderingError> {
-        draw_ctx.draw_from_use_node(node, acquired_nodes, cascaded, clipping)
+        draw_ctx.draw_from_use_node(node, acquired_nodes, cascaded, self.link.as_ref(), clipping)
     }
 }
 


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