[gtk/css-lookup-caching: 93/96] Rename gtk_css_lookup_merge to _fill

[Matthias Clasen <matthiasc src gnome org>]

commit 81ac3a88dc023c2ca55ea305ae39bfb90c012be6
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Feb 13 17:35:51 2020 -0500

    Rename gtk_css_lookup_merge to _fill

 gtk/gtkcsslookup.c        | 15 ++++++++++++---
 gtk/gtkcsslookupprivate.h |  2 +-
 gtk/gtkcssprovider.c      |  2 +-
 3 files changed, 14 insertions(+), 5 deletions(-)
---
diff --git a/gtk/gtkcsslookup.c b/gtk/gtkcsslookup.c
index 7e52359b65..dde931902e 100644
--- a/gtk/gtkcsslookup.c
+++ b/gtk/gtkcsslookup.c
@@ -68,10 +68,19 @@ gtk_css_lookup_unref (GtkCssLookup *lookup)
     gtk_css_lookup_free (lookup);
 }
 
+/*
+ * gtk_css_lookup_fill:
+ * @lookup: the #GtkCssLookup to populate
+ * @values: array of values to place into unpopulated slots in @lookup
+ * @n_values: the length of @values
+ *
+ * Add the @values to @lookup for properties for which
+ * @lookup does not have a value yet.
+ */
 void
-gtk_css_lookup_merge (GtkCssLookup      *lookup,
-                      GtkCssLookupValue *values,
-                      guint              n_values)
+gtk_css_lookup_fill (GtkCssLookup      *lookup,
+                     GtkCssLookupValue *values,
+                     guint              n_values)
 {
   int i, j;
 
diff --git a/gtk/gtkcsslookupprivate.h b/gtk/gtkcsslookupprivate.h
index f73d8f56de..b7113076a4 100644
--- a/gtk/gtkcsslookupprivate.h
+++ b/gtk/gtkcsslookupprivate.h
@@ -46,7 +46,7 @@ GtkCssLookup *           gtk_css_lookup_new (void);
 GtkCssLookup *           gtk_css_lookup_ref (GtkCssLookup *lookup);
 void                     gtk_css_lookup_unref (GtkCssLookup *lookup);
 
-void                     gtk_css_lookup_merge                   (GtkCssLookup               *lookup,
+void                     gtk_css_lookup_fill                    (GtkCssLookup               *lookup,
                                                                  GtkCssLookupValue          *values,
                                                                  guint                       n_values);
 GtkCssSection *          gtk_css_lookup_get_section             (GtkCssLookup               *lookup,
diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 126447471b..b843cbe3b9 100644
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -479,7 +479,7 @@ gtk_css_style_provider_lookup (GtkStyleProvider             *provider,
           if (ruleset->styles == NULL)
             continue;
 
-          gtk_css_lookup_merge (lookup, (GtkCssLookupValue *)ruleset->styles, ruleset->n_styles);
+          gtk_css_lookup_fill (lookup, (GtkCssLookupValue *)ruleset->styles, ruleset->n_styles);
         }
 
       g_ptr_array_free (tree_rules, TRUE);