[pango/visible-things: 28/40] Pass shape flags through to pangofc_shape

[Matthias Clasen <matthiasc src gnome org>]

commit a1cdb20daceb04222fb083ddf93d9d01d7df2fd6
Author: Matthias Clasen <mclasen redhat com>
Date:   Sun Jul 7 13:07:18 2019 -0400

    Pass shape flags through to pangofc_shape

 pango/pangofc-shape.c   | 15 ++++++++-------
 pango/pangohb-private.h | 10 +++++-----
 pango/shape.c           |  7 +++----
 3 files changed, 16 insertions(+), 16 deletions(-)
---
diff --git a/pango/pangofc-shape.c b/pango/pangofc-shape.c
index 86b620a2..765cd382 100644
--- a/pango/pangofc-shape.c
+++ b/pango/pangofc-shape.c
@@ -114,14 +114,15 @@ apply_extra_attributes (GSList       *attrs,
 }
 
 void
-pango_hb_shape (PangoFont           *font,
-                const char          *item_text,
-                unsigned int         item_length,
-                const PangoAnalysis *analysis,
-                PangoGlyphString    *glyphs,
-                const char          *paragraph_text,
-                unsigned int         paragraph_length)
+pango_hb_shape (const char          *item_text,
+               unsigned int         item_length,
+               const char          *paragraph_text,
+               unsigned int         paragraph_length,
+               const PangoAnalysis *analysis,
+                PangoShapeFlags      flags,
+               PangoGlyphString    *glyphs)
 {
+  PangoFont *font = analysis->font;
   hb_font_t *hb_font;
   hb_buffer_t *hb_buffer;
   hb_direction_t hb_direction;
diff --git a/pango/pangohb-private.h b/pango/pangohb-private.h
index 217bdb28..f30bded3 100644
--- a/pango/pangohb-private.h
+++ b/pango/pangohb-private.h
@@ -28,13 +28,13 @@
 
 G_BEGIN_DECLS
 
-void pango_hb_shape (PangoFont           *font,
-                     const char          *item_text,
+void pango_hb_shape (const char          *item_text,
                      unsigned int         item_length,
-                     const PangoAnalysis *analysis,
-                     PangoGlyphString    *glyphs,
                      const char          *paragraph_text,
-                     unsigned int         paragraph_length);
+                     unsigned int         paragraph_length,
+                     const PangoAnalysis *analysis,
+                     PangoShapeFlags      flags,
+                     PangoGlyphString    *glyphs);
 
 G_END_DECLS
 
diff --git a/pango/shape.c b/pango/shape.c
index 29e7563b..44f407ae 100644
--- a/pango/shape.c
+++ b/pango/shape.c
@@ -194,10 +194,9 @@ pango_shape_with_options (const gchar      *item_text,
 
   if (analysis->font)
     {
-      pango_hb_shape (analysis->font,
-                      item_text, item_length,
-                      analysis, glyphs,
-                      paragraph_text, paragraph_length);
+      pango_hb_shape (item_text, item_length,
+                      paragraph_text, paragraph_length,
+                      analysis, flags, glyphs);
 
       if (G_UNLIKELY (glyphs->num_glyphs == 0))
        {