[librsvg: 8/37] Factor out NodeChars.make_span() from duplicated code

[Federico Mena Quintero <federico src gnome org>]

commit 10094bc0488a894caf503d16e3fc32ff693dfbe0
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue Oct 30 13:52:28 2018 -0600

    Factor out NodeChars.make_span() from duplicated code

 rsvg_internals/src/text.rs | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/rsvg_internals/src/text.rs b/rsvg_internals/src/text.rs
index 3ef793cc..d217c8d5 100644
--- a/rsvg_internals/src/text.rs
+++ b/rsvg_internals/src/text.rs
@@ -145,14 +145,17 @@ impl NodeChars {
         }
     }
 
-    fn measure(&self, node: &RsvgNode, values: &ComputedValues, draw_ctx: &DrawingCtx) -> f64 {
+    fn make_span(&self, node: &RsvgNode, values: &ComputedValues) -> Span {
         self.ensure_normalized_string(node, values);
 
-        let span = Span::new(
+        Span::new(
             self.space_normalized.borrow().as_ref().unwrap(),
             values.clone(),
-        );
+        )
+    }
 
+    fn measure(&self, node: &RsvgNode, values: &ComputedValues, draw_ctx: &DrawingCtx) -> f64 {
+        let span = self.make_span(node, values);
         let measured = MeasuredSpan::from_span(&span, draw_ctx);
 
         measured.layout_size.0
@@ -167,13 +170,7 @@ impl NodeChars {
         y: f64,
         clipping: bool,
     ) -> Result<(f64, f64), RenderingError> {
-        self.ensure_normalized_string(node, values);
-
-        let span = Span::new(
-            self.space_normalized.borrow().as_ref().unwrap(),
-            values.clone(),
-        );
-
+        let span = self.make_span(node, values);
         let measured = MeasuredSpan::from_span(&span, draw_ctx);
 
         let layout = &measured.layout;