[librsvg: 3/13] create_pango_layout() - Get the writing_mode from the LayoutContext

[Marge Bot <marge-bot src gnome org>]

commit a274bcb5e97be7f508e13e03ce74b3a77c81704c
Author: Federico Mena Quintero <federico gnome org>
Date:   Thu Nov 4 10:51:51 2021 -0600

    create_pango_layout() - Get the writing_mode from the LayoutContext
    
    Part-of: <https://gitlab.gnome.org/GNOME/librsvg/-/merge_requests/626>

 src/text.rs | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)
---
diff --git a/src/text.rs b/src/text.rs
index 652e7b5b2..75192de49 100644
--- a/src/text.rs
+++ b/src/text.rs
@@ -352,12 +352,8 @@ impl MeasuredSpan {
         );
 
         let with_control_chars = wrap_with_direction_control_chars(&span.text, &bidi_control);
-        let layout = create_pango_layout(
-            draw_ctx,
-            layout_context.writing_mode,
-            &properties,
-            &with_control_chars,
-        );
+        let layout =
+            create_pango_layout(layout_context, draw_ctx, &properties, &with_control_chars);
         let (w, h) = layout.size();
 
         let w = f64::from(w) / f64::from(pango::SCALE);
@@ -1185,8 +1181,8 @@ fn wrap_with_direction_control_chars(s: &str, bidi_control: &BidiControl) -> Str
 }
 
 fn create_pango_layout(
+    layout_context: &LayoutContext,
     draw_ctx: &DrawingCtx,
-    writing_mode: WritingMode,
     props: &FontProperties,
     text: &str,
 ) -> pango::Layout {
@@ -1196,7 +1192,7 @@ fn create_pango_layout(
         pango_context.set_language(&pango::Language::from_string(lang.as_str()));
     }
 
-    pango_context.set_base_gravity(pango::Gravity::from(writing_mode));
+    pango_context.set_base_gravity(pango::Gravity::from(layout_context.writing_mode));
 
     match (props.unicode_bidi, props.direction) {
         (UnicodeBidi::BidiOverride, _) | (UnicodeBidi::Embed, _) => {
@@ -1208,7 +1204,7 @@ fn create_pango_layout(
         }
 
         (_, _) => {
-            pango_context.set_base_dir(pango::Direction::from(writing_mode));
+            pango_context.set_base_dir(pango::Direction::from(layout_context.writing_mode));
         }
     }