From: Matthias Clasen Date: Fri, 10 Jan 2020 06:36:23 +0000 (-0500) Subject: css: Simplify compute for font variations X-Git-Tag: archive/raspbian/4.4.1+ds1-2+rpi1^2~18^2~20^2~356^2~1 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=99aa47185ea2cc90f62b318d14e2a19a2abc07a3;p=gtk4.git css: Simplify compute for font variations Just like font features, font variations are stored as a hash table mapping strings to pure number values, which never change during compute. --- diff --git a/gtk/gtkcssfontvariationsvalue.c b/gtk/gtkcssfontvariationsvalue.c index ed6dfd8e3b..e15a8c715b 100644 --- a/gtk/gtkcssfontvariationsvalue.c +++ b/gtk/gtkcssfontvariationsvalue.c @@ -56,29 +56,7 @@ gtk_css_value_font_variations_compute (GtkCssValue *specified, GtkCssStyle *style, GtkCssStyle *parent_style) { - GHashTableIter iter; - gpointer name, coord; - GtkCssValue *computed_coord; - GtkCssValue *result; - gboolean changes = FALSE; - - result = gtk_css_font_variations_value_new_empty (); - - g_hash_table_iter_init (&iter, specified->axes); - while (g_hash_table_iter_next (&iter, &name, &coord)) - { - computed_coord = _gtk_css_value_compute (coord, property_id, provider, style, parent_style); - changes |= computed_coord != coord; - gtk_css_font_variations_value_add_axis (result, name, computed_coord); - } - - if (!changes) - { - _gtk_css_value_unref (result); - result = _gtk_css_value_ref (specified); - } - - return result; + return _gtk_css_value_ref (specified); } static gboolean