[pango/fix-deadlocks2: 1/2] Revert "context: Cache metrics for the current font"

[Matthias Clasen <matthiasc src gnome org>]

commit bf0e61903c196c1715e4c29943a68e696f2b985b
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Mar 30 20:12:45 2021 -0400

    Revert "context: Cache metrics for the current font"
    
    This reverts commit 2214326a9669af950593da08c98505c62e27974a.

 pango/pango-context.c | 16 ----------------
 1 file changed, 16 deletions(-)
---
diff --git a/pango/pango-context.c b/pango/pango-context.c
index 90952add..9c385e80 100644
--- a/pango/pango-context.c
+++ b/pango/pango-context.c
@@ -63,8 +63,6 @@ struct _PangoContext
 
   PangoFontMap *font_map;
 
-  PangoFontMetrics *metrics;
-
   gboolean round_glyph_positions;
 };
 
@@ -123,9 +121,6 @@ pango_context_finalize (GObject *object)
   if (context->matrix)
     pango_matrix_free (context->matrix);
 
-  if (context->metrics)
-    pango_font_metrics_unref (context->metrics);
-
   G_OBJECT_CLASS (pango_context_parent_class)->finalize (object);
 }
 
@@ -1791,11 +1786,6 @@ pango_context_get_metrics (PangoContext               *context,
   if (!language)
     language = context->language;
 
-  if (desc == context->font_desc &&
-      language == context->language &&
-      context->metrics != NULL)
-    return pango_font_metrics_ref (context->metrics);
-
   current_fonts = pango_font_map_load_fontset (context->font_map, context, desc, language);
   metrics = get_base_metrics (current_fonts);
 
@@ -1810,10 +1800,6 @@ pango_context_get_metrics (PangoContext               *context,
 
   g_object_unref (current_fonts);
 
-  if (desc == context->font_desc &&
-      language == context->language)
-    context->metrics = pango_font_metrics_ref (metrics);
-
   return metrics;
 }
 
@@ -1823,8 +1809,6 @@ context_changed (PangoContext *context)
   context->serial++;
   if (context->serial == 0)
     context->serial++;
-
-  g_clear_pointer (&context->metrics, pango_font_metrics_unref);
 }
 
 /**