[pango/wip/matthiasc/font-variations] [cairo] Don't set font variations on cairo_font_options_t

[Behdad Esfahbod <behdad src gnome org>]

commit e454f2548baa90a661ee597ed5374885fa48fd98
Author: Behdad Esfahbod <behdad behdad org>
Date:   Tue Dec 19 00:36:43 2017 -0500

    [cairo] Don't set font variations on cairo_font_options_t
    
    We pass them in through FcPattern to the cairo_face already, no need
    to pass here again.
    
    Yeah, I know... /tears

 pango/pangocairo-fcfont.c |    9 ---------
 1 files changed, 0 insertions(+), 9 deletions(-)
---
diff --git a/pango/pangocairo-fcfont.c b/pango/pangocairo-fcfont.c
index ef4273e..e153c13 100644
--- a/pango/pangocairo-fcfont.c
+++ b/pango/pangocairo-fcfont.c
@@ -226,7 +226,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
   double size;
   int i;
   cairo_font_options_t *options;
-  const char *variations;
 
   g_return_val_if_fail (PANGO_IS_CAIRO_FC_FONT_MAP (cffontmap), NULL);
   g_return_val_if_fail (pattern != NULL, NULL);
@@ -253,11 +252,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
   cairo_matrix_scale (&font_matrix, size, size);
 
   options = pango_fc_font_key_get_context_key (key);
-  variations = pango_fc_font_key_get_variations (key);
-  if (variations) {
-    options = cairo_font_options_copy (options);
-    cairo_font_options_set_variations (options, variations);
-  }
 
   _pango_cairo_font_private_initialize (&cffont->cf_priv,
                                        (PangoCairoFont *) cffont,
@@ -266,9 +260,6 @@ _pango_cairo_fc_font_new (PangoCairoFcFontMap *cffontmap,
                                        pango_fc_font_key_get_matrix (key),
                                        &font_matrix);
 
-  if (variations)
-    cairo_font_options_destroy (options);
-
   ((PangoFcFont *)(cffont))->is_hinted = _pango_cairo_font_private_is_metrics_hinted (&cffont->cf_priv);
 
   return (PangoFcFont *) cffont;