[librsvg: 6/38] Handle::get_node_geometry_with_viewport - inline in its two callers

[Federico Mena Quintero <federico src gnome org>]

commit e3126cb3ee93ca9bdf80e821c5af5fc982f54803
Author: Federico Mena Quintero <federico gnome org>
Date:   Fri Jun 19 18:38:47 2020 -0500

    Handle::get_node_geometry_with_viewport - inline in its two callers
    
    The only difference in the two callers was the viewport argument,
    which is our unit_rectangle() quasi-hack for the measuring case.
    Let's see if we can refactor that away.

 rsvg_internals/src/handle.rs | 68 ++++++++++++++++++++++----------------------
 1 file changed, 34 insertions(+), 34 deletions(-)
---
diff --git a/rsvg_internals/src/handle.rs b/rsvg_internals/src/handle.rs
index 6a061634..d10bca1f 100644
--- a/rsvg_internals/src/handle.rs
+++ b/rsvg_internals/src/handle.rs
@@ -105,36 +105,6 @@ impl Handle {
         }
     }
 
-    /// Returns (ink_rect, logical_rect)
-    fn get_node_geometry_with_viewport(
-        &self,
-        node: &Node,
-        viewport: Rect,
-        dpi: Dpi,
-        is_testing: bool,
-    ) -> Result<(Rect, Rect), RenderingError> {
-        let node = node.clone();
-        let root = self.document.root();
-
-        let target = cairo::ImageSurface::create(cairo::Format::Rgb24, 1, 1)?;
-        let cr = cairo::Context::new(&target);
-
-        let bbox = draw_tree(
-            DrawingMode::LimitToStack { node, root },
-            &cr,
-            viewport,
-            dpi,
-            true,
-            is_testing,
-            &mut AcquiredNodes::new(&self.document),
-        )?;
-
-        let ink_rect = bbox.ink_rect.unwrap_or_default();
-        let logical_rect = bbox.rect.unwrap_or_default();
-
-        Ok((ink_rect, logical_rect))
-    }
-
     /// Returns (ink_rect, logical_rect)
     pub fn get_geometry_sub(
         &self,
@@ -143,7 +113,6 @@ impl Handle {
         is_testing: bool,
     ) -> Result<(Rect, Rect), RenderingError> {
         let node = self.get_node_or_root(id)?;
-
         let root = self.document.root();
         let is_root = node == root;
 
@@ -159,7 +128,23 @@ impl Handle {
             }
         }
 
-        self.get_node_geometry_with_viewport(&node, unit_rectangle(), dpi, is_testing)
+        let target = cairo::ImageSurface::create(cairo::Format::Rgb24, 1, 1)?;
+        let cr = cairo::Context::new(&target);
+
+        let bbox = draw_tree(
+            DrawingMode::LimitToStack { node, root },
+            &cr,
+            unit_rectangle(),
+            dpi,
+            true,
+            is_testing,
+            &mut AcquiredNodes::new(&self.document),
+        )?;
+
+        let ink_rect = bbox.ink_rect.unwrap_or_default();
+        let logical_rect = bbox.rect.unwrap_or_default();
+
+        Ok((ink_rect, logical_rect))
     }
 
     fn get_node_or_root(&self, id: Option<&str>) -> Result<Node, RenderingError> {
@@ -178,10 +163,25 @@ impl Handle {
         is_testing: bool,
     ) -> Result<(cairo::Rectangle, cairo::Rectangle), RenderingError> {
         let node = self.get_node_or_root(id)?;
+        let root = self.document.root();
+
         let viewport = Rect::from(*viewport);
 
-        let (ink_rect, logical_rect) =
-            self.get_node_geometry_with_viewport(&node, viewport, dpi, is_testing)?;
+        let target = cairo::ImageSurface::create(cairo::Format::Rgb24, 1, 1)?;
+        let cr = cairo::Context::new(&target);
+
+        let bbox = draw_tree(
+            DrawingMode::LimitToStack { node, root },
+            &cr,
+            viewport,
+            dpi,
+            true,
+            is_testing,
+            &mut AcquiredNodes::new(&self.document),
+        )?;
+
+        let ink_rect = bbox.ink_rect.unwrap_or_default();
+        let logical_rect = bbox.rect.unwrap_or_default();
 
         Ok((
             cairo::Rectangle::from(ink_rect),