css: Add more currentcolor style tests

These tests check various situations with inheritance and
currentColor. In particular the caret-color test was not
working correctly before we handled used values explicitly.

docs/reference/gtk/css-properties.md

@@ -21,7 +21,7 @@ Percentage
 : %, calc()
 
 Angle
-: deg, grad, turn, calc()
+: deg, rad, grad, turn, calc()
 
 Time
 : s, ms, calc()

gtk/css/gtkcssparser.c

@@ -812,6 +812,26 @@ gtk_css_parser_warn_syntax (GtkCssParser *self,
   va_end (args);
 }
 
+void
+gtk_css_parser_warn_deprecated (GtkCssParser *self,
+                                 const char   *format,
+                                 ...)
+{
+  va_list args;
+  GError *error;
+
+  va_start (args, format);
+  error = g_error_new_valist (GTK_CSS_PARSER_WARNING,
+                              GTK_CSS_PARSER_WARNING_DEPRECATED,
+                              format, args);
+  gtk_css_parser_emit_error (self,
+                             gtk_css_parser_get_start_location (self),
+                             gtk_css_parser_get_end_location (self),
+                             error);
+  g_error_free (error);
+  va_end (args);
+}
+
 gboolean
 gtk_css_parser_consume_function (GtkCssParser *self,
                                  guint         min_args,
@@ -1300,6 +1320,9 @@ gtk_css_parser_has_references (GtkCssParser *self)
   gboolean ret = FALSE;
   int inner_blocks = 0, i;
 
+  /* We don't want gtk_css_parser_ensure_token to expand references on us here */
+  g_assert (self->n_refs == 0);
+
   gtk_css_tokenizer_save (tokenizer);
 
   do {
@@ -1315,7 +1338,7 @@ gtk_css_parser_has_references (GtkCssParser *self)
           if (gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_PARENS) ||
               gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_SQUARE))
             {
-              goto error;
+              goto done;
             }
         }
 
@@ -1338,7 +1361,7 @@ gtk_css_parser_has_references (GtkCssParser *self)
           inner_blocks++;
           gtk_css_parser_start_block (self);
 
-          if (!ret && is_var)
+          if (is_var)
             {
               token = gtk_css_parser_get_token (self);
 
@@ -1346,18 +1369,18 @@ gtk_css_parser_has_references (GtkCssParser *self)
                 {
                   const char *var_name = gtk_css_token_get_string (token);
 
-                  if (var_name[0] != '-' || var_name[1] != '-')
-                    goto error;
+                  if (strlen (var_name) < 3 || var_name[0] != '-' || var_name[1] != '-')
+                    goto done;
 
                   gtk_css_parser_consume_token (self);
 
                   if (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_EOF) &&
                       !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_COMMA))
-                    {
-                      goto error;
-                    }
+                    goto done;
 
                   ret = TRUE;
+                  /* We got our answer. Now get it out as fast as possible! */
+                  goto done;
                 }
             }
         }
@@ -1365,18 +1388,7 @@ gtk_css_parser_has_references (GtkCssParser *self)
   while (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_SEMICOLON) &&
          !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_CLOSE_CURLY));
 
-  if (inner_blocks > 0)
-    goto error;
-
-  g_assert (tokenizer == get_tokenizer (self));
-
-  gtk_css_tokenizer_restore (tokenizer);
-  self->location = *gtk_css_tokenizer_get_location (tokenizer);
-  gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);
-
-  return ret;
-
-error:
+done:
   for (i = 0; i < inner_blocks; i++)
     gtk_css_parser_end_block (self);
 
@@ -1386,7 +1398,7 @@ error:
   self->location = *gtk_css_tokenizer_get_location (tokenizer);
   gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);
 
-  return FALSE;
+  return ret;
 }
 
 static void
@@ -1482,9 +1494,9 @@ gtk_css_parser_parse_value_into_token_stream (GtkCssParser *self)
                   GtkCssVariableValueReference ref;
                   char *var_name = g_strdup (gtk_css_token_get_string (token));
 
-                  if (var_name[0] != '-' || var_name[1] != '-')
+                  if (strlen (var_name) < 3 || var_name[0] != '-' || var_name[1] != '-')
                     {
-                      gtk_css_parser_error_value (self, "Invalid variable name: %s", var_name);
+                      gtk_css_parser_error_syntax (self, "Invalid variable name: %s", var_name);
                       g_free (var_name);
                       goto error;
                     }
@@ -1527,6 +1539,20 @@ gtk_css_parser_parse_value_into_token_stream (GtkCssParser *self)
 
                   gtk_css_parser_references_append (&refs, &ref);
                 }
+              else
+                {
+                  if (gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
+                    {
+                      gtk_css_parser_error_syntax (self, "Missing variable name");
+                    }
+                  else
+                    {
+                      char *s = gtk_css_token_to_string (token);
+                      gtk_css_parser_error_syntax (self, "Expected a variable name, not %s", s);
+                      g_free (s);
+                    }
+                  goto error;
+                }
             }
         }
     }

gtk/css/gtkcssparserprivate.h

@@ -120,6 +120,9 @@ void                    gtk_css_parser_warn                     (GtkCssParser
 void                    gtk_css_parser_warn_syntax              (GtkCssParser                   *self,
                                                                  const char                     *format,
                                                                  ...) G_GNUC_PRINTF(2, 3);
+void                    gtk_css_parser_warn_deprecated          (GtkCssParser                   *self,
+                                                                 const char                     *format,
+                                                                 ...) G_GNUC_PRINTF(2, 3);
 
 
 gboolean                gtk_css_parser_has_token                (GtkCssParser                   *self,

gtk/deprecated/gtkcellrendererspinner.c

@@ -253,7 +253,7 @@ gtk_cell_renderer_spinner_update_size (GtkCellRendererSpinner *cell,
   node = gtk_style_context_get_node (context);
   gtk_icon_size_set_style_classes (node, priv->icon_size);
   style = gtk_css_node_get_style (node);
-  priv->size = _gtk_css_number_value_get (style->icon->icon_size, 100);
+  priv->size = gtk_css_number_value_get (style->icon->icon_size, 100);
 
   gtk_style_context_restore (context);
 }

gtk/deprecated/gtkcellrenderertoggle.c

@@ -370,7 +370,7 @@ static int
 calc_indicator_size (GtkStyleContext *context)
 {
   GtkCssStyle *style = gtk_style_context_lookup_style (context);
-  return _gtk_css_number_value_get (style->icon->icon_size, 100);
+  return gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 static void

gtk/deprecated/gtkstylecontext.c

@@ -860,10 +860,10 @@ gtk_style_context_get_border (GtkStyleContext *context,
 
   style = gtk_style_context_lookup_style (context);
 
-  border->top = round (_gtk_css_number_value_get (style->border->border_top_width, 100));
-  border->right = round (_gtk_css_number_value_get (style->border->border_right_width, 100));
-  border->bottom = round (_gtk_css_number_value_get (style->border->border_bottom_width, 100));
-  border->left = round (_gtk_css_number_value_get (style->border->border_left_width, 100));
+  border->top = round (gtk_css_number_value_get (style->border->border_top_width, 100));
+  border->right = round (gtk_css_number_value_get (style->border->border_right_width, 100));
+  border->bottom = round (gtk_css_number_value_get (style->border->border_bottom_width, 100));
+  border->left = round (gtk_css_number_value_get (style->border->border_left_width, 100));
 }
 
 /**
@@ -886,10 +886,10 @@ gtk_style_context_get_padding (GtkStyleContext *context,
 
   style = gtk_style_context_lookup_style (context);
 
-  padding->top = round (_gtk_css_number_value_get (style->size->padding_top, 100));
-  padding->right = round (_gtk_css_number_value_get (style->size->padding_right, 100));
-  padding->bottom = round (_gtk_css_number_value_get (style->size->padding_bottom, 100));
-  padding->left = round (_gtk_css_number_value_get (style->size->padding_left, 100));
+  padding->top = round (gtk_css_number_value_get (style->size->padding_top, 100));
+  padding->right = round (gtk_css_number_value_get (style->size->padding_right, 100));
+  padding->bottom = round (gtk_css_number_value_get (style->size->padding_bottom, 100));
+  padding->left = round (gtk_css_number_value_get (style->size->padding_left, 100));
 }
 
 /**
@@ -912,10 +912,10 @@ gtk_style_context_get_margin (GtkStyleContext *context,
 
   style = gtk_style_context_lookup_style (context);
 
-  margin->top = round (_gtk_css_number_value_get (style->size->margin_top, 100));
-  margin->right = round (_gtk_css_number_value_get (style->size->margin_right, 100));
-  margin->bottom = round (_gtk_css_number_value_get (style->size->margin_bottom, 100));
-  margin->left = round (_gtk_css_number_value_get (style->size->margin_left, 100));
+  margin->top = round (gtk_css_number_value_get (style->size->margin_top, 100));
+  margin->right = round (gtk_css_number_value_get (style->size->margin_right, 100));
+  margin->bottom = round (gtk_css_number_value_get (style->size->margin_bottom, 100));
+  margin->left = round (gtk_css_number_value_get (style->size->margin_left, 100));
 }
 
 void
@@ -928,10 +928,10 @@ _gtk_style_context_get_cursor_color (GtkStyleContext *context,
   style = gtk_style_context_lookup_style (context);
 
   if (primary_color)
-    *primary_color = *gtk_css_color_value_get_rgba (style->font->caret_color ? style->font->caret_color : style->core->color);
+    *primary_color = *gtk_css_color_value_get_rgba (style->used->caret_color);
 
   if (secondary_color)
-    *secondary_color = *gtk_css_color_value_get_rgba (style->font->secondary_caret_color ? style->font->secondary_caret_color : style->core->color);
+    *secondary_color = *gtk_css_color_value_get_rgba (style->used->secondary_caret_color);
 }
 
 /**

gtk/deprecated/gtktreeview.c

@@ -2691,8 +2691,8 @@ gtk_tree_view_get_expander_size (GtkTreeView *tree_view)
   gtk_style_context_add_class (context, "expander");
 
   style = gtk_style_context_lookup_style (context);
-  min_width = _gtk_css_number_value_get (style->size->min_width, 100);
-  min_height = _gtk_css_number_value_get (style->size->min_height, 100);
+  min_width = gtk_css_number_value_get (style->size->min_width, 100);
+  min_height = gtk_css_number_value_get (style->size->min_height, 100);
 
   gtk_style_context_restore (context);
 
@@ -5521,7 +5521,7 @@ get_separator_height (GtkTreeView *tree_view)
   gtk_style_context_add_class (context, "separator");
 
   style = gtk_style_context_lookup_style (context);
-  d = _gtk_css_number_value_get (style->size->min_height, 100);
+  d = gtk_css_number_value_get (style->size->min_height, 100);
 
   if (d < 1)
     min_size = ceil (d);

gtk/gskpango.c

@@ -356,7 +356,7 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
 
       node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
       style = gtk_css_node_get_style (node);
-      fg_rgba = gtk_css_color_value_get_rgba (style->core->color);
+      fg_rgba = gtk_css_color_value_get_rgba (style->used->color);
     }
   else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget))
     {
@@ -365,7 +365,7 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
 
       node = gtk_widget_get_css_node (crenderer->widget);
       style = gtk_css_node_get_style (node);
-      fg_rgba = gtk_css_color_value_get_rgba (style->background->background_color);
+      fg_rgba = gtk_css_color_value_get_rgba (style->used->background_color);
     }
   else
     fg_rgba = appearance->fg_rgba;

gtk/gtkaboutdialog.c

@@ -1696,12 +1696,12 @@ follow_if_link (GtkAboutDialog *about,
 
       if (uri && !g_ptr_array_find_with_equal_func (about->visited_links, uri, (GCompareFunc)strcmp, NULL))
         {
-          GdkRGBA visited_link_color;
+          const GdkRGBA *visited_link_color;
           GtkCssStyle *style;
 
           style = gtk_css_node_get_style (about->visited_link_node);
-          visited_link_color = *gtk_css_color_value_get_rgba (style->core->color);
-          g_object_set (G_OBJECT (tag), "foreground-rgba", &visited_link_color, NULL);
+          visited_link_color = gtk_css_color_value_get_rgba (style->used->color);
+          g_object_set (G_OBJECT (tag), "foreground-rgba", visited_link_color, NULL);
 
           g_ptr_array_add (about->visited_links, g_strdup (uri));
         }
@@ -1836,17 +1836,18 @@ text_buffer_new (GtkAboutDialog  *about,
   char **p;
   char *q0, *q1, *q2, *r1, *r2;
   GtkTextBuffer *buffer;
-  GdkRGBA color;
-  GdkRGBA link_color;
-  GdkRGBA visited_link_color;
+  const GdkRGBA *color;
+  const GdkRGBA *link_color;
+  const GdkRGBA *visited_link_color;
   GtkTextIter start_iter, end_iter;
   GtkTextTag *tag;
   GtkCssStyle *style;
 
   style = gtk_css_node_get_style (about->link_node);
-  link_color = *gtk_css_color_value_get_rgba (style->core->color);
+  link_color = gtk_css_color_value_get_rgba (style->used->color);
+
   style = gtk_css_node_get_style (about->visited_link_node);
-  visited_link_color = *gtk_css_color_value_get_rgba (style->core->color);
+  visited_link_color = gtk_css_color_value_get_rgba (style->used->color);
 
   buffer = gtk_text_buffer_new (NULL);
 
@@ -1907,7 +1908,7 @@ text_buffer_new (GtkAboutDialog  *about,
                 color = link_color;
 
               tag = gtk_text_buffer_create_tag (buffer, NULL,
-                                                "foreground-rgba", &color,
+                                                "foreground-rgba", color,
                                                 "underline", PANGO_UNDERLINE_SINGLE,
                                                 NULL);
               if (strcmp (link_type, "email") == 0)

gtk/gtkbuiltinicon.c

@@ -84,7 +84,7 @@ gtk_builtin_icon_measure (GtkWidget      *widget,
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
 
-  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
+  *minimum = *natural = gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 static void

gtk/gtkcssanimatedstyle.c

@@ -42,10 +42,37 @@
 
 G_DEFINE_TYPE (GtkCssAnimatedStyle, gtk_css_animated_style, GTK_TYPE_CSS_STYLE)
 
+static inline gboolean
+property_has_color (guint id)
+{
+  switch (id)
+    {
+    case GTK_CSS_PROPERTY_COLOR:
+    case GTK_CSS_PROPERTY_ICON_PALETTE:
+    case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
+    case GTK_CSS_PROPERTY_TEXT_SHADOW:
+    case GTK_CSS_PROPERTY_BOX_SHADOW:
+    case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
+    case GTK_CSS_PROPERTY_OUTLINE_COLOR:
+    case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
+    case GTK_CSS_PROPERTY_ICON_SOURCE:
+    case GTK_CSS_PROPERTY_ICON_SHADOW:
+    case GTK_CSS_PROPERTY_CARET_COLOR:
+    case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
+      return TRUE;
+    default:
+       return FALSE;
+    }
+}
+
 #define DEFINE_VALUES(ENUM, TYPE, NAME) \
 static inline void \
-gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle  *animated, \
-                                       GtkCssComputeContext *context) \
+gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle   *animated, \
+                                       GtkCssComputeContext  *context, \
+                                       GtkCssAnimationChange  change) \
 { \
   GtkCssStyle *style = (GtkCssStyle *)animated; \
   GtkCssValue **values = (GtkCssValue **)((guint8*)(animated->style->NAME) + sizeof (GtkCssValues)); \
@@ -55,6 +82,7 @@ gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle  *animated, \
     { \
       guint id = NAME ## _props[i]; \
       GtkCssValue *original, *computed; \
+      gboolean needs_recompute = FALSE; \
 \
       if (values[i] == NULL) \
         continue; \
@@ -62,6 +90,17 @@ gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle  *animated, \
       original = gtk_css_style_get_original_value (style, id); \
       if (original == NULL) \
         continue; \
+\
+      if ((change & GTK_CSS_ANIMATION_CHANGE_VARIABLES) && \
+           gtk_css_value_contains_variables (original)) \
+        needs_recompute = TRUE; \
+\
+      if ((change & GTK_CSS_ANIMATION_CHANGE_COLOR) && \
+          property_has_color (id)) \
+        needs_recompute = TRUE; \
+\
+      if (!needs_recompute) \
+        continue; \
 \
       computed = gtk_css_value_compute (original, \
                                         id, \
@@ -70,6 +109,9 @@ gtk_css_ ## NAME ## _values_recompute (GtkCssAnimatedStyle  *animated, \
         continue; \
 \
       gtk_css_animated_style_set_animated_value (animated, id, computed); \
+\
+      if (id == GTK_CSS_PROPERTY_COLOR) \
+        change |= GTK_CSS_ANIMATION_CHANGE_COLOR; \
     } \
 }
 
@@ -603,16 +645,20 @@ gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
   return gtk_css_style_get_value (style->style, id);
 }
 
-void
+gboolean
 gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
                                                   int                  id,
                                                   GtkCssVariableValue *value)
 {
   GtkCssStyle *style = (GtkCssStyle *)animated;
-  GtkCssComputeContext context = { NULL, };
+  GtkCssVariableValue *old_value;
 
-  gtk_internal_return_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style));
-  gtk_internal_return_if_fail (value != NULL);
+  gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (style), FALSE);
+  gtk_internal_return_val_if_fail (value != NULL, FALSE);
+
+  old_value = gtk_css_style_get_custom_property (style, id);
+  if (gtk_css_variable_value_equal (old_value, value))
+    return FALSE;
 
   if (style->variables == NULL)
     {
@@ -629,22 +675,38 @@ gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
 
   gtk_css_variable_set_add (style->variables, id, value);
 
-  context.provider = animated->provider;
-  context.style = animated->style;
-  context.parent_style = animated->parent_style;
-  context.provider = animated->provider;
+  return TRUE;
+}
 
-  gtk_css_core_values_recompute (animated, &context);
-  gtk_css_background_values_recompute (animated, &context);
-  gtk_css_border_values_recompute (animated, &context);
-  gtk_css_icon_values_recompute (animated, &context);
-  gtk_css_outline_values_recompute (animated, &context);
-  gtk_css_font_values_recompute (animated, &context);
-  gtk_css_font_variant_values_recompute (animated, &context);
-  gtk_css_animation_values_recompute (animated, &context);
-  gtk_css_transition_values_recompute (animated, &context);
-  gtk_css_size_values_recompute (animated, &context);
-  gtk_css_other_values_recompute (animated, &context);
+void
+gtk_css_animated_style_recompute (GtkCssAnimatedStyle   *style,
+                                  GtkCssAnimationChange  change)
+{
+  GtkCssComputeContext context = { NULL, };
+  GtkCssValue *shorthands[GTK_CSS_SHORTHAND_PROPERTY_N_PROPERTIES] = { NULL, };
+
+  context.provider = style->provider;
+  context.style = style->style;
+  context.parent_style = style->parent_style;
+  context.shorthands = shorthands;
+
+  gtk_css_core_values_recompute (style, &context, change);
+  gtk_css_background_values_recompute (style, &context, change);
+  gtk_css_border_values_recompute (style, &context, change);
+  gtk_css_icon_values_recompute (style, &context, change);
+  gtk_css_outline_values_recompute (style, &context, change);
+  gtk_css_font_values_recompute (style, &context, change);
+  gtk_css_font_variant_values_recompute (style, &context, change);
+  gtk_css_animation_values_recompute (style, &context, change);
+  gtk_css_transition_values_recompute (style, &context, change);
+  gtk_css_size_values_recompute (style, &context, change);
+  gtk_css_other_values_recompute (style, &context, change);
+
+  for (unsigned int i = 0; i < GTK_CSS_SHORTHAND_PROPERTY_N_PROPERTIES; i++)
+    {
+      if (shorthands[i])
+        gtk_css_value_unref (shorthands[i]);
+    }
 }
 
 GtkCssVariableValue *
@@ -793,8 +855,8 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,
 
   if (_gtk_css_array_value_get_n_values (durations) == 1 &&
       _gtk_css_array_value_get_n_values (delays) == 1 &&
-      _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, 0), 100) +
-      _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, 0), 100) == 0)
+      gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, 0), 100) +
+      gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, 0), 100) == 0)
     return animations;
 
   transition_infos_set (transitions, base_style->transition->transition_property);
@@ -809,8 +871,8 @@ gtk_css_animated_style_create_css_transitions (GPtrArray   *animations,
       if (!transitions[i].pending)
         continue;
 
-      duration = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, transitions[i].index), 100);
-      delay = _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, transitions[i].index), 100);
+      duration = gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, transitions[i].index), 100);
+      delay = gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, transitions[i].index), 100);
       if (duration + delay == 0.0)
         continue;
 
@@ -942,13 +1004,13 @@ gtk_css_animated_style_create_css_animations (GPtrArray        *animations,
           animation = _gtk_css_animation_new (name,
                                               keyframes,
                                               timestamp,
-                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, i), 100) * G_USEC_PER_SEC,
-                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, i), 100) * G_USEC_PER_SEC,
+                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (delays, i), 100) * G_USEC_PER_SEC,
+                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (durations, i), 100) * G_USEC_PER_SEC,
                                               _gtk_css_array_value_get_nth (timing_functions, i),
                                               _gtk_css_direction_value_get (_gtk_css_array_value_get_nth (directions, i)),
                                               _gtk_css_play_state_value_get (_gtk_css_array_value_get_nth (play_states, i)),
                                               _gtk_css_fill_mode_value_get (_gtk_css_array_value_get_nth (fill_modes, i)),
-                                              _gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
+                                              gtk_css_number_value_get (_gtk_css_array_value_get_nth (iteration_counts, i), 100));
         }
 
       if (!animations)
@@ -985,6 +1047,7 @@ gtk_css_animated_style_new (GtkCssStyle      *base_style,
   GtkCssAnimatedStyle *result;
   GtkCssStyle *style;
   GPtrArray *animations = NULL;
+  GtkCssComputeContext context = { NULL, };
 
   gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL);
   gtk_internal_return_val_if_fail (parent_style == NULL || GTK_IS_CSS_STYLE (parent_style), NULL);
@@ -1030,6 +1093,12 @@ gtk_css_animated_style_new (GtkCssStyle      *base_style,
 
   gtk_css_animated_style_apply_animations (result);
 
+  context.provider = provider;
+  context.style = base_style;
+  context.parent_style = parent_style;
+
+  gtk_css_style_resolve_used_values ((GtkCssStyle *) result, &context);
+
   return GTK_CSS_STYLE (result);
 }
 
@@ -1044,6 +1113,7 @@ gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source,
   GtkCssStyle *style;
   GPtrArray *animations;
   guint i;
+  GtkCssComputeContext context = { NULL, };
 
   gtk_internal_return_val_if_fail (GTK_IS_CSS_ANIMATED_STYLE (source), NULL);
   gtk_internal_return_val_if_fail (GTK_IS_CSS_STYLE (base_style), NULL);
@@ -1103,6 +1173,12 @@ gtk_css_animated_style_new_advance (GtkCssAnimatedStyle *source,
 
   gtk_css_animated_style_apply_animations (result);
 
+  context.provider = provider;
+  context.style = base_style;
+  context.parent_style = parent_style;
+
+  gtk_css_style_resolve_used_values ((GtkCssStyle *) result, &context);
+
   return GTK_CSS_STYLE (result);
 }
 

gtk/gtkcssanimatedstyleprivate.h

@@ -70,9 +70,17 @@ void                    gtk_css_animated_style_set_animated_value(GtkCssAnimated
 GtkCssValue *           gtk_css_animated_style_get_intrinsic_value (GtkCssAnimatedStyle *style,
                                                                  guint                   id);
 
-void                    gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
+gboolean                gtk_css_animated_style_set_animated_custom_value (GtkCssAnimatedStyle *animated,
                                                                  int                     id,
                                                                  GtkCssVariableValue    *value);
+
+typedef enum {
+  GTK_CSS_ANIMATION_CHANGE_VARIABLES = 1 << 0,
+  GTK_CSS_ANIMATION_CHANGE_COLOR     = 1 << 1,
+} GtkCssAnimationChange;
+
+void                    gtk_css_animated_style_recompute        (GtkCssAnimatedStyle    *style,
+                                                                 GtkCssAnimationChange   change);
 GtkCssVariableValue *   gtk_css_animated_style_get_intrinsic_custom_value (GtkCssAnimatedStyle *style,
                                                                  int                     id);
 

gtk/gtkcssanimation.c

@@ -95,6 +95,7 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
   GtkCssKeyframes *resolved_keyframes;
   double progress;
   guint i;
+  GtkCssAnimationChange change = 0;
 
   if (!gtk_css_animation_is_executing (animation))
     return;
@@ -125,7 +126,8 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
       if (!value)
         continue;
 
-      gtk_css_animated_style_set_animated_custom_value (style, variable_id, value);
+      if (gtk_css_animated_style_set_animated_custom_value (style, variable_id, value))
+        change |= GTK_CSS_ANIMATION_CHANGE_VARIABLES;
 
       gtk_css_variable_value_unref (value);
     }
@@ -134,7 +136,7 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
     {
       GtkCssValue *value;
       guint property_id;
-      
+
       property_id = _gtk_css_keyframes_get_property_id (resolved_keyframes, i);
 
       value = _gtk_css_keyframes_get_value (resolved_keyframes,
@@ -142,8 +144,14 @@ gtk_css_animation_apply_values (GtkStyleAnimation    *style_animation,
                                             progress,
                                             gtk_css_animated_style_get_intrinsic_value (style, property_id));
       gtk_css_animated_style_set_animated_value (style, property_id, value);
+
+      if (property_id == GTK_CSS_PROPERTY_COLOR)
+        change |= GTK_CSS_ANIMATION_CHANGE_COLOR;
     }
 
+  if (change != 0)
+    gtk_css_animated_style_recompute (style, change);
+
   _gtk_css_keyframes_unref (resolved_keyframes);
 }
 

gtk/gtkcssbgsizevalue.c

@@ -161,9 +161,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_BG_SIZE = {
   gtk_css_value_bg_size_print
 };
 
-static GtkCssValue auto_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, FALSE, FALSE, FALSE, NULL, NULL };
-static GtkCssValue cover_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, FALSE, TRUE, FALSE, NULL, NULL };
-static GtkCssValue contain_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, TRUE, FALSE, FALSE, TRUE, NULL, NULL };
+static GtkCssValue auto_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 1, 0, 0, FALSE, FALSE, NULL, NULL };
+static GtkCssValue cover_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 1, 0, 0, TRUE, FALSE, NULL, NULL };
+static GtkCssValue contain_singleton = { &GTK_CSS_VALUE_BG_SIZE, 1, 1, 0, 0, FALSE, TRUE, NULL, NULL };
 
 GtkCssValue *
 _gtk_css_bg_size_value_new (GtkCssValue *x,
@@ -197,10 +197,10 @@ _gtk_css_bg_size_value_parse (GtkCssParser *parser)
     x = NULL;
   else
     {
-      x = _gtk_css_number_value_parse (parser,
-                                       GTK_CSS_POSITIVE_ONLY
-                                       | GTK_CSS_PARSE_PERCENT
-                                       | GTK_CSS_PARSE_LENGTH);
+      x = gtk_css_number_value_parse (parser,
+                                      GTK_CSS_POSITIVE_ONLY
+                                      | GTK_CSS_PARSE_PERCENT
+                                      | GTK_CSS_PARSE_LENGTH);
       if (x == NULL)
         return NULL;
     }
@@ -211,10 +211,10 @@ _gtk_css_bg_size_value_parse (GtkCssParser *parser)
     y = NULL;
   else
     {
-      y = _gtk_css_number_value_parse (parser,
-                                       GTK_CSS_POSITIVE_ONLY
-                                       | GTK_CSS_PARSE_PERCENT
-                                       | GTK_CSS_PARSE_LENGTH);
+      y = gtk_css_number_value_parse (parser,
+                                      GTK_CSS_POSITIVE_ONLY
+                                      | GTK_CSS_PARSE_PERCENT
+                                      | GTK_CSS_PARSE_LENGTH);
       if (y == NULL)
         {
           gtk_css_value_unref (x);
@@ -280,8 +280,8 @@ _gtk_css_bg_size_value_compute_size (const GtkCssValue *value,
       double x, y;
 
       /* note: 0 does the right thing later for 'auto' */
-      x = value->x ? _gtk_css_number_value_get (value->x, area_width) : 0;
-      y = value->y ? _gtk_css_number_value_get (value->y, area_height) : 0;
+      x = value->x ? gtk_css_number_value_get (value->x, area_width) : 0;
+      y = value->y ? gtk_css_number_value_get (value->y, area_height) : 0;
 
       if ((x <= 0 && value->x) ||
           (y <= 0 && value->y))

gtk/gtkcssbordervalue.c

@@ -191,7 +191,7 @@ _gtk_css_border_value_parse (GtkCssParser           *parser,
       if (!gtk_css_number_value_can_parse (parser))
         break;
 
-      result->values[i] = _gtk_css_number_value_parse (parser, flags);
+      result->values[i] = gtk_css_number_value_parse (parser, flags);
       if (result->values[i] == NULL)
         {
           gtk_css_value_unref (result);

gtk/gtkcssboxesimplprivate.h

@@ -84,17 +84,17 @@ gtk_css_boxes_rect_grow (GskRoundedRect *dest,
       if (gtk_css_dimension_value_is_zero (right))
         dest->bounds.size.width = src->bounds.size.width;
       else
-        dest->bounds.size.width = src->bounds.size.width + _gtk_css_number_value_get (right, 100);
+        dest->bounds.size.width = src->bounds.size.width + gtk_css_number_value_get (right, 100);
     }
   else
     {
-      const double left_value = _gtk_css_number_value_get (left, 100);
+      const double left_value = gtk_css_number_value_get (left, 100);
 
       dest->bounds.origin.x = src->bounds.origin.x - left_value;
       if (gtk_css_dimension_value_is_zero (right))
         dest->bounds.size.width = src->bounds.size.width + left_value;
       else
-        dest->bounds.size.width = src->bounds.size.width + left_value + _gtk_css_number_value_get (right, 100);
+        dest->bounds.size.width = src->bounds.size.width + left_value + gtk_css_number_value_get (right, 100);
 
     }
 
@@ -105,17 +105,17 @@ gtk_css_boxes_rect_grow (GskRoundedRect *dest,
       if (gtk_css_dimension_value_is_zero (bottom))
         dest->bounds.size.height = src->bounds.size.height;
       else
-        dest->bounds.size.height = src->bounds.size.height + _gtk_css_number_value_get (bottom, 100);
+        dest->bounds.size.height = src->bounds.size.height + gtk_css_number_value_get (bottom, 100);
     }
   else
     {
-      const double top_value = _gtk_css_number_value_get (top, 100);
+      const double top_value = gtk_css_number_value_get (top, 100);
 
       dest->bounds.origin.y = src->bounds.origin.y - top_value;
       if (gtk_css_dimension_value_is_zero (bottom))
         dest->bounds.size.height = src->bounds.size.height + top_value;
       else
-        dest->bounds.size.height = src->bounds.size.height + top_value + _gtk_css_number_value_get (bottom, 100);
+        dest->bounds.size.height = src->bounds.size.height + top_value + gtk_css_number_value_get (bottom, 100);
     }
 }
 
@@ -127,10 +127,10 @@ gtk_css_boxes_rect_shrink (GskRoundedRect *dest,
                            GtkCssValue    *bottom_value,
                            GtkCssValue    *left_value)
 {
-  double top = _gtk_css_number_value_get (top_value, 100);
-  double right = _gtk_css_number_value_get (right_value, 100);
-  double bottom = _gtk_css_number_value_get (bottom_value, 100);
-  double left = _gtk_css_number_value_get (left_value, 100);
+  double top = gtk_css_number_value_get (top_value, 100);
+  double right = gtk_css_number_value_get (right_value, 100);
+  double bottom = gtk_css_number_value_get (bottom_value, 100);
+  double left = gtk_css_number_value_get (left_value, 100);
 
   /* FIXME: Do we need underflow checks here? */
   dest->bounds.origin.x = src->bounds.origin.x + left;
@@ -255,8 +255,8 @@ gtk_css_boxes_compute_outline_rect (GtkCssBoxes *boxes)
   dest = &boxes->box[GTK_CSS_AREA_OUTLINE_BOX].bounds;
   src = &boxes->box[GTK_CSS_AREA_BORDER_BOX].bounds;
 
-  d = _gtk_css_number_value_get (boxes->style->outline->outline_offset, 100) +
-      _gtk_css_number_value_get (boxes->style->outline->outline_width, 100);
+  d = gtk_css_number_value_get (boxes->style->outline->outline_offset, 100) +
+      gtk_css_number_value_get (boxes->style->outline->outline_width, 100);
 
   dest->origin.x = src->origin.x - d;
   dest->origin.y = src->origin.y - d;
@@ -483,8 +483,8 @@ gtk_css_boxes_compute_outline_box (GtkCssBoxes *boxes)
   src = &boxes->box[GTK_CSS_AREA_BORDER_BOX];
   dest = &boxes->box[GTK_CSS_AREA_OUTLINE_BOX];
 
-  d = _gtk_css_number_value_get (boxes->style->outline->outline_offset, 100) +
-      _gtk_css_number_value_get (boxes->style->outline->outline_width, 100);
+  d = gtk_css_number_value_get (boxes->style->outline->outline_offset, 100) +
+      gtk_css_number_value_get (boxes->style->outline->outline_width, 100);
 
   /* Grow border rect into outline rect */
   dest->bounds.origin.x = src->bounds.origin.x - d;

gtk/gtkcsscalcvalue.c

@@ -60,7 +60,7 @@ gtk_css_calc_value_parse_value (GtkCssParser           *parser,
       return result;
     }
 
-  return _gtk_css_number_value_parse (parser, flags);
+  return gtk_css_number_value_parse (parser, flags);
 }
 
 static gboolean
@@ -96,9 +96,9 @@ gtk_css_calc_value_parse_product (GtkCssParser           *parser,
           if (value == NULL)
             goto fail;
           if (is_number (value))
-            temp = gtk_css_number_value_multiply (result, _gtk_css_number_value_get (value, 100));
+            temp = gtk_css_number_value_multiply (result, gtk_css_number_value_get (value, 100));
           else
-            temp = gtk_css_number_value_multiply (value, _gtk_css_number_value_get (result, 100));
+            temp = gtk_css_number_value_multiply (value, gtk_css_number_value_get (result, 100));
           gtk_css_value_unref (value);
           gtk_css_value_unref (result);
           result = temp;
@@ -108,7 +108,7 @@ gtk_css_calc_value_parse_product (GtkCssParser           *parser,
           value = gtk_css_calc_value_parse_product (parser, GTK_CSS_PARSE_NUMBER);
           if (value == NULL)
             goto fail;
-          temp = gtk_css_number_value_multiply (result, 1.0 / _gtk_css_number_value_get (value, 100));
+          temp = gtk_css_number_value_multiply (result, 1.0 / gtk_css_number_value_get (value, 100));
           gtk_css_value_unref (value);
           gtk_css_value_unref (result);
           result = temp;
@@ -232,3 +232,307 @@ gtk_css_calc_value_parse (GtkCssParser           *parser,
   return data.value;
 }
 
+typedef struct
+{
+  GtkCssNumberParseFlags flags;
+  GPtrArray *values;
+} ParseArgnData;
+
+static guint
+gtk_css_argn_value_parse_arg (GtkCssParser *parser,
+                              guint         arg,
+                              gpointer      data_)
+{
+  ParseArgnData *data = data_;
+  GtkCssValue *value;
+
+  value = gtk_css_calc_value_parse_sum (parser, data->flags);
+  if (value == NULL)
+    return 0;
+
+  g_ptr_array_add (data->values, value);
+
+  return 1;
+}
+
+typedef struct
+{
+  GtkCssNumberParseFlags flags;
+  GtkCssValue *values[3];
+} ParseClampData;
+
+static guint
+gtk_css_clamp_value_parse_arg (GtkCssParser *parser,
+                               guint         arg,
+                               gpointer      data_)
+{
+  ParseClampData *data = data_;
+
+  if ((arg == 0 || arg == 2))
+    {
+      if (gtk_css_parser_try_ident (parser, "none"))
+        {
+          data->values[arg] = NULL;
+          return 1;
+        }
+    }
+
+  data->values[arg] = gtk_css_calc_value_parse_sum (parser, data->flags);
+  if (data->values[arg] == NULL)
+    return 0;
+
+  return 1;
+}
+
+GtkCssValue *
+gtk_css_clamp_value_parse (GtkCssParser           *parser,
+                           GtkCssNumberParseFlags  flags,
+                           guint                   type)
+{
+  ParseClampData data;
+  GtkCssValue *result = NULL;
+
+  if (!gtk_css_parser_has_function (parser, "clamp"))
+    {
+      gtk_css_parser_error_syntax (parser, "Expected 'clamp('");
+      return NULL;
+    }
+
+  /* This can only be handled at compute time, we allow '-' after all */
+  data.flags = flags & ~GTK_CSS_POSITIVE_ONLY;
+  data.values[0] = NULL;
+  data.values[1] = NULL;
+  data.values[2] = NULL;
+
+  if (gtk_css_parser_consume_function (parser, 3, 3, gtk_css_clamp_value_parse_arg, &data))
+    {
+      GtkCssDimension dim = gtk_css_number_value_get_dimension (data.values[1]);
+      if ((data.values[0] && gtk_css_number_value_get_dimension (data.values[0]) != dim) ||
+          (data.values[2] && gtk_css_number_value_get_dimension (data.values[2]) != dim))
+        gtk_css_parser_error_syntax (parser, "Inconsistent types in 'clamp('");
+      else
+        result = gtk_css_math_value_new (type, 0, data.values, 3);
+    }
+
+  if (result == NULL)
+    {
+      g_clear_pointer (&data.values[0], gtk_css_value_unref);
+      g_clear_pointer (&data.values[1], gtk_css_value_unref);
+      g_clear_pointer (&data.values[2], gtk_css_value_unref);
+    }
+
+  return result;
+}
+
+typedef struct {
+  GtkCssNumberParseFlags flags;
+  guint mode;
+  gboolean has_mode;
+  GtkCssValue *values[2];
+} ParseRoundData;
+
+static guint
+gtk_css_round_value_parse_arg (GtkCssParser *parser,
+                               guint         arg,
+                               gpointer      data_)
+{
+  ParseRoundData *data = data_;
+
+  if (arg == 0)
+    {
+      const char *modes[] = { "nearest", "up", "down", "to-zero" };
+
+      for (guint i = 0; i < G_N_ELEMENTS (modes); i++)
+        {
+          if (gtk_css_parser_try_ident (parser, modes[i]))
+            {
+              data->mode = i;
+              data->has_mode = TRUE;
+              return 1;
+            }
+        }
+
+      data->values[0] = gtk_css_calc_value_parse_sum (parser, data->flags);
+      if (data->values[0] == NULL)
+        return 0;
+    }
+  else if (arg == 1)
+    {
+      GtkCssValue *value = gtk_css_calc_value_parse_sum (parser, data->flags);
+
+      if (value == NULL)
+        return 0;
+
+      if (data->has_mode)
+        data->values[0] = value;
+      else
+        data->values[1] = value;
+    }
+  else
+    {
+      if (!data->has_mode)
+        {
+          gtk_css_parser_error_syntax (parser, "Too many argument for 'round'");
+          return 0;
+        }
+
+      data->values[1] = gtk_css_calc_value_parse_sum (parser, data->flags);
+
+      if (data->values[1] == NULL)
+        return 0;
+    }
+
+  return 1;
+}
+
+GtkCssValue *
+gtk_css_round_value_parse (GtkCssParser           *parser,
+                           GtkCssNumberParseFlags  flags,
+                           guint                   type)
+{
+  ParseRoundData data;
+  GtkCssValue *result = NULL;
+
+  if (!gtk_css_parser_has_function (parser, "round"))
+    {
+      gtk_css_parser_error_syntax (parser, "Expected 'round('");
+      return NULL;
+    }
+
+  data.flags = flags & ~GTK_CSS_POSITIVE_ONLY;
+  data.mode = ROUND_NEAREST;
+  data.has_mode = FALSE;
+  data.values[0] = NULL;
+  data.values[1] = NULL;
+
+  if (gtk_css_parser_consume_function (parser, 1, 3, gtk_css_round_value_parse_arg, &data) &&
+      data.values[0] != NULL)
+    {
+      if (data.values[1] != NULL &&
+          gtk_css_number_value_get_dimension (data.values[0]) !=
+          gtk_css_number_value_get_dimension (data.values[1]))
+        gtk_css_parser_error_syntax (parser, "Inconsistent types in 'round('");
+      else if (data.values[1] == NULL &&
+               gtk_css_number_value_get_dimension (data.values[0]) != GTK_CSS_DIMENSION_NUMBER)
+        gtk_css_parser_error_syntax (parser, "Can't omit second argument to 'round(' here");
+      else
+        result = gtk_css_math_value_new (type, data.mode, data.values, data.values[1] != NULL ? 2 : 1);
+    }
+
+  if (result == NULL)
+    {
+      g_clear_pointer (&data.values[0], gtk_css_value_unref);
+      g_clear_pointer (&data.values[1], gtk_css_value_unref);
+    }
+
+  return result;
+}
+
+typedef struct {
+  GtkCssNumberParseFlags flags;
+  GtkCssValue *values[2];
+} ParseArg2Data;
+
+static guint
+gtk_css_arg2_value_parse_arg (GtkCssParser *parser,
+                              guint         arg,
+                              gpointer      data_)
+{
+  ParseArg2Data *data = data_;
+
+  data->values[arg] = gtk_css_calc_value_parse_sum (parser, data->flags);
+  if (data->values[arg] == NULL)
+    return 0;
+
+  return 1;
+}
+
+GtkCssValue *
+gtk_css_arg2_value_parse (GtkCssParser           *parser,
+                          GtkCssNumberParseFlags  flags,
+                          guint                   min_args,
+                          guint                   max_args,
+                          const char             *function,
+                          guint                   type)
+{
+  ParseArg2Data data;
+  GtkCssValue *result = NULL;
+
+  g_assert (1 <= min_args && min_args <= max_args && max_args <= 2);
+
+  if (!gtk_css_parser_has_function (parser, function))
+    {
+      gtk_css_parser_error_syntax (parser, "Expected '%s('", function);
+      return NULL;
+    }
+
+  data.flags = flags & ~GTK_CSS_POSITIVE_ONLY;
+  data.values[0] = NULL;
+  data.values[1] = NULL;
+
+  if (gtk_css_parser_consume_function (parser, min_args, max_args, gtk_css_arg2_value_parse_arg, &data))
+    {
+      if (data.values[1] != NULL &&
+          gtk_css_number_value_get_dimension (data.values[0]) !=
+          gtk_css_number_value_get_dimension (data.values[1]))
+        gtk_css_parser_error_syntax (parser, "Inconsistent types in '%s('", function);
+      else
+        result = gtk_css_math_value_new (type, 0, data.values, data.values[1] != NULL ? 2 : 1);
+    }
+
+  if (result == NULL)
+    {
+      g_clear_pointer (&data.values[0], gtk_css_value_unref);
+      g_clear_pointer (&data.values[1], gtk_css_value_unref);
+    }
+
+  return result;
+}
+
+GtkCssValue *
+gtk_css_argn_value_parse (GtkCssParser           *parser,
+                          GtkCssNumberParseFlags  flags,
+                          const char             *function,
+                          guint                   type)
+{
+  ParseArgnData data;
+  GtkCssValue *result = NULL;
+
+  if (!gtk_css_parser_has_function (parser, function))
+    {
+      gtk_css_parser_error_syntax (parser, "Expected '%s('", function);
+      return NULL;
+    }
+
+  /* This can only be handled at compute time, we allow '-' after all */
+  data.flags = flags & ~GTK_CSS_POSITIVE_ONLY;
+  data.values = g_ptr_array_new ();
+
+  if (gtk_css_parser_consume_function (parser, 1, G_MAXUINT, gtk_css_argn_value_parse_arg, &data))
+    {
+      GtkCssValue *val = (GtkCssValue *) g_ptr_array_index (data.values, 0);
+      GtkCssDimension dim = gtk_css_number_value_get_dimension (val);
+      guint i;
+      for (i = 1; i < data.values->len; i++)
+        {
+          val = (GtkCssValue *) g_ptr_array_index (data.values, i);
+          if (gtk_css_number_value_get_dimension (val) != dim)
+            break;
+        }
+      if (i < data.values->len)
+        gtk_css_parser_error_syntax (parser, "Inconsistent types in '%s('", function);
+      else
+        result = gtk_css_math_value_new (type, 0, (GtkCssValue **)data.values->pdata, data.values->len);
+    }
+
+  if (result == NULL)
+    {
+      for (guint i = 0; i < data.values->len; i++)
+        gtk_css_value_unref ((GtkCssValue *)g_ptr_array_index (data.values, i));
+    }
+
+  g_ptr_array_unref (data.values);
+
+  return result;
+}
+

gtk/gtkcsscalcvalueprivate.h

@@ -23,6 +23,21 @@ G_BEGIN_DECLS
 
 GtkCssValue *   gtk_css_calc_value_parse            (GtkCssParser           *parser,
                                                      GtkCssNumberParseFlags  flags);
+GtkCssValue *   gtk_css_clamp_value_parse           (GtkCssParser           *parser,
+                                                     GtkCssNumberParseFlags  flags,
+                                                     guint                   type);
+GtkCssValue *   gtk_css_round_value_parse           (GtkCssParser           *parser,
+                                                     GtkCssNumberParseFlags  flags,
+                                                     guint                   type);
+GtkCssValue *   gtk_css_arg2_value_parse            (GtkCssParser           *parser,
+                                                     GtkCssNumberParseFlags  flags,
+                                                     guint                   min_args,
+                                                     guint                   max_args,
+                                                     const char             *function,
+                                                     guint                   type);
+GtkCssValue *   gtk_css_argn_value_parse            (GtkCssParser           *parser,
+                                                     GtkCssNumberParseFlags  flags,
+                                                     const char             *function,
+                                                     guint                   type);
 
 G_END_DECLS
-

gtk/gtkcsscolorvalue.c

@@ -22,6 +22,7 @@
 #include "gtkcssstylepropertyprivate.h"
 #include "gtkprivate.h"
 #include "gtkstylepropertyprivate.h"
+#include "gtkcssnumbervalueprivate.h"
 #include "gtkcssstyleprivate.h"
 #include "gtkstyleproviderprivate.h"
 
@@ -134,36 +135,7 @@ gtk_css_value_color_compute (GtkCssValue          *value,
 {
   GtkCssValue *resolved;
 
-  /* The computed value of the ‘currentColor’ keyword is the computed
-   * value of the ‘color’ property. If the ‘currentColor’ keyword is
-   * set on the ‘color’ property itself, it is treated as ‘color: inherit’.
-   */
-  if (property_id == GTK_CSS_PROPERTY_COLOR)
-    {
-      GtkCssValue *current;
-
-      if (context->parent_style)
-        current = context->parent_style->core->color;
-      else
-        current = NULL;
-
-      resolved = gtk_css_color_value_resolve (value,
-                                              context->provider,
-                                              current);
-    }
-  else if (value->type == COLOR_TYPE_LITERAL)
-    {
-      resolved = gtk_css_value_ref (value);
-    }
-  else
-    {
-      GtkCssValue *current = context->style->core->color;
-
-      resolved = gtk_css_color_value_resolve (value,
-                                              context->provider,
-                                              current);
-    }
-
+  resolved = gtk_css_color_value_resolve (value, context->provider, NULL);
   if (resolved == NULL)
     return gtk_css_value_color_get_fallback (property_id, context);
 
@@ -339,6 +311,16 @@ apply_mix (const GdkRGBA *in1,
     }
 }
 
+/* This function can be called at compute time or at use time.
+ *
+ * When called at compute time, it needs to be given a provider
+ * (for looking up named colors), and current must be NULL,
+ * since currentcolor computed to itself.
+ *
+ * When called at use time, provider can be NULL (since named
+ * colors should have already been resolved at compute time),
+ * and current must be the value to use for currentcolor.
+ */
 static GtkCssValue *
 gtk_css_color_value_do_resolve (GtkCssValue      *color,
                                 GtkStyleProvider *provider,
@@ -353,11 +335,14 @@ gtk_css_color_value_do_resolve (GtkCssValue      *color,
     {
     case COLOR_TYPE_LITERAL:
       return gtk_css_value_ref (color);
+
     case COLOR_TYPE_NAME:
       {
         GtkCssValue *named;
         GSList cycle = { color, cycle_list };
 
+        g_assert (provider != NULL);
+
         /* If color exists in cycle_list, we're currently resolving it.
          * So we've detected a cycle. */
         if (g_slist_find (cycle_list, color))
@@ -371,81 +356,97 @@ gtk_css_color_value_do_resolve (GtkCssValue      *color,
         if (value == NULL)
           return NULL;
       }
-
       break;
+
     case COLOR_TYPE_SHADE:
       {
-        const GdkRGBA *c;
         GtkCssValue *val;
-        GdkRGBA shade;
 
         val = gtk_css_color_value_do_resolve (color->shade.color, provider, current, cycle_list);
+
         if (val == NULL)
           return NULL;
-        c = gtk_css_color_value_get_rgba (val);
 
-        apply_shade (c, &shade, color->shade.factor);
+        if (val->type == COLOR_TYPE_LITERAL)
+          {
+            const GdkRGBA *c = gtk_css_color_value_get_rgba (val);
+            GdkRGBA shade;
+
+            apply_shade (c, &shade, color->shade.factor);
+            value = gtk_css_color_value_new_literal (&shade);
+          }
+        else
+          {
+            value = gtk_css_color_value_new_shade (val, color->shade.factor);
+          }
 
-        value = gtk_css_color_value_new_literal (&shade);
         gtk_css_value_unref (val);
       }
-
       break;
+
     case COLOR_TYPE_ALPHA:
       {
-        const GdkRGBA *c;
         GtkCssValue *val;
-        GdkRGBA alpha;
 
         val = gtk_css_color_value_do_resolve (color->alpha.color, provider, current, cycle_list);
+
         if (val == NULL)
           return NULL;
-        c = gtk_css_color_value_get_rgba (val);
 
-        apply_alpha (c, &alpha, color->alpha.factor);
+        if (val->type == COLOR_TYPE_LITERAL)
+          {
+            const GdkRGBA *c = gtk_css_color_value_get_rgba (val);
+            GdkRGBA alpha;
+
+            apply_alpha (c, &alpha, color->alpha.factor);
+            value = gtk_css_color_value_new_literal (&alpha);
+          }
+        else
+          {
+            value = gtk_css_color_value_new_alpha (val, color->alpha.factor);
+          }
 
-        value = gtk_css_color_value_new_literal (&alpha);
         gtk_css_value_unref (val);
       }
       break;
 
     case COLOR_TYPE_MIX:
       {
-        const GdkRGBA *color1, *color2;
         GtkCssValue *val1, *val2;
-        GdkRGBA res;
 
         val1 = gtk_css_color_value_do_resolve (color->mix.color1, provider, current, cycle_list);
-        if (val1 == NULL)
-          return NULL;
-        color1 = gtk_css_color_value_get_rgba (val1);
-
         val2 = gtk_css_color_value_do_resolve (color->mix.color2, provider, current, cycle_list);
-        if (val2 == NULL)
+
+        if (val1 == NULL || val2 == NULL)
           return NULL;
-        color2 = gtk_css_color_value_get_rgba (val2);
 
-        apply_mix (color1, color2, &res, color->mix.factor);
+        if (val1->type == COLOR_TYPE_LITERAL && val2->type == COLOR_TYPE_LITERAL)
+          {
+            const GdkRGBA *color1 = gtk_css_color_value_get_rgba (val1);
+            const GdkRGBA *color2 = gtk_css_color_value_get_rgba (val2);
+            GdkRGBA res;
+
+            apply_mix (color1, color2, &res, color->mix.factor);
+            value = gtk_css_color_value_new_literal (&res);
+          }
+        else
+          {
+            value = gtk_css_color_value_new_mix (val1, val2, color->mix.factor);
+          }
 
-        value = gtk_css_color_value_new_literal (&res);
         gtk_css_value_unref (val1);
         gtk_css_value_unref (val2);
       }
-
       break;
+
     case COLOR_TYPE_CURRENT_COLOR:
-      if (current == NULL)
-        {
-          current = _gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (GTK_CSS_PROPERTY_COLOR));
-
-          g_assert (current->class == &GTK_CSS_VALUE_COLOR);
-          g_assert (current->type == COLOR_TYPE_LITERAL);
-        }
-
+      if (current)
         value = gtk_css_value_ref (current);
+      else
+        value = gtk_css_value_ref (color);
       break;
+
     default:
-      value = NULL;
       g_assert_not_reached ();
     }
 
@@ -473,11 +474,12 @@ gtk_css_color_value_resolve (GtkCssValue      *color,
   return gtk_css_color_value_do_resolve (color, provider, current, NULL);
 }
 
-static GtkCssValue transparent_black_singleton = { &GTK_CSS_VALUE_COLOR, 1, TRUE, FALSE, COLOR_TYPE_LITERAL, NULL,
+static GtkCssValue transparent_black_singleton = { &GTK_CSS_VALUE_COLOR, 1, 1, 0, 0, COLOR_TYPE_LITERAL, NULL,
                                                    .rgba = {0, 0, 0, 0} };
-static GtkCssValue white_singleton             = { &GTK_CSS_VALUE_COLOR, 1, TRUE, FALSE, COLOR_TYPE_LITERAL, NULL,
+static GtkCssValue white_singleton             = { &GTK_CSS_VALUE_COLOR, 1, 1, 0, 0, COLOR_TYPE_LITERAL, NULL,
                                                    .rgba = {1, 1, 1, 1} };
 
+static GtkCssValue current_color_singleton     = { &GTK_CSS_VALUE_COLOR, 1, 0, 0, 1, COLOR_TYPE_CURRENT_COLOR, NULL, };
 
 GtkCssValue *
 gtk_css_color_value_new_transparent (void)
@@ -491,6 +493,12 @@ gtk_css_color_value_new_white (void)
   return gtk_css_value_ref (&white_singleton);
 }
 
+GtkCssValue *
+gtk_css_color_value_new_current_color (void)
+{
+  return gtk_css_value_ref (&current_color_singleton);
+}
+
 GtkCssValue *
 gtk_css_color_value_new_literal (const GdkRGBA *color)
 {
@@ -545,6 +553,7 @@ gtk_css_color_value_new_shade (GtkCssValue *color,
 
   value = gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
   value->type = COLOR_TYPE_SHADE;
+  value->contains_current_color = color->contains_current_color;
   value->shade.color = gtk_css_value_ref (color);
   value->shade.factor = factor;
 
@@ -570,6 +579,7 @@ gtk_css_color_value_new_alpha (GtkCssValue *color,
 
   value = gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
   value->type = COLOR_TYPE_ALPHA;
+  value->contains_current_color = color->contains_current_color;
   value->alpha.color = gtk_css_value_ref (color);
   value->alpha.factor = factor;
 
@@ -599,6 +609,8 @@ gtk_css_color_value_new_mix (GtkCssValue *color1,
 
   value = gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_COLOR);
   value->type = COLOR_TYPE_MIX;
+  value->contains_current_color = color1->contains_current_color ||
+                                  color2->contains_current_color;
   value->mix.color1 = gtk_css_value_ref (color1);
   value->mix.color2 = gtk_css_value_ref (color2);
   value->mix.factor = factor;
@@ -606,14 +618,6 @@ gtk_css_color_value_new_mix (GtkCssValue *color1,
   return value;
 }
 
-GtkCssValue *
-gtk_css_color_value_new_current_color (void)
-{
-  static GtkCssValue current_color = { &GTK_CSS_VALUE_COLOR, 1, FALSE, FALSE, COLOR_TYPE_CURRENT_COLOR, NULL, };
-
-  return gtk_css_value_ref (&current_color);
-}
-
 typedef struct
 {
   GtkCssValue *color;
@@ -696,10 +700,310 @@ gtk_css_color_value_can_parse (GtkCssParser *parser)
       || gtk_css_parser_has_function (parser, "rgba");
 }
 
+typedef struct
+{
+  GdkRGBA *rgba;
+  gboolean use_percentages;
+} ParseRGBAData;
+
+typedef enum
+{
+  COLOR_SYNTAX_DETECTING,
+  COLOR_SYNTAX_MODERN,
+  COLOR_SYNTAX_LEGACY,
+} ColorSyntax;
+
+static gboolean
+parse_rgb_channel_value (GtkCssParser  *parser,
+                         float         *value,
+                         ColorSyntax    syntax,
+                         ParseRGBAData *data)
+{
+  gboolean has_percentage =
+    gtk_css_token_is (gtk_css_parser_get_token (parser), GTK_CSS_TOKEN_PERCENTAGE);
+  GtkCssValue *val;
+
+  switch (syntax)
+  {
+    case COLOR_SYNTAX_DETECTING:
+      data->use_percentages = has_percentage;
+      break;
+
+    case COLOR_SYNTAX_LEGACY:
+      if (data->use_percentages != has_percentage)
+        {
+          gtk_css_parser_error_syntax (parser, "Legacy color syntax doesn't allow mixing numbers and percentages");
+          return FALSE;
+        }
+
+      break;
+
+    case COLOR_SYNTAX_MODERN:
+      break;
+
+    default:
+      g_assert_not_reached ();
+  }
+
+  val = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_PARSE_PERCENT);
+  if (val == NULL)
+    return FALSE;
+
+  *value = gtk_css_number_value_get_canonical (val, 255);
+  *value = CLAMP (*value, 0.0, 255.0) / 255.0;
+
+  gtk_css_value_unref (val);
+
+  return TRUE;
+}
+
+static gboolean
+parse_alpha_value (GtkCssParser *parser,
+                   float        *value,
+                   ColorSyntax   syntax)
+{
+  GtkCssNumberParseFlags flags = GTK_CSS_PARSE_NUMBER;
+  GtkCssValue *val;
+
+  if (syntax == COLOR_SYNTAX_MODERN)
+    flags |= GTK_CSS_PARSE_PERCENT;
+
+  val = gtk_css_number_value_parse (parser, flags);
+  if (val == NULL)
+    return FALSE;
+
+  *value = gtk_css_number_value_get_canonical (val, 1);
+  *value = CLAMP (*value, 0.0, 1.0);
+
+  gtk_css_value_unref (val);
+
+  return TRUE;
+}
+
+static gboolean
+parse_hsl_channel_value (GtkCssParser  *parser,
+                         float         *value,
+                         ColorSyntax    syntax)
+{
+  GtkCssNumberParseFlags flags = GTK_CSS_PARSE_PERCENT;
+  GtkCssValue *val;
+
+  if (syntax == COLOR_SYNTAX_MODERN)
+    flags |= GTK_CSS_PARSE_NUMBER;
+
+  val = gtk_css_number_value_parse (parser, flags);
+  if (val == NULL)
+    return FALSE;
+
+  *value = gtk_css_number_value_get_canonical (val, 100);
+  *value = CLAMP (*value, 0.0, 100.0) / 100.0;
+
+  gtk_css_value_unref (val);
+
+  return TRUE;
+}
+
+static gboolean
+parse_hue_value (GtkCssParser *parser,
+                 float        *value)
+{
+  GtkCssValue *hue;
+
+  hue = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_PARSE_ANGLE);
+  if (hue == NULL)
+    return FALSE;
+
+  *value = gtk_css_number_value_get_canonical (hue, 360);
+
+  gtk_css_value_unref (hue);
+
+  return TRUE;
+}
+
+static guint
+parse_rgba_color_channel (GtkCssParser *parser,
+                          guint         arg,
+                          ColorSyntax   syntax,
+                          gpointer      data)
+{
+  ParseRGBAData *rgba_data = data;
+  GdkRGBA *rgba = rgba_data->rgba;
+
+  switch (arg)
+  {
+    case 0:
+      if (!parse_rgb_channel_value (parser, &rgba->red, syntax, rgba_data))
+        return 0;
+      return 1;
+
+    case 1:
+      if (!parse_rgb_channel_value (parser, &rgba->green, syntax, rgba_data))
+        return 0;
+      return 1;
+
+    case 2:
+      if (!parse_rgb_channel_value (parser, &rgba->blue, syntax, rgba_data))
+        return 0;
+      return 1;
+
+    case 3:
+      if (!parse_alpha_value (parser, &rgba->alpha, syntax))
+        return 0;
+      return 1;
+
+    default:
+      g_assert_not_reached ();
+      return 0;
+  }
+}
+
+static guint
+parse_hsla_color_channel (GtkCssParser *parser,
+                          guint         arg,
+                          ColorSyntax   syntax,
+                          gpointer      data)
+{
+  GdkHSLA *hsla = data;
+
+  switch (arg)
+  {
+    case 0:
+      if (!parse_hue_value (parser, &hsla->hue))
+        return 0;
+      return 1;
+
+    case 1:
+      if (!parse_hsl_channel_value (parser, &hsla->saturation, syntax))
+        return 0;
+      return 1;
+
+    case 2:
+      if (!parse_hsl_channel_value (parser, &hsla->lightness, syntax))
+        return 0;
+      return 1;
+
+    case 3:
+      if (!parse_alpha_value (parser, &hsla->alpha, syntax))
+        return 0;
+      return 1;
+
+    default:
+      g_assert_not_reached ();
+      return 0;
+  }
+}
+
+static gboolean
+parse_color_function (GtkCssParser *self,
+                      gboolean      allow_alpha,
+                      gboolean      require_alpha,
+                      guint (* parse_func) (GtkCssParser *, guint, ColorSyntax, gpointer),
+                      gpointer      data)
+{
+  const GtkCssToken *token;
+  gboolean result = FALSE;
+  char function_name[64];
+  guint arg;
+  guint min_args = 3;
+  guint max_args = 4;
+  ColorSyntax syntax = COLOR_SYNTAX_DETECTING;
+
+  token = gtk_css_parser_get_token (self);
+  g_return_val_if_fail (gtk_css_token_is (token, GTK_CSS_TOKEN_FUNCTION), FALSE);
+
+  g_strlcpy (function_name, gtk_css_token_get_string (token), 64);
+  gtk_css_parser_start_block (self);
+
+  arg = 0;
+  while (TRUE)
+    {
+      guint parse_args = parse_func (self, arg, syntax, data);
+      if (parse_args == 0)
+        break;
+      arg += parse_args;
+      token = gtk_css_parser_get_token (self);
+
+      if (syntax == COLOR_SYNTAX_DETECTING)
+        {
+          if (gtk_css_token_is (token, GTK_CSS_TOKEN_COMMA))
+            {
+              syntax = COLOR_SYNTAX_LEGACY;
+              min_args = require_alpha ? 4 : 3;
+              max_args = allow_alpha ? 4 : 3;
+            }
+          else
+            {
+              syntax = COLOR_SYNTAX_MODERN;
+            }
+        }
+
+      if (gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
+        {
+          if (arg < min_args)
+            {
+              gtk_css_parser_error_syntax (self, "%s() requires at least %u arguments", function_name, min_args);
+              break;
+            }
+          else
+            {
+              result = TRUE;
+              break;
+            }
+        }
+      else if (gtk_css_token_is (token, GTK_CSS_TOKEN_COMMA))
+        {
+          if (syntax == COLOR_SYNTAX_MODERN)
+            {
+              gtk_css_parser_error_syntax (self, "Commas aren't allowed in modern %s() syntax", function_name);
+              break;
+            }
+
+          if (arg >= max_args)
+            {
+              gtk_css_parser_error_syntax (self, "Expected ')' at end of %s()", function_name);
+              break;
+            }
+
+          gtk_css_parser_consume_token (self);
+          continue;
+        }
+      else if (syntax == COLOR_SYNTAX_LEGACY)
+        {
+          gtk_css_parser_error_syntax (self, "Unexpected data at end of %s() argument", function_name);
+          break;
+        }
+      else if (arg == 3)
+        {
+          if (gtk_css_token_is_delim (token, '/'))
+            {
+              gtk_css_parser_consume_token (self);
+              continue;
+            }
+
+          if (arg >= max_args)
+            {
+              gtk_css_parser_error_syntax (self, "Expected ')' at end of %s()", function_name);
+              break;
+            }
+
+          gtk_css_parser_error_syntax (self, "Expected '/' or ')'");
+          break;
+        }
+      else if (arg >= max_args)
+        {
+          gtk_css_parser_error_syntax (self, "Expected ')' at end of %s()", function_name);
+          break;
+        }
+    }
+
+  gtk_css_parser_end_block (self);
+
+  return result;
+}
+
 GtkCssValue *
 gtk_css_color_value_parse (GtkCssParser *parser)
 {
-  ColorFunctionData data = { NULL, };
   GtkCssValue *value;
   GdkRGBA rgba;
 
@@ -711,13 +1015,45 @@ gtk_css_color_value_parse (GtkCssParser *parser)
     {
       const GtkCssToken *token = gtk_css_parser_get_token (parser);
 
+      gtk_css_parser_warn_deprecated (parser, "@define-color and named colors are deprecated");
+
       value = gtk_css_color_value_new_name (gtk_css_token_get_string (token));
       gtk_css_parser_consume_token (parser);
 
       return value;
     }
+  else if (gtk_css_parser_has_function (parser, "rgb") || gtk_css_parser_has_function (parser, "rgba"))
+    {
+      gboolean has_alpha;
+      ParseRGBAData data = { NULL, };
+      data.rgba = &rgba;
+
+      rgba.alpha = 1.0;
+
+      has_alpha = gtk_css_parser_has_function (parser, "rgba");
+
+      if (!parse_color_function (parser, has_alpha, has_alpha, parse_rgba_color_channel, &data))
+        return NULL;
+
+      return gtk_css_color_value_new_literal (&rgba);
+    }
+  else if (gtk_css_parser_has_function (parser, "hsl") || gtk_css_parser_has_function (parser, "hsla"))
+    {
+      GdkHSLA hsla;
+
+      hsla.alpha = 1.0;
+
+      if (!parse_color_function (parser, TRUE, FALSE, parse_hsla_color_channel, &hsla))
+        return NULL;
+
+      _gdk_rgba_init_from_hsla (&rgba, &hsla);
+
+      return gtk_css_color_value_new_literal (&rgba);
+    }
   else if (gtk_css_parser_has_function (parser, "lighter"))
     {
+      ColorFunctionData data = { NULL, };
+
       if (gtk_css_parser_consume_function (parser, 1, 1, parse_color_number, &data))
         value = gtk_css_color_value_new_shade (data.color, 1.3);
       else
@@ -728,6 +1064,8 @@ gtk_css_color_value_parse (GtkCssParser *parser)
     }
   else if (gtk_css_parser_has_function (parser, "darker"))
     {
+      ColorFunctionData data = { NULL, };
+
       if (gtk_css_parser_consume_function (parser, 1, 1, parse_color_number, &data))
         value = gtk_css_color_value_new_shade (data.color, 0.7);
       else
@@ -738,6 +1076,8 @@ gtk_css_color_value_parse (GtkCssParser *parser)
     }
   else if (gtk_css_parser_has_function (parser, "shade"))
     {
+      ColorFunctionData data = { NULL, };
+
       if (gtk_css_parser_consume_function (parser, 2, 2, parse_color_number, &data))
         value = gtk_css_color_value_new_shade (data.color, data.value);
       else
@@ -748,6 +1088,8 @@ gtk_css_color_value_parse (GtkCssParser *parser)
     }
   else if (gtk_css_parser_has_function (parser, "alpha"))
     {
+      ColorFunctionData data = { NULL, };
+
       if (gtk_css_parser_consume_function (parser, 2, 2, parse_color_number, &data))
         value = gtk_css_color_value_new_alpha (data.color, data.value);
       else
@@ -758,6 +1100,8 @@ gtk_css_color_value_parse (GtkCssParser *parser)
     }
   else if (gtk_css_parser_has_function (parser, "mix"))
     {
+      ColorFunctionData data = { NULL, };
+
       if (gtk_css_parser_consume_function (parser, 3, 3, parse_color_mix, &data))
         value = gtk_css_color_value_new_mix (data.color, data.color2, data.value);
       else

gtk/gtkcsscornervalue.c

@@ -108,14 +108,14 @@ static const GtkCssValueClass GTK_CSS_VALUE_CORNER = {
 };
 
 static GtkCssValue corner_singletons[] = {
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
-  { &GTK_CSS_VALUE_CORNER, 1, TRUE, FALSE, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
+  { &GTK_CSS_VALUE_CORNER, 1, 1, 0, 0, NULL, NULL },
 };
 
 static inline void
@@ -170,10 +170,10 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
 {
   GtkCssValue *x, *y;
 
-  x = _gtk_css_number_value_parse (parser,
-                                   GTK_CSS_POSITIVE_ONLY
-                                   | GTK_CSS_PARSE_PERCENT
-                                   | GTK_CSS_PARSE_LENGTH);
+  x = gtk_css_number_value_parse (parser,
+                                  GTK_CSS_POSITIVE_ONLY
+                                  | GTK_CSS_PARSE_PERCENT
+                                  | GTK_CSS_PARSE_LENGTH);
   if (x == NULL)
     return NULL;
 
@@ -181,10 +181,10 @@ _gtk_css_corner_value_parse (GtkCssParser *parser)
     y = gtk_css_value_ref (x);
   else
     {
-      y = _gtk_css_number_value_parse (parser,
-                                       GTK_CSS_POSITIVE_ONLY
-                                       | GTK_CSS_PARSE_PERCENT
-                                       | GTK_CSS_PARSE_LENGTH);
+      y = gtk_css_number_value_parse (parser,
+                                      GTK_CSS_POSITIVE_ONLY
+                                      | GTK_CSS_PARSE_PERCENT
+                                      | GTK_CSS_PARSE_LENGTH);
       if (y == NULL)
         {
           gtk_css_value_unref (x);
@@ -202,7 +202,7 @@ _gtk_css_corner_value_get_x (const GtkCssValue *corner,
   g_return_val_if_fail (corner != NULL, 0.0);
   g_return_val_if_fail (corner->class == &GTK_CSS_VALUE_CORNER, 0.0);
 
-  return _gtk_css_number_value_get (corner->x, one_hundred_percent);
+  return gtk_css_number_value_get (corner->x, one_hundred_percent);
 }
 
 double
@@ -212,7 +212,7 @@ _gtk_css_corner_value_get_y (const GtkCssValue *corner,
   g_return_val_if_fail (corner != NULL, 0.0);
   g_return_val_if_fail (corner->class == &GTK_CSS_VALUE_CORNER, 0.0);
 
-  return _gtk_css_number_value_get (corner->y, one_hundred_percent);
+  return gtk_css_number_value_get (corner->y, one_hundred_percent);
 }
 
 gboolean

gtk/gtkcssenumvalue.c

@@ -85,16 +85,16 @@ static const GtkCssValueClass GTK_CSS_VALUE_BORDER_STYLE = {
 };
 
 static GtkCssValue border_style_values[] = {
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_NONE, "none" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_SOLID, "solid" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_INSET, "inset" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_OUTSET, "outset" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_HIDDEN, "hidden" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_DOTTED, "dotted" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_DASHED, "dashed" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_DOUBLE, "double" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_GROOVE, "groove" },
-  { &GTK_CSS_VALUE_BORDER_STYLE, 1, TRUE, FALSE, GTK_BORDER_STYLE_RIDGE, "ridge" }
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_NONE, "none" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_SOLID, "solid" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_INSET, "inset" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_OUTSET, "outset" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_HIDDEN, "hidden" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_DOTTED, "dotted" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_DASHED, "dashed" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_DOUBLE, "double" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_GROOVE, "groove" },
+  { &GTK_CSS_VALUE_BORDER_STYLE, 1, 1, 0, 0, GTK_BORDER_STYLE_RIDGE, "ridge" }
 };
 
 GtkCssValue *
@@ -143,22 +143,22 @@ static const GtkCssValueClass GTK_CSS_VALUE_BLEND_MODE = {
 };
 
 static GtkCssValue blend_mode_values[] = {
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_DEFAULT, "normal" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_MULTIPLY, "multiply" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_SCREEN, "screen" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_OVERLAY, "overlay" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_DARKEN, "darken" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_LIGHTEN, "lighten" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_COLOR_DODGE, "color-dodge" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_COLOR_BURN, "color-burn" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_HARD_LIGHT, "hard-light" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_SOFT_LIGHT, "soft-light" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_DIFFERENCE, "difference" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_EXCLUSION, "exclusion" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_COLOR, "color" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_HUE, "hue" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_SATURATION, "saturation" },
-  { &GTK_CSS_VALUE_BLEND_MODE, 1, TRUE, FALSE, GSK_BLEND_MODE_LUMINOSITY, "luminosity" }
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_DEFAULT, "normal" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_MULTIPLY, "multiply" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_SCREEN, "screen" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_OVERLAY, "overlay" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_DARKEN, "darken" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_LIGHTEN, "lighten" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_COLOR_DODGE, "color-dodge" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_COLOR_BURN, "color-burn" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_HARD_LIGHT, "hard-light" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_SOFT_LIGHT, "soft-light" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_DIFFERENCE, "difference" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_EXCLUSION, "exclusion" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_COLOR, "color" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_HUE, "hue" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_SATURATION, "saturation" },
+  { &GTK_CSS_VALUE_BLEND_MODE, 1, 1, 0, 0, GSK_BLEND_MODE_LUMINOSITY, "luminosity" }
 };
 
 GtkCssValue *
@@ -198,7 +198,7 @@ _gtk_css_blend_mode_value_get (const GtkCssValue *value)
 static double
 get_dpi (GtkCssStyle *style)
 {
-  return _gtk_css_number_value_get (style->core->dpi, 96);
+  return gtk_css_number_value_get (style->core->dpi, 96);
 }
 
 /* XXX: Kinda bad to have that machinery here, nobody expects vital font
@@ -265,7 +265,7 @@ gtk_css_value_font_size_compute (GtkCssValue          *value,
       break;
     case GTK_CSS_FONT_SIZE_SMALLER:
       if (parent_style)
-        font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
+        font_size = gtk_css_number_value_get (parent_style->core->font_size, 100);
       else
         font_size = gtk_css_font_size_get_default_px (provider, style);
       /* This is what WebKit does... */
@@ -273,7 +273,7 @@ gtk_css_value_font_size_compute (GtkCssValue          *value,
       break;
     case GTK_CSS_FONT_SIZE_LARGER:
       if (parent_style)
-        font_size = _gtk_css_number_value_get (parent_style->core->font_size, 100);
+        font_size = gtk_css_number_value_get (parent_style->core->font_size, 100);
       else
         font_size = gtk_css_font_size_get_default_px (provider, style);
       /* This is what WebKit does... */
@@ -281,7 +281,7 @@ gtk_css_value_font_size_compute (GtkCssValue          *value,
       break;
   }
 
-  return _gtk_css_number_value_new (font_size, GTK_CSS_PX);
+  return gtk_css_number_value_new (font_size, GTK_CSS_PX);
 }
 
 static const GtkCssValueClass GTK_CSS_VALUE_FONT_SIZE = {
@@ -296,15 +296,15 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_SIZE = {
 };
 
 static GtkCssValue font_size_values[] = {
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_SMALLER, "smaller" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_LARGER, "larger" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_XX_SMALL, "xx-small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_X_SMALL, "x-small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_SMALL, "small" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_MEDIUM, "medium" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_LARGE, "large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_X_LARGE, "x-large" },
-  { &GTK_CSS_VALUE_FONT_SIZE, 1, FALSE, FALSE, GTK_CSS_FONT_SIZE_XX_LARGE, "xx-large" }
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_SMALLER, "smaller" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_LARGER, "larger" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_XX_SMALL, "xx-small" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_X_SMALL, "x-small" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_SMALL, "small" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_MEDIUM, "medium" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_LARGE, "large" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_X_LARGE, "x-large" },
+  { &GTK_CSS_VALUE_FONT_SIZE, 1, 0, 0, 0, GTK_CSS_FONT_SIZE_XX_LARGE, "xx-large" }
 };
 
 GtkCssValue *
@@ -353,9 +353,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_STYLE = {
 };
 
 static GtkCssValue font_style_values[] = {
-  { &GTK_CSS_VALUE_FONT_STYLE, 1, TRUE, FALSE, PANGO_STYLE_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_STYLE, 1, TRUE, FALSE, PANGO_STYLE_OBLIQUE, "oblique" },
-  { &GTK_CSS_VALUE_FONT_STYLE, 1, TRUE, FALSE, PANGO_STYLE_ITALIC, "italic" }
+  { &GTK_CSS_VALUE_FONT_STYLE, 1, 1, 0, 0, PANGO_STYLE_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_STYLE, 1, 1, 0, 0, PANGO_STYLE_OBLIQUE, "oblique" },
+  { &GTK_CSS_VALUE_FONT_STYLE, 1, 1, 0, 0, PANGO_STYLE_ITALIC, "italic" }
 };
 
 GtkCssValue *
@@ -407,7 +407,7 @@ gtk_css_value_font_weight_compute (GtkCssValue          *value,
     return gtk_css_value_ref (value);
 
   if (context->parent_style)
-    parent_value = _gtk_css_number_value_get (context->parent_style->font->font_weight, 100);
+    parent_value = gtk_css_number_value_get (context->parent_style->font->font_weight, 100);
   else
     parent_value = 400;
 
@@ -435,7 +435,7 @@ gtk_css_value_font_weight_compute (GtkCssValue          *value,
       new_weight = PANGO_WEIGHT_NORMAL;
     }
 
-  return _gtk_css_number_value_new (new_weight, GTK_CSS_NUMBER);
+  return gtk_css_number_value_new (new_weight, GTK_CSS_NUMBER);
 }
 
 static const GtkCssValueClass GTK_CSS_VALUE_FONT_WEIGHT = {
@@ -450,8 +450,8 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_WEIGHT = {
 };
 
 static GtkCssValue font_weight_values[] = {
-  { &GTK_CSS_VALUE_FONT_WEIGHT, 1, FALSE, FALSE, BOLDER, "bolder" },
-  { &GTK_CSS_VALUE_FONT_WEIGHT, 1, FALSE, FALSE, LIGHTER, "lighter" },
+  { &GTK_CSS_VALUE_FONT_WEIGHT, 1, 0, 0, 0, BOLDER, "bolder" },
+  { &GTK_CSS_VALUE_FONT_WEIGHT, 1, 0, 0, 0, LIGHTER, "lighter" },
 };
 
 GtkCssValue *
@@ -468,9 +468,9 @@ gtk_css_font_weight_value_try_parse (GtkCssParser *parser)
     }
 
   if (gtk_css_parser_try_ident (parser, "normal"))
-    return _gtk_css_number_value_new (PANGO_WEIGHT_NORMAL, GTK_CSS_NUMBER);
+    return gtk_css_number_value_new (PANGO_WEIGHT_NORMAL, GTK_CSS_NUMBER);
   if (gtk_css_parser_try_ident (parser, "bold"))
-    return _gtk_css_number_value_new (PANGO_WEIGHT_BOLD, GTK_CSS_NUMBER);
+    return gtk_css_number_value_new (PANGO_WEIGHT_BOLD, GTK_CSS_NUMBER);
 
   return NULL;
 }
@@ -500,15 +500,15 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_STRETCH = {
 };
 
 static GtkCssValue font_stretch_values[] = {
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_ULTRA_CONDENSED, "ultra-condensed" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_EXTRA_CONDENSED, "extra-condensed" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_CONDENSED, "condensed" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_SEMI_CONDENSED, "semi-condensed" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_SEMI_EXPANDED, "semi-expanded" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_EXPANDED, "expanded" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_EXTRA_EXPANDED, "extra-expanded" },
-  { &GTK_CSS_VALUE_FONT_STRETCH, 1, TRUE, FALSE, PANGO_STRETCH_ULTRA_EXPANDED, "ultra-expanded" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_ULTRA_CONDENSED, "ultra-condensed" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_EXTRA_CONDENSED, "extra-condensed" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_CONDENSED, "condensed" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_SEMI_CONDENSED, "semi-condensed" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_SEMI_EXPANDED, "semi-expanded" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_EXPANDED, "expanded" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_EXTRA_EXPANDED, "extra-expanded" },
+  { &GTK_CSS_VALUE_FONT_STRETCH, 1, 1, 0, 0, PANGO_STRETCH_ULTRA_EXPANDED, "ultra-expanded" },
 };
 
 GtkCssValue *
@@ -557,9 +557,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_STYLE = {
 };
 
 static GtkCssValue text_decoration_style_values[] = {
-  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, TRUE, FALSE, GTK_CSS_TEXT_DECORATION_STYLE_SOLID, "solid" },
-  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, TRUE, FALSE, GTK_CSS_TEXT_DECORATION_STYLE_DOUBLE, "double" },
-  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, TRUE, FALSE, GTK_CSS_TEXT_DECORATION_STYLE_WAVY, "wavy" },
+  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, 1, 0, 0, GTK_CSS_TEXT_DECORATION_STYLE_SOLID, "solid" },
+  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, 1, 0, 0, GTK_CSS_TEXT_DECORATION_STYLE_DOUBLE, "double" },
+  { &GTK_CSS_VALUE_TEXT_DECORATION_STYLE, 1, 1, 0, 0, GTK_CSS_TEXT_DECORATION_STYLE_WAVY, "wavy" },
 };
 
 GtkCssValue *
@@ -608,9 +608,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_AREA = {
 };
 
 static GtkCssValue area_values[] = {
-  { &GTK_CSS_VALUE_AREA, 1, TRUE, FALSE, GTK_CSS_AREA_BORDER_BOX, "border-box" },
-  { &GTK_CSS_VALUE_AREA, 1, TRUE, FALSE, GTK_CSS_AREA_PADDING_BOX, "padding-box" },
-  { &GTK_CSS_VALUE_AREA, 1, TRUE, FALSE, GTK_CSS_AREA_CONTENT_BOX, "content-box" }
+  { &GTK_CSS_VALUE_AREA, 1, 1, 0, 0, GTK_CSS_AREA_BORDER_BOX, "border-box" },
+  { &GTK_CSS_VALUE_AREA, 1, 1, 0, 0, GTK_CSS_AREA_PADDING_BOX, "padding-box" },
+  { &GTK_CSS_VALUE_AREA, 1, 1, 0, 0, GTK_CSS_AREA_CONTENT_BOX, "content-box" }
 };
 
 GtkCssValue *
@@ -665,10 +665,10 @@ static const GtkCssValueClass GTK_CSS_VALUE_DIRECTION = {
 };
 
 static GtkCssValue direction_values[] = {
-  { &GTK_CSS_VALUE_DIRECTION, 1, TRUE, FALSE, GTK_CSS_DIRECTION_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_DIRECTION, 1, TRUE, FALSE, GTK_CSS_DIRECTION_REVERSE, "reverse" },
-  { &GTK_CSS_VALUE_DIRECTION, 1, TRUE, FALSE, GTK_CSS_DIRECTION_ALTERNATE, "alternate" },
-  { &GTK_CSS_VALUE_DIRECTION, 1, TRUE, FALSE, GTK_CSS_DIRECTION_ALTERNATE_REVERSE, "alternate-reverse" }
+  { &GTK_CSS_VALUE_DIRECTION, 1, 1, 0, 0, GTK_CSS_DIRECTION_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_DIRECTION, 1, 1, 0, 0, GTK_CSS_DIRECTION_REVERSE, "reverse" },
+  { &GTK_CSS_VALUE_DIRECTION, 1, 1, 0, 0, GTK_CSS_DIRECTION_ALTERNATE, "alternate" },
+  { &GTK_CSS_VALUE_DIRECTION, 1, 1, 0, 0, GTK_CSS_DIRECTION_ALTERNATE_REVERSE, "alternate-reverse" }
 };
 
 GtkCssValue *
@@ -726,8 +726,8 @@ static const GtkCssValueClass GTK_CSS_VALUE_PLAY_STATE = {
 };
 
 static GtkCssValue play_state_values[] = {
-  { &GTK_CSS_VALUE_PLAY_STATE, 1, TRUE, FALSE, GTK_CSS_PLAY_STATE_RUNNING, "running" },
-  { &GTK_CSS_VALUE_PLAY_STATE, 1, TRUE, FALSE, GTK_CSS_PLAY_STATE_PAUSED, "paused" }
+  { &GTK_CSS_VALUE_PLAY_STATE, 1, 1, 0, 0, GTK_CSS_PLAY_STATE_RUNNING, "running" },
+  { &GTK_CSS_VALUE_PLAY_STATE, 1, 1, 0, 0, GTK_CSS_PLAY_STATE_PAUSED, "paused" }
 };
 
 GtkCssValue *
@@ -782,10 +782,10 @@ static const GtkCssValueClass GTK_CSS_VALUE_FILL_MODE = {
 };
 
 static GtkCssValue fill_mode_values[] = {
-  { &GTK_CSS_VALUE_FILL_MODE, 1, TRUE, FALSE, GTK_CSS_FILL_NONE, "none" },
-  { &GTK_CSS_VALUE_FILL_MODE, 1, TRUE, FALSE, GTK_CSS_FILL_FORWARDS, "forwards" },
-  { &GTK_CSS_VALUE_FILL_MODE, 1, TRUE, FALSE, GTK_CSS_FILL_BACKWARDS, "backwards" },
-  { &GTK_CSS_VALUE_FILL_MODE, 1, TRUE, FALSE, GTK_CSS_FILL_BOTH, "both" }
+  { &GTK_CSS_VALUE_FILL_MODE, 1, 1, 0, 0, GTK_CSS_FILL_NONE, "none" },
+  { &GTK_CSS_VALUE_FILL_MODE, 1, 1, 0, 0, GTK_CSS_FILL_FORWARDS, "forwards" },
+  { &GTK_CSS_VALUE_FILL_MODE, 1, 1, 0, 0, GTK_CSS_FILL_BACKWARDS, "backwards" },
+  { &GTK_CSS_VALUE_FILL_MODE, 1, 1, 0, 0, GTK_CSS_FILL_BOTH, "both" }
 };
 
 GtkCssValue *
@@ -840,9 +840,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_ICON_STYLE = {
 };
 
 static GtkCssValue icon_style_values[] = {
-  { &GTK_CSS_VALUE_ICON_STYLE, 1, TRUE, FALSE, GTK_CSS_ICON_STYLE_REQUESTED, "requested" },
-  { &GTK_CSS_VALUE_ICON_STYLE, 1, TRUE, FALSE, GTK_CSS_ICON_STYLE_REGULAR, "regular" },
-  { &GTK_CSS_VALUE_ICON_STYLE, 1, TRUE, FALSE, GTK_CSS_ICON_STYLE_SYMBOLIC, "symbolic" }
+  { &GTK_CSS_VALUE_ICON_STYLE, 1, 1, 0, 0, GTK_CSS_ICON_STYLE_REQUESTED, "requested" },
+  { &GTK_CSS_VALUE_ICON_STYLE, 1, 1, 0, 0, GTK_CSS_ICON_STYLE_REGULAR, "regular" },
+  { &GTK_CSS_VALUE_ICON_STYLE, 1, 1, 0, 0, GTK_CSS_ICON_STYLE_SYMBOLIC, "symbolic" }
 };
 
 GtkCssValue *
@@ -897,9 +897,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_KERNING = {
 };
 
 static GtkCssValue font_kerning_values[] = {
-  { &GTK_CSS_VALUE_FONT_KERNING, 1, TRUE, FALSE, GTK_CSS_FONT_KERNING_AUTO, "auto" },
-  { &GTK_CSS_VALUE_FONT_KERNING, 1, TRUE, FALSE, GTK_CSS_FONT_KERNING_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_KERNING, 1, TRUE, FALSE, GTK_CSS_FONT_KERNING_NONE, "none" }
+  { &GTK_CSS_VALUE_FONT_KERNING, 1, 1, 0, 0, GTK_CSS_FONT_KERNING_AUTO, "auto" },
+  { &GTK_CSS_VALUE_FONT_KERNING, 1, 1, 0, 0, GTK_CSS_FONT_KERNING_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_KERNING, 1, 1, 0, 0, GTK_CSS_FONT_KERNING_NONE, "none" }
 };
 
 GtkCssValue *
@@ -954,9 +954,9 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_POSITION = {
 };
 
 static GtkCssValue font_variant_position_values[] = {
-  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_POSITION_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_POSITION_SUB, "sub" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_POSITION_SUPER, "super" }
+  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_POSITION_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_POSITION_SUB, "sub" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_POSITION, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_POSITION_SUPER, "super" }
 };
 
 GtkCssValue *
@@ -1011,13 +1011,13 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_CAPS = {
 };
 
 static GtkCssValue font_variant_caps_values[] = {
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_SMALL_CAPS, "small-caps" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_ALL_SMALL_CAPS, "all-small-caps" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_PETITE_CAPS, "petite-caps" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_ALL_PETITE_CAPS, "all-petite-caps" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_UNICASE, "unicase" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_CAPS_TITLING_CAPS, "titling-caps" }
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_SMALL_CAPS, "small-caps" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_ALL_SMALL_CAPS, "all-small-caps" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_PETITE_CAPS, "petite-caps" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_ALL_PETITE_CAPS, "all-petite-caps" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_UNICASE, "unicase" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_CAPS, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_CAPS_TITLING_CAPS, "titling-caps" }
 };
 
 GtkCssValue *
@@ -1072,8 +1072,8 @@ static const GtkCssValueClass GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE = {
 };
 
 static GtkCssValue font_variant_alternate_values[] = {
-  { &GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_ALTERNATE_NORMAL, "normal" },
-  { &GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE, 1, TRUE, FALSE, GTK_CSS_FONT_VARIANT_ALTERNATE_HISTORICAL_FORMS, "historical-forms" }
+  { &GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_ALTERNATE_NORMAL, "normal" },
+  { &GTK_CSS_VALUE_FONT_VARIANT_ALTERNATE, 1, 1, 0, 0, GTK_CSS_FONT_VARIANT_ALTERNATE_HISTORICAL_FORMS, "historical-forms" }
 };
 
 GtkCssValue *
@@ -1581,10 +1581,10 @@ static const GtkCssValueClass GTK_CSS_VALUE_TEXT_TRANSFORM = {
 };
 
 static GtkCssValue text_transform_values[] = {
-  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, TRUE, FALSE, GTK_CSS_TEXT_TRANSFORM_NONE, "none" },
-  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, TRUE, FALSE, GTK_CSS_TEXT_TRANSFORM_LOWERCASE, "lowercase" },
-  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, TRUE, FALSE, GTK_CSS_TEXT_TRANSFORM_UPPERCASE, "uppercase" },
-  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, TRUE, FALSE, GTK_CSS_TEXT_TRANSFORM_CAPITALIZE, "capitalize" },
+  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, 1, 0, 0, GTK_CSS_TEXT_TRANSFORM_NONE, "none" },
+  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, 1, 0, 0, GTK_CSS_TEXT_TRANSFORM_LOWERCASE, "lowercase" },
+  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, 1, 0, 0, GTK_CSS_TEXT_TRANSFORM_UPPERCASE, "uppercase" },
+  { &GTK_CSS_VALUE_TEXT_TRANSFORM, 1, 1, 0, 0, GTK_CSS_TEXT_TRANSFORM_CAPITALIZE, "capitalize" },
 };
 
 GtkCssValue *

gtk/gtkcssfiltervalue.c

@@ -108,31 +108,31 @@ gtk_css_filter_init_identity (GtkCssFilter       *filter,
   switch (other->type)
     {
     case GTK_CSS_FILTER_BRIGHTNESS:
-      filter->brightness.value = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      filter->brightness.value = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_CONTRAST:
-      filter->contrast.value = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      filter->contrast.value = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_GRAYSCALE:
-      filter->grayscale.value = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+      filter->grayscale.value = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_HUE_ROTATE:
-      filter->hue_rotate.value = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      filter->hue_rotate.value = gtk_css_number_value_new (0, GTK_CSS_DEG);
       break;
     case GTK_CSS_FILTER_INVERT:
-      filter->invert.value = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+      filter->invert.value = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_OPACITY:
-      filter->opacity.value = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      filter->opacity.value = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_SATURATE:
-      filter->saturate.value = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      filter->saturate.value = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_SEPIA:
-      filter->sepia.value = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+      filter->sepia.value = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_FILTER_BLUR:
-      filter->blur.value = _gtk_css_number_value_new (0, GTK_CSS_PX);
+      filter->blur.value = gtk_css_number_value_new (0, GTK_CSS_PX);
       break;
     case GTK_CSS_FILTER_DROP_SHADOW:
       filter->drop_shadow.value = gtk_css_shadow_value_new_filter (other->drop_shadow.value);
@@ -160,19 +160,19 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
   switch (filter->type)
     {
     case GTK_CSS_FILTER_BRIGHTNESS:
-      value = _gtk_css_number_value_get (filter->brightness.value, 1.0);
+      value = gtk_css_number_value_get (filter->brightness.value, 1.0);
       graphene_matrix_init_scale (matrix, value, value, value);
       graphene_vec4_init (offset, 0.0, 0.0, 0.0, 0.0);
       break;
 
     case GTK_CSS_FILTER_CONTRAST:
-      value = _gtk_css_number_value_get (filter->contrast.value, 1.0);
+      value = gtk_css_number_value_get (filter->contrast.value, 1.0);
       graphene_matrix_init_scale (matrix, value, value, value);
       graphene_vec4_init (offset, 0.5 - 0.5 * value, 0.5 - 0.5 * value, 0.5 - 0.5 * value, 0.0);
       break;
 
     case GTK_CSS_FILTER_GRAYSCALE:
-      value = _gtk_css_number_value_get (filter->grayscale.value, 1.0);
+      value = gtk_css_number_value_get (filter->grayscale.value, 1.0);
       graphene_matrix_init_from_float (matrix, (float[16]) {
                                            1.0 - (1.0 - R) * value, R * value, R * value, 0.0,
                                            G * value, 1.0 - (1.0 - G) * value, G * value, 0.0,
@@ -185,7 +185,7 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
     case GTK_CSS_FILTER_HUE_ROTATE:
       {
         double c, s;
-        value = _gtk_css_number_value_get (filter->grayscale.value, 1.0) * G_PI / 180.0;
+        value = gtk_css_number_value_get (filter->grayscale.value, 1.0) * G_PI / 180.0;
         c = cos (value);
         s = sin (value);
         graphene_matrix_init_from_float (matrix, (float[16]) {
@@ -208,13 +208,13 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
       break;
 
     case GTK_CSS_FILTER_INVERT:
-      value = _gtk_css_number_value_get (filter->invert.value, 1.0);
+      value = gtk_css_number_value_get (filter->invert.value, 1.0);
       graphene_matrix_init_scale (matrix, 1.0 - 2 * value, 1.0 - 2 * value, 1.0 - 2 * value);
       graphene_vec4_init (offset, value, value, value, 0.0);
       break;
 
     case GTK_CSS_FILTER_OPACITY:
-      value = _gtk_css_number_value_get (filter->opacity.value, 1.0);
+      value = gtk_css_number_value_get (filter->opacity.value, 1.0);
       graphene_matrix_init_from_float (matrix, (float[16]) {
                                            1.0, 0.0, 0.0, 0.0,
                                            0.0, 1.0, 0.0, 0.0,
@@ -225,7 +225,7 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
       break;
 
     case GTK_CSS_FILTER_SATURATE:
-      value = _gtk_css_number_value_get (filter->saturate.value, 1.0);
+      value = gtk_css_number_value_get (filter->saturate.value, 1.0);
       graphene_matrix_init_from_float (matrix, (float[16]) {
                                            R + (1.0 - R) * value, R - R * value, R - R * value, 0.0,
                                            G - G * value, G + (1.0 - G) * value, G - G * value, 0.0,
@@ -236,7 +236,7 @@ gtk_css_filter_get_matrix (const GtkCssFilter *filter,
       break;
 
     case GTK_CSS_FILTER_SEPIA:
-      value = _gtk_css_number_value_get (filter->sepia.value, 1.0);
+      value = gtk_css_number_value_get (filter->sepia.value, 1.0);
       graphene_matrix_init_from_float (matrix, (float[16]) {
                                            1.0 - 0.607 * value, 0.349 * value, 0.272 * value, 0.0,
                                            0.769 * value, 1.0 - 0.314 * value, 0.534 * value, 0.0,
@@ -717,7 +717,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_FILTER = {
   gtk_css_value_filter_print
 };
 
-static GtkCssValue filter_none_singleton = { &GTK_CSS_VALUE_FILTER, 1, TRUE, FALSE, 0, {  { GTK_CSS_FILTER_NONE } } };
+static GtkCssValue filter_none_singleton = { &GTK_CSS_VALUE_FILTER, 1, 1, 0, 0, 0, {  { GTK_CSS_FILTER_NONE } } };
 
 static GtkCssValue *
 gtk_css_filter_value_alloc (guint n_filters)
@@ -751,7 +751,7 @@ gtk_css_filter_parse_number (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_PARSE_PERCENT | GTK_CSS_POSITIVE_ONLY);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_PARSE_PERCENT | GTK_CSS_POSITIVE_ONLY);
   if (values[n] == NULL)
     return 0;
 
@@ -765,7 +765,7 @@ gtk_css_filter_parse_length (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
   if (values[n] == NULL)
     return 0;
 
@@ -779,7 +779,7 @@ gtk_css_filter_parse_angle (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
   if (values[n] == NULL)
     return 0;
 
@@ -957,7 +957,7 @@ gtk_css_filter_value_push_snapshot (const GtkCssValue *filter,
         {
           if (filter->filters[j].type == GTK_CSS_FILTER_BLUR)
             {
-              double std_dev = _gtk_css_number_value_get (filter->filters[j].blur.value, 100.0);
+              double std_dev = gtk_css_number_value_get (filter->filters[j].blur.value, 100.0);
               gtk_snapshot_push_blur (snapshot, 2 * std_dev);
             }
           else if (filter->filters[j].type == GTK_CSS_FILTER_DROP_SHADOW)

gtk/gtkcssfontvariationsvalue.c

@@ -229,7 +229,7 @@ gtk_css_font_variations_value_parse (GtkCssParser *parser)
         return NULL;
       }
 
-    coord = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+    coord = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
     if (coord == NULL)
       {
         g_free (name);
@@ -268,7 +268,7 @@ gtk_css_font_variations_value_get_variations (GtkCssValue *value)
       else
         g_string_append (string, ",");
       g_string_append_printf (string, "%s=%g", name,
-                              _gtk_css_number_value_get (coord, 100));
+                              gtk_css_number_value_get (coord, 100));
     }
 
   return g_string_free (string, FALSE);

gtk/gtkcssimage.c

@@ -120,6 +120,19 @@ gtk_css_image_real_is_computed (GtkCssImage *image)
   return FALSE;
 }
 
+static gboolean
+gtk_css_image_real_contains_current_color (GtkCssImage *image)
+{
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_real_resolve (GtkCssImage *image,
+                            GtkCssValue *current_color)
+{
+  return g_object_ref (image);
+}
+
 static void
 _gtk_css_image_class_init (GtkCssImageClass *klass)
 {
@@ -133,6 +146,8 @@ _gtk_css_image_class_init (GtkCssImageClass *klass)
   klass->is_dynamic = gtk_css_image_real_is_dynamic;
   klass->get_dynamic_image = gtk_css_image_real_get_dynamic_image;
   klass->is_computed = gtk_css_image_real_is_computed;
+  klass->contains_current_color = gtk_css_image_real_contains_current_color;
+  klass->resolve = gtk_css_image_real_resolve;
 }
 
 static void
@@ -239,11 +254,11 @@ _gtk_css_image_equal (GtkCssImage *image1,
   return klass->equal (image1, image2);
 }
 
-void
-_gtk_css_image_draw (GtkCssImage        *image,
-                     cairo_t            *cr,
-                     double              width,
-                     double              height)
+static void
+gtk_css_image_draw (GtkCssImage *image,
+                    cairo_t     *cr,
+                    double       width,
+                    double       height)
 {
   GtkSnapshot *snapshot;
   GskRenderNode *node;
@@ -497,7 +512,7 @@ _gtk_css_image_get_surface (GtkCssImage     *image,
                                          surface_height);
 
   cr = cairo_create (result);
-  _gtk_css_image_draw (image, cr, surface_width, surface_height);
+  gtk_css_image_draw (image, cr, surface_width, surface_height);
   cairo_destroy (cr);
 
   return result;
@@ -588,3 +603,20 @@ gtk_css_image_is_computed (GtkCssImage *image)
 
   return klass->is_computed (image);
 }
+
+gboolean
+gtk_css_image_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageClass *klass = GTK_CSS_IMAGE_GET_CLASS (image);
+
+  return klass->contains_current_color (image);
+}
+
+GtkCssImage *
+gtk_css_image_resolve (GtkCssImage *image,
+                       GtkCssValue *current_color)
+{
+  GtkCssImageClass *klass = GTK_CSS_IMAGE_GET_CLASS (image);
+
+  return klass->resolve (image, current_color);
+}

gtk/gtkcssimageconic.c

@@ -61,7 +61,7 @@ gtk_css_image_conic_snapshot (GtkCssImage        *image,
         }
       else
         {
-          pos = _gtk_css_number_value_get (stop->offset, 360) / 360;
+          pos = gtk_css_number_value_get (stop->offset, 360) / 360;
           pos = CLAMP (pos, 0.0, 1.0);
         }
 
@@ -86,7 +86,7 @@ gtk_css_image_conic_snapshot (GtkCssImage        *image,
           &GRAPHENE_RECT_INIT (0, 0, width, height),
           &GRAPHENE_POINT_INIT (_gtk_css_position_value_get_x (self->center, width),
                                 _gtk_css_position_value_get_y (self->center, height)),
-          _gtk_css_number_value_get (self->rotation, 360),
+          gtk_css_number_value_get (self->rotation, 360),
           stops,
           self->n_stops);
 }
@@ -98,13 +98,13 @@ parse_angles (GtkCssParser *parser,
 {
   GtkCssValue **angles = option_data;
   
-  angles[0] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE | GTK_CSS_PARSE_PERCENT);
+  angles[0] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE | GTK_CSS_PARSE_PERCENT);
   if (angles[0] == NULL)
     return FALSE;
 
   if (gtk_css_number_value_can_parse (parser))
     {
-      angles[1] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE | GTK_CSS_PARSE_PERCENT);
+      angles[1] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE | GTK_CSS_PARSE_PERCENT);
       if (angles[1] == NULL)
         return FALSE;
     }
@@ -176,14 +176,14 @@ gtk_css_image_conic_parse_first_arg (GtkCssImageConic *self,
 
   if (gtk_css_parser_try_ident (parser, "from"))
     {
-      self->rotation = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
+      self->rotation = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
       if (self->rotation == NULL)
         return 0;
       nothing_parsed = FALSE;
     }
   else
     {
-      self->rotation = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      self->rotation = gtk_css_number_value_new (0, GTK_CSS_DEG);
     }
 
   if (gtk_css_parser_try_ident (parser, "at"))
@@ -195,8 +195,8 @@ gtk_css_image_conic_parse_first_arg (GtkCssImageConic *self,
     }
   else
     {
-      self->center = _gtk_css_position_value_new (_gtk_css_number_value_new (50, GTK_CSS_PERCENT),
-                                                   _gtk_css_number_value_new (50, GTK_CSS_PERCENT));
+      self->center = _gtk_css_position_value_new (gtk_css_number_value_new (50, GTK_CSS_PERCENT),
+                                                  gtk_css_number_value_new (50, GTK_CSS_PERCENT));
     }
 
   if (!nothing_parsed)
@@ -269,8 +269,8 @@ gtk_css_image_conic_print (GtkCssImage *image,
 
   if (self->center)
     {
-      GtkCssValue *compare = _gtk_css_position_value_new (_gtk_css_number_value_new (50, GTK_CSS_PERCENT),
-                                                          _gtk_css_number_value_new (50, GTK_CSS_PERCENT));
+      GtkCssValue *compare = _gtk_css_position_value_new (gtk_css_number_value_new (50, GTK_CSS_PERCENT),
+                                                          gtk_css_number_value_new (50, GTK_CSS_PERCENT));
 
       if (!gtk_css_value_equal (self->center, compare))
         {
@@ -282,7 +282,7 @@ gtk_css_image_conic_print (GtkCssImage *image,
       gtk_css_value_unref (compare);
     }
 
-  if (self->rotation && _gtk_css_number_value_get (self->rotation, 360) != 0)
+  if (self->rotation && gtk_css_number_value_get (self->rotation, 360) != 0)
     {
       if (written)
         g_string_append_c (string, ' ');
@@ -327,7 +327,7 @@ gtk_css_image_conic_compute (GtkCssImage          *image,
   copy->rotation = gtk_css_value_compute (self->rotation, property_id, context);
 
   copy->n_stops = self->n_stops;
-  copy->color_stops = g_malloc (sizeof (GtkCssImageConicColorStop) * copy->n_stops);
+  copy->color_stops = g_new (GtkCssImageConicColorStop, self->n_stops);
   for (i = 0; i < self->n_stops; i++)
     {
       const GtkCssImageConicColorStop *stop = &self->color_stops[i];
@@ -503,6 +503,53 @@ gtk_css_image_conic_is_computed (GtkCssImage *image)
   return computed;
 }
 
+static gboolean
+gtk_css_image_conic_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageConic *self = GTK_CSS_IMAGE_CONIC (image);
+
+  for (guint i = 0; i < self->n_stops; i ++)
+    {
+      const GtkCssImageConicColorStop *stop = &self->color_stops[i];
+
+      if (gtk_css_value_contains_current_color (stop->color))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_conic_resolve (GtkCssImage *image,
+                             GtkCssValue *current_color)
+{
+  GtkCssImageConic *self = GTK_CSS_IMAGE_CONIC (image);
+  GtkCssImageConic *resolved;
+
+  if (!gtk_css_image_conic_contains_current_color (image))
+    return g_object_ref (image);
+
+  resolved = g_object_new (GTK_TYPE_CSS_IMAGE_CONIC, NULL);
+
+  resolved->center = gtk_css_value_ref (self->center);
+  resolved->rotation = gtk_css_value_ref (self->rotation);
+
+  resolved->n_stops = self->n_stops;
+  resolved->color_stops = g_new (GtkCssImageConicColorStop, self->n_stops);
+
+  for (guint i = 0; i < self->n_stops; i++)
+    {
+      if (self->color_stops[i].offset)
+        resolved->color_stops[i].offset = gtk_css_value_ref (self->color_stops[i].offset);
+      else
+        resolved->color_stops[i].offset = NULL;
+
+      resolved->color_stops[i].color = gtk_css_color_value_resolve (self->color_stops[i].color, NULL, current_color);
+    }
+
+  return GTK_CSS_IMAGE (resolved);
+}
+
 static void
 gtk_css_image_conic_class_init (GtkCssImageConicClass *klass)
 {
@@ -516,6 +563,8 @@ gtk_css_image_conic_class_init (GtkCssImageConicClass *klass)
   image_class->equal = gtk_css_image_conic_equal;
   image_class->transition = gtk_css_image_conic_transition;
   image_class->is_computed = gtk_css_image_conic_is_computed;
+  image_class->contains_current_color = gtk_css_image_conic_contains_current_color;
+  image_class->resolve = gtk_css_image_conic_resolve;
 
   object_class->dispose = gtk_css_image_conic_dispose;
 }

gtk/gtkcssimagecrossfade.c

@@ -289,10 +289,10 @@ parse_progress (GtkCssParser *parser,
   double *progress = option_data;
   GtkCssValue *number;
   
-  number = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_PERCENT | GTK_CSS_POSITIVE_ONLY);
+  number = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_PERCENT | GTK_CSS_POSITIVE_ONLY);
   if (number == NULL)
     return FALSE;
-  *progress = _gtk_css_number_value_get (number, 1);
+  *progress = gtk_css_number_value_get (number, 1);
   gtk_css_value_unref (number);
 
   if (*progress > 1.0)

gtk/gtkcssimagefallback.c

@@ -72,7 +72,10 @@ gtk_css_image_fallback_snapshot (GtkCssImage *image,
     {
       if (fallback->color)
         {
-          const GdkRGBA *color = gtk_css_color_value_get_rgba (fallback->color);
+          const GdkRGBA *color;
+
+          color = gtk_css_color_value_get_rgba (fallback->color);
+
           if (!gdk_rgba_is_clear (color))
             gtk_snapshot_append_color (snapshot, color,
                                        &GRAPHENE_RECT_INIT (0, 0, width, height));
@@ -301,6 +304,69 @@ gtk_css_image_fallback_is_computed (GtkCssImage *image)
   return TRUE;
 }
 
+static gboolean
+gtk_css_image_fallback_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageFallback *fallback = GTK_CSS_IMAGE_FALLBACK (image);
+
+  if (fallback->used < 0)
+    {
+      guint i;
+
+      if (fallback->color && !fallback->images)
+        return gtk_css_value_contains_current_color (fallback->color);
+
+      for (i = 0; i < fallback->n_images; i++)
+        {
+          if (gtk_css_image_contains_current_color (fallback->images[i]))
+            return TRUE;
+        }
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_fallback_resolve (GtkCssImage *image,
+                                GtkCssValue *current_color)
+{
+  GtkCssImageFallback *fallback = GTK_CSS_IMAGE_FALLBACK (image);
+  GtkCssImageFallback *resolved;
+  int i;
+
+  if (fallback->used < 0)
+    {
+      GtkCssValue *resolved_color = NULL;
+
+      if (fallback->color)
+        resolved_color = gtk_css_color_value_resolve (fallback->color, NULL, current_color);
+
+      /* image($color) that didn't change */
+      if (resolved_color && !fallback->images && resolved_color == fallback->color)
+        return g_object_ref (image);
+
+      resolved = g_object_new (_gtk_css_image_fallback_get_type (), NULL);
+      resolved->n_images = fallback->n_images;
+      resolved->images = g_new (GtkCssImage *, fallback->n_images);
+      for (i = 0; i < fallback->n_images; i++)
+        {
+          resolved->images[i] = g_object_ref (fallback->images[i]);
+
+          if (gtk_css_image_is_invalid (resolved->images[i]))
+            continue;
+
+          if (resolved->used < 0)
+            resolved->used = i;
+        }
+
+      resolved->color = resolved_color;
+
+      return GTK_CSS_IMAGE (resolved);
+    }
+  else
+    return GTK_CSS_IMAGE (g_object_ref (image));
+}
+
 static void
 _gtk_css_image_fallback_class_init (GtkCssImageFallbackClass *klass)
 {
@@ -316,6 +382,8 @@ _gtk_css_image_fallback_class_init (GtkCssImageFallbackClass *klass)
   image_class->print = gtk_css_image_fallback_print;
   image_class->equal = gtk_css_image_fallback_equal;
   image_class->is_computed = gtk_css_image_fallback_is_computed;
+  image_class->contains_current_color = gtk_css_image_fallback_contains_current_color;
+  image_class->resolve = gtk_css_image_fallback_resolve;
 
   object_class->dispose = gtk_css_image_fallback_dispose;
 }

gtk/gtkcssimageicontheme.c

@@ -29,6 +29,8 @@
 #include "gtkstyleproviderprivate.h"
 #include "gtksymbolicpaintable.h"
 #include "gtkiconthemeprivate.h"
+#include "gtkcsscolorvalueprivate.h"
+#include "gtkcsspalettevalueprivate.h"
 
 G_DEFINE_TYPE (GtkCssImageIconTheme, _gtk_css_image_icon_theme, GTK_TYPE_CSS_IMAGE)
 
@@ -50,6 +52,7 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
   double icon_width, icon_height;
   int size;
   double x, y;
+  GdkRGBA colors[4];
 
   size = floor (MIN (width, height));
   if (size <= 0)
@@ -89,11 +92,15 @@ gtk_css_image_icon_theme_snapshot (GtkCssImage *image,
       gtk_snapshot_save (snapshot);
       gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
     }
+
+  for (guint i = 0; i < 4; i++)
+    colors[i] = *gtk_css_color_value_get_rgba (icon_theme->colors[i]);
+
   gtk_symbolic_paintable_snapshot_symbolic (GTK_SYMBOLIC_PAINTABLE (icon),
                                             snapshot,
                                             icon_width,
                                             icon_height,
-                                            icon_theme->colors,
+                                            colors,
                                             G_N_ELEMENTS (icon_theme->colors));
   if (x != 0 || y != 0)
     gtk_snapshot_restore (snapshot);
@@ -146,6 +153,7 @@ gtk_css_image_icon_theme_compute (GtkCssImage          *image,
   GtkCssImageIconTheme *copy;
   GtkSettings *settings;
   GdkDisplay *display;
+  const char *names[4] = { NULL, "success", "warning", "error" };
 
   copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
   copy->name = g_strdup (icon_theme->name);
@@ -154,7 +162,18 @@ gtk_css_image_icon_theme_compute (GtkCssImage          *image,
   copy->icon_theme = gtk_icon_theme_get_for_display (display);
   copy->serial = gtk_icon_theme_get_serial (copy->icon_theme);
   copy->scale = gtk_style_provider_get_scale (context->provider);
-  gtk_css_style_lookup_symbolic_colors (context->style, copy->colors);
+
+  for (guint i = 0; i < 4; i++)
+    {
+      GtkCssValue *color = NULL;
+
+      if (names[i])
+        color = gtk_css_palette_value_get_color (context->style->core->icon_palette, names[i]);
+      if (color)
+        copy->colors[i] = gtk_css_value_ref (color);
+      else
+        copy->colors[i] = gtk_css_value_ref (context->style->core->color);
+    }
 
   return GTK_CSS_IMAGE (copy);
 }
@@ -180,10 +199,51 @@ gtk_css_image_icon_theme_dispose (GObject *object)
   icon_theme->name = NULL;
 
   g_clear_object (&icon_theme->cached_icon);
+  g_clear_pointer (&icon_theme->colors[0], gtk_css_value_unref);
+  g_clear_pointer (&icon_theme->colors[1], gtk_css_value_unref);
+  g_clear_pointer (&icon_theme->colors[2], gtk_css_value_unref);
+  g_clear_pointer (&icon_theme->colors[3], gtk_css_value_unref);
 
   G_OBJECT_CLASS (_gtk_css_image_icon_theme_parent_class)->dispose (object);
 }
 
+static gboolean
+gtk_css_image_icon_theme_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
+
+  for (guint i = 0; i < 4; i++)
+    {
+      if (!icon_theme->colors[i] ||
+          gtk_css_value_contains_current_color (icon_theme->colors[i]))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_icon_theme_resolve (GtkCssImage *image,
+                                  GtkCssValue *current)
+{
+  GtkCssImageIconTheme *icon_theme = GTK_CSS_IMAGE_ICON_THEME (image);
+  GtkCssImageIconTheme *copy;
+
+  if (!gtk_css_image_icon_theme_contains_current_color (image))
+    return g_object_ref (image);
+
+  copy = g_object_new (GTK_TYPE_CSS_IMAGE_ICON_THEME, NULL);
+  copy->name = g_strdup (icon_theme->name);
+  copy->icon_theme = icon_theme->icon_theme;
+  copy->serial = icon_theme->serial;
+  copy->scale = icon_theme->scale;
+
+  for (guint i = 0; i < 4; i++)
+    copy->colors[i] = gtk_css_color_value_resolve (icon_theme->colors[i], NULL, current);
+
+  return GTK_CSS_IMAGE (copy);
+}
+
 static void
 _gtk_css_image_icon_theme_class_init (GtkCssImageIconThemeClass *klass)
 {
@@ -196,7 +256,8 @@ _gtk_css_image_icon_theme_class_init (GtkCssImageIconThemeClass *klass)
   image_class->print = gtk_css_image_icon_theme_print;
   image_class->compute = gtk_css_image_icon_theme_compute;
   image_class->equal = gtk_css_image_icon_theme_equal;
-
+  image_class->contains_current_color = gtk_css_image_icon_theme_contains_current_color;
+  image_class->resolve = gtk_css_image_icon_theme_resolve;
   object_class->dispose = gtk_css_image_icon_theme_dispose;
 }
 

gtk/gtkcssimageiconthemeprivate.h

@@ -39,7 +39,7 @@ struct _GtkCssImageIconTheme
   GtkCssImage parent;
 
   GtkIconTheme *icon_theme;
-  GdkRGBA colors[4];
+  GtkCssValue *colors[4];
   int serial;
   int scale;
   char *name;

gtk/gtkcssimagelinear.c

@@ -46,7 +46,7 @@ gtk_css_image_linear_get_repeating_start_end (GtkCssImageLinear *linear,
   if (stop->offset == NULL)
     *start = 0;
   else
-    *start = _gtk_css_number_value_get (stop->offset, length) / length;
+    *start = gtk_css_number_value_get (stop->offset, length) / length;
 
   *end = *start;
 
@@ -57,7 +57,7 @@ gtk_css_image_linear_get_repeating_start_end (GtkCssImageLinear *linear,
       if (stop->offset == NULL)
         continue;
 
-      pos = _gtk_css_number_value_get (stop->offset, length) / length;
+      pos = gtk_css_number_value_get (stop->offset, length) / length;
 
       *end = MAX (pos, *end);
     }
@@ -134,10 +134,10 @@ gtk_css_image_linear_compute_start_point (double angle_in_degrees,
 }
 
 static void
-gtk_css_image_linear_snapshot (GtkCssImage        *image,
-                               GtkSnapshot        *snapshot,
-                               double              width,
-                               double              height)
+gtk_css_image_linear_snapshot (GtkCssImage *image,
+                               GtkSnapshot *snapshot,
+                               double       width,
+                               double       height)
 {
   GtkCssImageLinear *linear = GTK_CSS_IMAGE_LINEAR (image);
   GskColorStop *stops;
@@ -174,7 +174,7 @@ gtk_css_image_linear_snapshot (GtkCssImage        *image,
     }
   else
     {
-      angle = _gtk_css_number_value_get (linear->angle, 100);
+      angle = gtk_css_number_value_get (linear->angle, 100);
     }
 
   gtk_css_image_linear_compute_start_point (angle,
@@ -188,12 +188,16 @@ gtk_css_image_linear_snapshot (GtkCssImage        *image,
 
       if (start == end)
         {
-          /* repeating gradients with all color stops sharing the same offset
-           * get the color of the last color stop */
+          /* Repeating gradients with all color stops sharing the same offset
+           * get the color of the last color stop
+           */
           const GtkCssImageLinearColorStop *stop = &linear->color_stops[linear->n_stops - 1];
+          const GdkRGBA *color;
+
+          color = gtk_css_color_value_get_rgba (stop->color);
 
           gtk_snapshot_append_color (snapshot,
-                                     gtk_css_color_value_get_rgba (stop->color),
+                                     color,
                                      &GRAPHENE_RECT_INIT (0, 0, width, height));
           return;
         }
@@ -224,7 +228,7 @@ gtk_css_image_linear_snapshot (GtkCssImage        *image,
         }
       else
         {
-          pos = _gtk_css_number_value_get (stop->offset, length) / length;
+          pos = gtk_css_number_value_get (stop->offset, length) / length;
           pos = CLAMP (pos, 0.0, 1.0);
         }
 
@@ -236,8 +240,9 @@ gtk_css_image_linear_snapshot (GtkCssImage        *image,
 
           offset += step;
 
-          stops[last].offset = (offset - start) / (end - start);
           stops[last].color = *gtk_css_color_value_get_rgba (stop->color);
+
+          stops[last].offset = (offset - start) / (end - start);
         }
 
       offset = pos;
@@ -279,9 +284,9 @@ gtk_css_image_linear_parse_color_stop (GtkCssImageLinear *self,
 
   if (gtk_css_number_value_can_parse (parser))
     {
-      stop.offset = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_PARSE_PERCENT
-                                                 | GTK_CSS_PARSE_LENGTH);
+      stop.offset = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_PARSE_PERCENT
+                                                | GTK_CSS_PARSE_LENGTH);
       if (stop.offset == NULL)
         {
           gtk_css_value_unref (stop.color);
@@ -359,7 +364,7 @@ gtk_css_image_linear_parse_first_arg (GtkCssImageLinear *linear,
     }
   else if (gtk_css_number_value_can_parse (parser))
     {
-      linear->angle = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
+      linear->angle = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
       if (linear->angle == NULL)
         return 0;
 
@@ -689,6 +694,56 @@ gtk_css_image_linear_is_computed (GtkCssImage *image)
   return computed;
 }
 
+static gboolean
+gtk_css_image_linear_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageLinear *linear = GTK_CSS_IMAGE_LINEAR (image);
+
+  for (guint i = 0; i < linear->n_stops; i ++)
+    {
+      const GtkCssImageLinearColorStop *stop = &linear->color_stops[i];
+
+      if (gtk_css_value_contains_current_color (stop->color))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_linear_resolve (GtkCssImage *image,
+                              GtkCssValue *current_color)
+{
+  GtkCssImageLinear *linear = GTK_CSS_IMAGE_LINEAR (image);
+  GtkCssImageLinear *copy;
+  guint i;
+
+  copy = g_object_new (GTK_TYPE_CSS_IMAGE_LINEAR, NULL);
+  copy->repeating = linear->repeating;
+  copy->side = linear->side;
+
+  if (linear->angle)
+    copy->angle = gtk_css_value_ref (linear->angle);
+
+  copy->n_stops = linear->n_stops;
+  copy->color_stops = g_new (GtkCssImageLinearColorStop, copy->n_stops);
+
+  for (i = 0; i < linear->n_stops; i++)
+    {
+      const GtkCssImageLinearColorStop *stop = &linear->color_stops[i];
+      GtkCssImageLinearColorStop *scopy = &copy->color_stops[i];
+
+      scopy->color = gtk_css_color_value_resolve (stop->color, NULL, current_color);
+
+      if (stop->offset)
+        scopy->offset = gtk_css_value_ref (stop->offset);
+      else
+        scopy->offset = NULL;
+    }
+
+  return GTK_CSS_IMAGE (copy);
+}
+
 static void
 _gtk_css_image_linear_class_init (GtkCssImageLinearClass *klass)
 {
@@ -702,6 +757,8 @@ _gtk_css_image_linear_class_init (GtkCssImageLinearClass *klass)
   image_class->equal = gtk_css_image_linear_equal;
   image_class->transition = gtk_css_image_linear_transition;
   image_class->is_computed = gtk_css_image_linear_is_computed;
+  image_class->contains_current_color = gtk_css_image_linear_contains_current_color;
+  image_class->resolve = gtk_css_image_linear_resolve;
 
   object_class->dispose = gtk_css_image_linear_dispose;
 }

gtk/gtkcssimageprivate.h

@@ -91,6 +91,9 @@ struct _GtkCssImageClass
   void         (* print)                           (GtkCssImage                *image,
                                                     GString                    *string);
   gboolean     (* is_computed)                     (GtkCssImage                *image);
+  gboolean     (* contains_current_color)          (GtkCssImage                *image);
+  GtkCssImage *( * resolve)                        (GtkCssImage                *image,
+                                                    GtkCssValue                *current_color);
 };
 
 GType          _gtk_css_image_get_type             (void) G_GNUC_CONST;
@@ -112,10 +115,6 @@ GtkCssImage *  _gtk_css_image_transition           (GtkCssImage                *
                                                     guint                       property_id,
                                                     double                      progress);
 
-void           _gtk_css_image_draw                 (GtkCssImage                *image,
-                                                    cairo_t                    *cr,
-                                                    double                      width,
-                                                    double                      height);
 void           gtk_css_image_snapshot              (GtkCssImage                *image,
                                                     GtkSnapshot                *snapshot,
                                                     double                      width,
@@ -142,6 +141,10 @@ cairo_surface_t *
                                                     int                         surface_height);
 gboolean       gtk_css_image_is_computed           (GtkCssImage                *image) G_GNUC_PURE;
 
+gboolean       gtk_css_image_contains_current_color (GtkCssImage *image) G_GNUC_PURE;
+
+GtkCssImage *  gtk_css_image_resolve                (GtkCssImage *image,
+                                                     GtkCssValue *current_color);
 
 G_END_DECLS
 

gtk/gtkcssimageradial.c

@@ -47,7 +47,7 @@ gtk_css_image_radial_get_start_end (GtkCssImageRadial *radial,
       if (stop->offset == NULL)
         *start = 0;
       else
-        *start = _gtk_css_number_value_get (stop->offset, radius) / radius;
+        *start = gtk_css_number_value_get (stop->offset, radius) / radius;
 
       *end = *start;
 
@@ -58,7 +58,7 @@ gtk_css_image_radial_get_start_end (GtkCssImageRadial *radial,
           if (stop->offset == NULL)
             continue;
 
-          pos = _gtk_css_number_value_get (stop->offset, radius) / radius;
+          pos = gtk_css_number_value_get (stop->offset, radius) / radius;
 
           *end = MAX (pos, *end);
         }
@@ -96,7 +96,7 @@ gtk_css_image_radial_snapshot (GtkCssImage *image,
       switch (radial->size)
         {
         case GTK_CSS_EXPLICIT_SIZE:
-          hradius = _gtk_css_number_value_get (radial->sizes[0], width);
+          hradius = gtk_css_number_value_get (radial->sizes[0], width);
           break;
         case GTK_CSS_CLOSEST_SIDE:
           hradius = MIN (MIN (x, width - x), MIN (y, height - y));
@@ -128,8 +128,8 @@ gtk_css_image_radial_snapshot (GtkCssImage *image,
       switch (radial->size)
         {
         case GTK_CSS_EXPLICIT_SIZE:
-          hradius = _gtk_css_number_value_get (radial->sizes[0], width);
-          vradius = _gtk_css_number_value_get (radial->sizes[1], height);
+          hradius = gtk_css_number_value_get (radial->sizes[0], width);
+          vradius = gtk_css_number_value_get (radial->sizes[1], height);
           break;
         case GTK_CSS_CLOSEST_SIDE:
           hradius = MIN (x, width - x);
@@ -176,7 +176,7 @@ gtk_css_image_radial_snapshot (GtkCssImage *image,
             continue;
         }
       else
-        pos = MIN (1.0, _gtk_css_number_value_get (stop->offset, hradius) / hradius);
+        pos = MIN (1.0, gtk_css_number_value_get (stop->offset, hradius) / hradius);
 
       pos = MAX (pos, offset);
       step = (pos - offset) / (i - last);
@@ -229,9 +229,9 @@ gtk_css_image_radial_parse_color_stop (GtkCssImageRadial *radial,
 
   if (gtk_css_number_value_can_parse (parser))
     {
-      stop.offset = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_PARSE_PERCENT
-                                                 | GTK_CSS_PARSE_LENGTH);
+      stop.offset = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_PARSE_PERCENT
+                                                | GTK_CSS_PARSE_LENGTH);
       if (stop.offset == NULL)
         {
           gtk_css_value_unref (stop.color);
@@ -294,12 +294,12 @@ gtk_css_image_radial_parse_first_arg (GtkCssImageRadial *radial,
 
         if (!has_size && gtk_css_number_value_can_parse (parser))
           {
-            radial->sizes[0] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
+            radial->sizes[0] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
             if (radial->sizes[0] == NULL)
               return 0;
             if (gtk_css_number_value_can_parse (parser))
               {
-                radial->sizes[1] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
+                radial->sizes[1] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_PARSE_PERCENT);
                 if (radial->sizes[1] == NULL)
                   return 0;
               }
@@ -323,8 +323,8 @@ gtk_css_image_radial_parse_first_arg (GtkCssImageRadial *radial,
     }
   else
     {
-      radial->position = _gtk_css_position_value_new (_gtk_css_number_value_new (50, GTK_CSS_PERCENT),
-                                                      _gtk_css_number_value_new (50, GTK_CSS_PERCENT));
+      radial->position = _gtk_css_position_value_new (gtk_css_number_value_new (50, GTK_CSS_PERCENT),
+                                                      gtk_css_number_value_new (50, GTK_CSS_PERCENT));
     }
 
   if (!has_size)
@@ -724,6 +724,62 @@ gtk_css_image_radial_is_computed (GtkCssImage *image)
 
   return computed;
 }
+
+static gboolean
+gtk_css_image_radial_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageRadial *radial = GTK_CSS_IMAGE_RADIAL (image);
+
+  for (guint i = 0; i < radial->n_stops; i ++)
+    {
+      const GtkCssImageRadialColorStop *stop = &radial->color_stops[i];
+
+      if (gtk_css_value_contains_current_color (stop->color))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_radial_resolve (GtkCssImage *image,
+                              GtkCssValue *current_color)
+{
+  GtkCssImageRadial *radial = GTK_CSS_IMAGE_RADIAL (image);
+  GtkCssImageRadial *copy;
+
+  copy = g_object_new (GTK_TYPE_CSS_IMAGE_RADIAL, NULL);
+  copy->repeating = radial->repeating;
+  copy->circle = radial->circle;
+  copy->size = radial->size;
+
+  copy->position = gtk_css_value_ref (radial->position);
+
+  if (radial->sizes[0])
+    copy->sizes[0] = gtk_css_value_ref (radial->sizes[0]);
+
+  if (radial->sizes[1])
+    copy->sizes[1] = gtk_css_value_ref (radial->sizes[1]);
+
+  copy->n_stops = radial->n_stops;
+  copy->color_stops = g_new (GtkCssImageRadialColorStop, copy->n_stops);
+
+  for (guint i = 0; i < radial->n_stops; i++)
+    {
+      const GtkCssImageRadialColorStop *stop = &radial->color_stops[i];
+      GtkCssImageRadialColorStop *scopy = &copy->color_stops[i];
+
+      scopy->color = gtk_css_color_value_resolve (stop->color, NULL, current_color);
+
+      if (stop->offset)
+        scopy->offset = gtk_css_value_ref (stop->offset);
+      else
+        scopy->offset = NULL;
+    }
+
+  return GTK_CSS_IMAGE (copy);
+}
+
 static void
 _gtk_css_image_radial_class_init (GtkCssImageRadialClass *klass)
 {
@@ -737,6 +793,8 @@ _gtk_css_image_radial_class_init (GtkCssImageRadialClass *klass)
   image_class->transition = gtk_css_image_radial_transition;
   image_class->equal = gtk_css_image_radial_equal;
   image_class->is_computed = gtk_css_image_radial_is_computed;
+  image_class->contains_current_color = gtk_css_image_radial_contains_current_color;
+  image_class->resolve = gtk_css_image_radial_resolve;
 
   object_class->dispose = gtk_css_image_radial_dispose;
 }

gtk/gtkcssimagerecolor.c

@@ -55,43 +55,13 @@ gtk_css_image_recolor_dispose (GObject *object)
   GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (object);
 
   g_clear_pointer (&recolor->palette, gtk_css_value_unref);
+  g_clear_pointer (&recolor->color, gtk_css_value_unref);
   g_clear_object (&recolor->file);
   g_clear_object (&recolor->texture);
 
   G_OBJECT_CLASS (_gtk_css_image_recolor_parent_class)->dispose (object);
 }
 
-static void
-lookup_symbolic_colors (GtkCssStyle *style,
-                        GtkCssValue *palette,
-                        GdkRGBA     *color_out,
-                        GdkRGBA     *success_out,
-                        GdkRGBA     *warning_out,
-                        GdkRGBA     *error_out)
-{
-  const GdkRGBA *lookup;
-
-  *color_out = *gtk_css_color_value_get_rgba (style->core->color);
-
-  lookup = gtk_css_palette_value_get_color (palette, "success");
-  if (lookup)
-    *success_out = *lookup;
-  else
-    *success_out = *color_out;
-
-  lookup = gtk_css_palette_value_get_color (palette, "warning");
-  if (lookup)
-    *warning_out = *lookup;
-  else
-    *warning_out = *color_out;
-
-  lookup = gtk_css_palette_value_get_color (palette, "error");
-  if (lookup)
-    *error_out = *lookup;
-  else
-    *error_out = *color_out;
-}
-
 static void
 gtk_css_image_recolor_load_texture (GtkCssImageRecolor  *recolor,
                                     GError             **error)
@@ -127,21 +97,22 @@ gtk_css_image_recolor_load_texture (GtkCssImageRecolor  *recolor,
 }
 
 static GtkCssImage *
-gtk_css_image_recolor_load (GtkCssImageRecolor  *recolor,
-                            GtkCssStyle         *style,
-                            GtkCssValue         *palette,
-                            int                  scale,
-                            GError             **gerror)
+gtk_css_image_recolor_load (GtkCssImageRecolor    *recolor,
+                            GtkCssComputeContext  *context,
+                            GtkCssValue           *palette,
+                            int                    scale,
+                            GError               **gerror)
 {
   GError *local_error = NULL;
   GtkCssImageRecolor *image;
 
   image = g_object_new (GTK_TYPE_CSS_IMAGE_RECOLOR, NULL);
 
-  lookup_symbolic_colors (style, palette, &image->color, &image->success, &image->warning, &image->error);
-  gtk_css_image_recolor_load_texture (recolor, &local_error);
-
   image->file = g_object_ref (recolor->file);
+  image->palette = gtk_css_value_ref (palette);
+  image->color = gtk_css_value_ref (context->style->core->color);
+
+  gtk_css_image_recolor_load_texture (recolor, &local_error);
 
   if (recolor->texture)
     image->texture = g_object_ref (recolor->texture);
@@ -172,16 +143,34 @@ gtk_css_image_recolor_snapshot (GtkCssImage *image,
                                 double       height)
 {
   GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (image);
-  const GdkRGBA *fg = &recolor->color;
-  const GdkRGBA *sc = &recolor->success;
-  const GdkRGBA *wc = &recolor->warning;
-  const GdkRGBA *ec = &recolor->error;
+  const GdkRGBA *fg, *sc, *wc, *ec;
+  const GtkCssValue *color;
   graphene_matrix_t matrix;
   graphene_vec4_t offset;
 
   if (recolor->texture == NULL)
     return;
 
+  fg = gtk_css_color_value_get_rgba (recolor->color);
+
+  color = gtk_css_palette_value_get_color (recolor->palette, "success");
+  if (color)
+    sc = gtk_css_color_value_get_rgba (color);
+  else
+    sc = fg;
+
+  color = gtk_css_palette_value_get_color (recolor->palette, "warning");
+  if (color)
+    wc = gtk_css_color_value_get_rgba (color);
+  else
+    wc = fg;
+
+  color = gtk_css_palette_value_get_color (recolor->palette, "error");
+  if (color)
+    ec = gtk_css_color_value_get_rgba (color);
+  else
+    ec = fg;
+
   graphene_matrix_init_from_float (&matrix,
           (float[16]) {
                        sc->red - fg->red, sc->green - fg->green, sc->blue - fg->blue, 0,
@@ -218,7 +207,7 @@ gtk_css_image_recolor_compute (GtkCssImage          *image,
   else
     palette = gtk_css_value_ref (context->style->core->icon_palette);
 
-  img = gtk_css_image_recolor_load (recolor, context->style, palette, scale, &error);
+  img = gtk_css_image_recolor_load (recolor, context, palette, scale, &error);
 
   if (error)
     {
@@ -267,7 +256,7 @@ gtk_css_image_recolor_parse_arg (GtkCssParser *parser,
 
 static gboolean
 gtk_css_image_recolor_parse (GtkCssImage  *image,
-                                GtkCssParser *parser)
+                             GtkCssParser *parser)
 {
   if (!gtk_css_parser_has_function (parser, "-gtk-recolor"))
     {
@@ -309,8 +298,37 @@ gtk_css_image_recolor_is_computed (GtkCssImage *image)
 {
   GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (image);
 
-  return recolor->texture &&
-         (!recolor->palette || gtk_css_value_is_computed (recolor->palette));
+  return recolor->texture && gtk_css_value_is_computed (recolor->palette);
+}
+
+static gboolean
+gtk_css_image_recolor_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (image);
+
+  if (!recolor->palette || !recolor->color)
+    return TRUE;
+
+  return gtk_css_value_contains_current_color (recolor->palette) ||
+         gtk_css_value_contains_current_color (recolor->color);
+}
+
+static GtkCssImage *
+gtk_css_image_recolor_resolve (GtkCssImage *image,
+                               GtkCssValue *current_color)
+{
+  GtkCssImageRecolor *recolor = GTK_CSS_IMAGE_RECOLOR (image);
+  GtkCssImageRecolor *img;
+
+  img = g_object_new (GTK_TYPE_CSS_IMAGE_RECOLOR, NULL);
+
+  img->palette = gtk_css_palette_value_resolve (recolor->palette, current_color);
+  img->color = gtk_css_color_value_resolve (recolor->color, NULL, current_color);
+  img->file = g_object_ref (recolor->file);
+  if (recolor->texture)
+    img->texture = g_object_ref (recolor->texture);
+
+  return GTK_CSS_IMAGE (img);
 }
 
 static void
@@ -326,6 +344,8 @@ _gtk_css_image_recolor_class_init (GtkCssImageRecolorClass *klass)
   image_class->parse = gtk_css_image_recolor_parse;
   image_class->print = gtk_css_image_recolor_print;
   image_class->is_computed = gtk_css_image_recolor_is_computed;
+  image_class->contains_current_color = gtk_css_image_recolor_contains_current_color;
+  image_class->resolve = gtk_css_image_recolor_resolve;
 
   object_class->dispose = gtk_css_image_recolor_dispose;
 }

gtk/gtkcssimagerecolorprivate.h

@@ -39,12 +39,9 @@ struct _GtkCssImageRecolor
   GtkCssImage parent;
 
   GFile *file;
+  GtkCssValue *color;
   GtkCssValue *palette;
   GdkTexture *texture;
-  GdkRGBA color;
-  GdkRGBA success;
-  GdkRGBA warning;
-  GdkRGBA error;
 };
 
 struct _GtkCssImageRecolorClass

gtk/gtkcssimagescaled.c

@@ -208,6 +208,42 @@ gtk_css_image_scaled_is_computed (GtkCssImage *image)
          gtk_css_image_is_computed (self->images[0]);
 }
 
+static gboolean
+gtk_css_image_scaled_contains_current_color (GtkCssImage *image)
+{
+  GtkCssImageScaled *self = GTK_CSS_IMAGE_SCALED (image);
+
+  for (guint i = 0; i < self->n_images; i++)
+    {
+      if (gtk_css_image_contains_current_color (self->images[i]))
+        return TRUE;
+    }
+
+  return FALSE;
+}
+
+static GtkCssImage *
+gtk_css_image_scaled_resolve (GtkCssImage *image,
+                              GtkCssValue *current_color)
+{
+  GtkCssImageScaled *self = GTK_CSS_IMAGE_SCALED (image);
+  GtkCssImageScaled *res;
+
+  res = g_object_new (GTK_TYPE_CSS_IMAGE_SCALED, NULL);
+
+  res->n_images = self->n_images;
+  res->images = g_new (GtkCssImage *, self->n_images);
+  res->scales = g_new (int, self->n_images);
+
+  for (guint i = 0; i < self->n_images; i++)
+    {
+      res->images[i] = gtk_css_image_resolve (self->images[i], current_color);
+      res->scales[i] = self->scales[i];
+    }
+
+  return GTK_CSS_IMAGE (res);
+}
+
 static void
 _gtk_css_image_scaled_class_init (GtkCssImageScaledClass *klass)
 {
@@ -222,6 +258,8 @@ _gtk_css_image_scaled_class_init (GtkCssImageScaledClass *klass)
   image_class->compute = gtk_css_image_scaled_compute;
   image_class->print = gtk_css_image_scaled_print;
   image_class->is_computed = gtk_css_image_scaled_is_computed;
+  image_class->contains_current_color = gtk_css_image_scaled_contains_current_color;
+  image_class->resolve = gtk_css_image_scaled_resolve;
 
   object_class->dispose = gtk_css_image_scaled_dispose;
 }

gtk/gtkcssimagevalue.c

@@ -134,7 +134,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_IMAGE = {
 GtkCssValue *
 _gtk_css_image_value_new (GtkCssImage *image)
 {
-  static GtkCssValue image_none_singleton = { &GTK_CSS_VALUE_IMAGE, 1, TRUE, FALSE, NULL };
+  static GtkCssValue image_none_singleton = { &GTK_CSS_VALUE_IMAGE, 1, 1, 0, 0, NULL };
   GtkCssValue *value;
 
   if (image == NULL)
@@ -143,6 +143,7 @@ _gtk_css_image_value_new (GtkCssImage *image)
   value = gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_IMAGE);
   value->image = image;
   value->is_computed = gtk_css_image_is_computed (image);
+  value->contains_current_color = gtk_css_image_contains_current_color (image);
 
   return value;
 }
@@ -155,3 +156,12 @@ _gtk_css_image_value_get_image (const GtkCssValue *value)
   return value->image;
 }
 
+GtkCssValue *
+gtk_css_image_value_resolve (GtkCssValue *value,
+                             GtkCssValue *current_color)
+{
+  if (!gtk_css_value_contains_current_color (value))
+    return gtk_css_value_ref (value);
+
+  return _gtk_css_image_value_new (gtk_css_image_resolve (_gtk_css_image_value_get_image (value), current_color));
+}

gtk/gtkcssimagevalueprivate.h

@@ -28,6 +28,9 @@ GtkCssValue *   _gtk_css_image_value_new           (GtkCssImage         *image);
 
 GtkCssImage *   _gtk_css_image_value_get_image     (const GtkCssValue   *image);
 
+GtkCssValue *    gtk_css_image_value_resolve       (GtkCssValue *value,
+                                                    GtkCssValue *current_color);
+
 
 G_END_DECLS
 

gtk/gtkcssinitialvalue.c

@@ -55,7 +55,7 @@ gtk_css_value_initial_compute (GtkCssValue          *value,
           g_object_get (settings, "gtk-xft-dpi", &dpi_int, NULL);
 
           if (dpi_int > 0.0)
-            return _gtk_css_number_value_new (dpi_int / 1024., GTK_CSS_NUMBER);
+            return gtk_css_number_value_new (dpi_int / 1024., GTK_CSS_NUMBER);
         }
       break;
 

gtk/gtkcsslineheightvalue.c

@@ -52,7 +52,7 @@ gtk_css_value_line_height_compute (GtkCssValue          *value,
       double factor;
       GtkCssValue *computed;
 
-      factor = _gtk_css_number_value_get (height, 1);
+      factor = gtk_css_number_value_get (height, 1);
       computed = gtk_css_number_value_multiply (context->style->core->font_size, factor);
 
       gtk_css_value_unref (height);
@@ -154,10 +154,10 @@ gtk_css_line_height_value_parse (GtkCssParser *parser)
   if (gtk_css_parser_try_ident (parser, "normal"))
     return gtk_css_value_ref (gtk_css_line_height_value_get_default ());
 
-  height = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER |
-                                                GTK_CSS_PARSE_PERCENT |
-                                                GTK_CSS_PARSE_LENGTH |
-                                                GTK_CSS_POSITIVE_ONLY);
+  height = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER |
+                                               GTK_CSS_PARSE_PERCENT |
+                                               GTK_CSS_PARSE_LENGTH |
+                                               GTK_CSS_POSITIVE_ONLY);
   if (!height)
     return NULL;
 
@@ -170,5 +170,5 @@ gtk_css_line_height_value_get (const GtkCssValue *value)
   if (value->class == &GTK_CSS_VALUE_LINE_HEIGHT)
     return 0.0;
 
-  return _gtk_css_number_value_get (value, 1);
+  return gtk_css_number_value_get (value, 1);
 }

gtk/gtkcssnumbervalueprivate.h

@@ -36,13 +36,15 @@ typedef enum /*< skip >*/ {
   GTK_CSS_PARSE_TIME = (1 << 5)
 } GtkCssNumberParseFlags;
 
+#define GTK_CSS_PARSE_DIMENSION (GTK_CSS_PARSE_LENGTH|GTK_CSS_PARSE_ANGLE|GTK_CSS_PARSE_TIME)
+
 GtkCssValue *   gtk_css_dimension_value_new         (double                  value,
                                                      GtkCssUnit              unit);
 
-GtkCssValue *   _gtk_css_number_value_new           (double                  value,
+GtkCssValue *   gtk_css_number_value_new            (double                  value,
                                                      GtkCssUnit              unit);
 gboolean        gtk_css_number_value_can_parse      (GtkCssParser           *parser);
-GtkCssValue *   _gtk_css_number_value_parse         (GtkCssParser           *parser,
+GtkCssValue *   gtk_css_number_value_parse          (GtkCssParser           *parser,
                                                      GtkCssNumberParseFlags  flags);
 
 GtkCssDimension gtk_css_number_value_get_dimension  (const GtkCssValue      *value) G_GNUC_PURE;
@@ -53,10 +55,24 @@ GtkCssValue *   gtk_css_number_value_add            (GtkCssValue            *val
                                                      GtkCssValue            *value2);
 GtkCssValue *   gtk_css_number_value_try_add        (GtkCssValue            *value1,
                                                      GtkCssValue            *value2);
-double          _gtk_css_number_value_get           (const GtkCssValue      *number,
+double          gtk_css_number_value_get            (const GtkCssValue      *number,
+                                                     double                  one_hundred_percent) G_GNUC_PURE;
+double          gtk_css_number_value_get_canonical  (GtkCssValue            *number,
                                                      double                  one_hundred_percent) G_GNUC_PURE;
 
 gboolean        gtk_css_dimension_value_is_zero     (const GtkCssValue      *value) G_GNUC_PURE;
 
+enum {
+  ROUND_NEAREST,
+  ROUND_UP,
+  ROUND_DOWN,
+  ROUND_TO_ZERO,
+};
+
+GtkCssValue *   gtk_css_math_value_new              (guint                    type,
+                                                     guint                    mode,
+                                                     GtkCssValue            **values,
+                                                     guint                    n_values);
+
 G_END_DECLS
 

gtk/gtkcsspalettevalue.c

@@ -323,6 +323,7 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
       }
 
     result->is_computed = result->is_computed && gtk_css_value_is_computed (color);
+    result->contains_current_color = result->contains_current_color || gtk_css_value_contains_current_color (color);
 
     g_ptr_array_add (names, ident);
     g_ptr_array_add (colors, color);
@@ -336,7 +337,7 @@ gtk_css_palette_value_parse (GtkCssParser *parser)
   return result;
 }
 
-const GdkRGBA *
+GtkCssValue *
 gtk_css_palette_value_get_color (GtkCssValue *value,
                                  const char  *name)
 {
@@ -347,8 +348,27 @@ gtk_css_palette_value_get_color (GtkCssValue *value,
   for (i = 0; i < value->n_colors; i ++)
     {
       if (strcmp (value->color_names[i], name) == 0)
-        return gtk_css_color_value_get_rgba (value->color_values[i]);
+        return value->color_values[i];
     }
 
   return NULL;
 }
+
+GtkCssValue *
+gtk_css_palette_value_resolve (GtkCssValue *value,
+                               GtkCssValue *current_color)
+{
+  GtkCssValue *result;
+
+  if (!gtk_css_value_contains_current_color (value))
+    return gtk_css_value_ref (value);
+
+  result = gtk_css_palette_value_new_sized (value->n_colors);
+  for (guint i = 0; i < value->n_colors; i++)
+    {
+      result->color_names[i] = g_strdup (value->color_names[i]);
+      result->color_values[i] = gtk_css_color_value_resolve (value->color_values[i], NULL, current_color);
+    }
+
+  return result;
+}

gtk/gtkcsspalettevalueprivate.h

@@ -30,8 +30,11 @@ GtkCssValue *   gtk_css_palette_value_new_default       (void);
 
 GtkCssValue *   gtk_css_palette_value_parse             (GtkCssParser        *parser);
 
-const GdkRGBA * gtk_css_palette_value_get_color         (GtkCssValue         *value,
+GtkCssValue *   gtk_css_palette_value_get_color         (GtkCssValue         *value,
                                                          const char          *color_name);
 
+GtkCssValue *   gtk_css_palette_value_resolve           (GtkCssValue         *value,
+                                                         GtkCssValue         *current_color);
+
 G_END_DECLS
 

gtk/gtkcsspositionvalue.c

@@ -92,10 +92,10 @@ gtk_css_value_position_print (const GtkCssValue *position,
     const char *y_name;
     GtkCssValue *number;
   } values[] = { 
-    { "left",   "top",    _gtk_css_number_value_new (0, GTK_CSS_PERCENT) },
-    { "right",  "bottom", _gtk_css_number_value_new (100, GTK_CSS_PERCENT) }
+    { "left",   "top",    gtk_css_number_value_new (0, GTK_CSS_PERCENT) },
+    { "right",  "bottom", gtk_css_number_value_new (100, GTK_CSS_PERCENT) }
   };
-  GtkCssValue *center = _gtk_css_number_value_new (50, GTK_CSS_PERCENT);
+  GtkCssValue *center = gtk_css_number_value_new (50, GTK_CSS_PERCENT);
   guint i;
 
   if (gtk_css_value_equal (position->x, center))
@@ -196,9 +196,9 @@ position_value_parse (GtkCssParser *parser, gboolean try)
       if (gtk_css_parser_try_ident (parser, names[i].name))
         {
           if (names[i].horizontal)
-	    x = _gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
+	    x = gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
           else
-	    y = _gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
+	    y = gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
           swap = names[i].swap;
           break;
         }
@@ -207,9 +207,9 @@ position_value_parse (GtkCssParser *parser, gboolean try)
     {
       if (gtk_css_number_value_can_parse (parser))
         {
-          x = _gtk_css_number_value_parse (parser,
-                                           GTK_CSS_PARSE_PERCENT
-                                           | GTK_CSS_PARSE_LENGTH);
+          x = gtk_css_number_value_parse (parser,
+                                          GTK_CSS_PARSE_PERCENT
+                                          | GTK_CSS_PARSE_LENGTH);
 
           if (x == NULL)
             return NULL;
@@ -239,17 +239,17 @@ position_value_parse (GtkCssParser *parser, gboolean try)
               if (names[i].horizontal && !names[i].swap)
                 {
                   y = x;
-	          x = _gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
+	          x = gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
                 }
               else
                 {
-	          y = _gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
+	          y = gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
                 }
             }
           else
             {
               g_assert (names[i].horizontal || names[i].swap);
-	      x = _gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
+	      x = gtk_css_number_value_new (names[i].percentage, GTK_CSS_PERCENT);
             }
           break;
         }
@@ -266,9 +266,9 @@ position_value_parse (GtkCssParser *parser, gboolean try)
               gtk_css_value_unref (y);
               return NULL;
             }
-          y = _gtk_css_number_value_parse (parser,
-                                           GTK_CSS_PARSE_PERCENT
-                                           | GTK_CSS_PARSE_LENGTH);
+          y = gtk_css_number_value_parse (parser,
+                                          GTK_CSS_PARSE_PERCENT
+                                          | GTK_CSS_PARSE_LENGTH);
           if (y == NULL)
             {
               gtk_css_value_unref (x);
@@ -278,9 +278,9 @@ position_value_parse (GtkCssParser *parser, gboolean try)
       else
         {
           if (y)
-            x = _gtk_css_number_value_new (50, GTK_CSS_PERCENT);
+            x = gtk_css_number_value_new (50, GTK_CSS_PERCENT);
           else
-            y = _gtk_css_number_value_new (50, GTK_CSS_PERCENT);
+            y = gtk_css_number_value_new (50, GTK_CSS_PERCENT);
         }
     }
 
@@ -304,13 +304,13 @@ gtk_css_position_value_parse_spacing (GtkCssParser *parser)
 {
   GtkCssValue *x, *y;
 
-  x = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
+  x = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
   if (x == NULL)
     return NULL;
 
   if (gtk_css_number_value_can_parse (parser))
     {
-      y = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
+      y = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH | GTK_CSS_POSITIVE_ONLY);
       if (y == NULL)
         {
           gtk_css_value_unref (x);
@@ -332,7 +332,7 @@ _gtk_css_position_value_get_x (const GtkCssValue *position,
   g_return_val_if_fail (position != NULL, 0.0);
   g_return_val_if_fail (position->class == &GTK_CSS_VALUE_POSITION, 0.0);
 
-  return _gtk_css_number_value_get (position->x, one_hundred_percent);
+  return gtk_css_number_value_get (position->x, one_hundred_percent);
 }
 
 double
@@ -342,6 +342,6 @@ _gtk_css_position_value_get_y (const GtkCssValue *position,
   g_return_val_if_fail (position != NULL, 0.0);
   g_return_val_if_fail (position->class == &GTK_CSS_VALUE_POSITION, 0.0);
 
-  return _gtk_css_number_value_get (position->y, one_hundred_percent);
+  return gtk_css_number_value_get (position->y, one_hundred_percent);
 }
 

gtk/gtkcssprovider.c

@@ -184,10 +184,12 @@ gtk_css_provider_parsing_error (GtkCssProvider  *provider,
     {
       char *s = gtk_css_section_to_string (section);
 
-      g_warning ("Theme parser %s: %s: %s",
-                 error->domain == GTK_CSS_PARSER_WARNING ? "warning" : "error",
-                 s,
-                 error->message);
+      if (GTK_DEBUG_CHECK (CSS) ||
+          !g_error_matches (error, GTK_CSS_PARSER_WARNING, GTK_CSS_PARSER_WARNING_DEPRECATED))
+        g_warning ("Theme parser %s: %s: %s",
+                   error->domain == GTK_CSS_PARSER_WARNING ? "warning" : "error",
+                   s,
+                   error->message);
 
       g_free (s);
     }

gtk/gtkcssrepeatvalue.c

@@ -138,28 +138,28 @@ static struct {
   GtkCssValue values[4];
 } background_repeat_values[4] = {
   { "no-repeat",
-  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_NO_REPEAT },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_REPEAT    },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_ROUND     },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_SPACE     }
+  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_NO_REPEAT },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_REPEAT    },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_ROUND     },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_NO_REPEAT, GTK_CSS_REPEAT_STYLE_SPACE     }
   } },
   { "repeat",
-  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_NO_REPEAT },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_REPEAT    },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_ROUND     },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_SPACE     }
+  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_NO_REPEAT },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_REPEAT    },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_ROUND     },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,    GTK_CSS_REPEAT_STYLE_SPACE     }
   } }, 
   { "round",
-  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_NO_REPEAT },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_REPEAT    },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_ROUND     },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_SPACE     }
+  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_NO_REPEAT },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_REPEAT    },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_ROUND     },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,     GTK_CSS_REPEAT_STYLE_SPACE     }
   } }, 
   { "space",
-  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_NO_REPEAT },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_REPEAT    },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_ROUND     },
-    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_SPACE     }
+  { { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_NO_REPEAT },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_REPEAT    },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_ROUND     },
+    { &GTK_CSS_VALUE_BACKGROUND_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,     GTK_CSS_REPEAT_STYLE_SPACE     }
   } }
 };
 
@@ -232,28 +232,28 @@ static struct {
   GtkCssValue values[4];
 } border_repeat_values[4] = {
   { "stretch",
-  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_STRETCH },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_REPEAT  },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_ROUND   },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_SPACE   }
+  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_STRETCH },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_REPEAT  },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_ROUND   },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_STRETCH, GTK_CSS_REPEAT_STYLE_SPACE   }
   } },
   { "repeat",
-  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_STRETCH },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_REPEAT  },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_ROUND   },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_SPACE   }
+  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_STRETCH },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_REPEAT  },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_ROUND   },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_REPEAT,  GTK_CSS_REPEAT_STYLE_SPACE   }
   } }, 
   { "round",
-  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_STRETCH },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_REPEAT  },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_ROUND   },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_SPACE   }
+  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_STRETCH },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_REPEAT  },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_ROUND   },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_ROUND,   GTK_CSS_REPEAT_STYLE_SPACE   }
   } }, 
   { "space",
-  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_STRETCH },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_REPEAT  },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_ROUND   },
-    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, TRUE, FALSE, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_SPACE   }
+  { { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_STRETCH },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_REPEAT  },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_ROUND   },
+    { &GTK_CSS_VALUE_BORDER_REPEAT, 1, 1, 0, 0, GTK_CSS_REPEAT_STYLE_SPACE,   GTK_CSS_REPEAT_STYLE_SPACE   }
   } }
 };
 

gtk/gtkcssshadowvalue.c

@@ -26,6 +26,7 @@
 #include "gtkcsscolorvalueprivate.h"
 #include "gtksnapshotprivate.h"
 #include "gtkpangoprivate.h"
+#include "gtkcssnodeprivate.h"
 
 #include "gsk/gskcairoblurprivate.h"
 #include "gsk/gskroundedrectprivate.h"
@@ -59,10 +60,10 @@ shadow_value_for_transition (ShadowValue *result,
                              gboolean     inset)
 {
   result->inset = inset;
-  result->hoffset = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  result->voffset = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  result->radius = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  result->spread = _gtk_css_number_value_new (0, GTK_CSS_PX);
+  result->hoffset = gtk_css_number_value_new (0, GTK_CSS_PX);
+  result->voffset = gtk_css_number_value_new (0, GTK_CSS_PX);
+  result->radius = gtk_css_number_value_new (0, GTK_CSS_PX);
+  result->spread = gtk_css_number_value_new (0, GTK_CSS_PX);
   result->color = gtk_css_color_value_new_transparent ();
 }
 
@@ -254,14 +255,14 @@ gtk_css_value_shadow_print (const GtkCssValue *value,
       g_string_append_c (string, ' ');
       gtk_css_value_print (shadow->voffset, string);
       g_string_append_c (string, ' ');
-      if (_gtk_css_number_value_get (shadow->radius, 100) != 0 ||
-          _gtk_css_number_value_get (shadow->spread, 100) != 0)
+      if (gtk_css_number_value_get (shadow->radius, 100) != 0 ||
+          gtk_css_number_value_get (shadow->spread, 100) != 0)
         {
           gtk_css_value_print (shadow->radius, string);
           g_string_append_c (string, ' ');
         }
 
-      if (_gtk_css_number_value_get (shadow->spread, 100) != 0)
+      if (gtk_css_number_value_get (shadow->spread, 100) != 0)
         {
           gtk_css_value_print (shadow->spread, string);
           g_string_append_c (string, ' ');
@@ -285,7 +286,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_SHADOW = {
   gtk_css_value_shadow_print
 };
 
-static GtkCssValue shadow_none_singleton = { &GTK_CSS_VALUE_SHADOW, 1, TRUE, FALSE, 0 };
+static GtkCssValue shadow_none_singleton = { &GTK_CSS_VALUE_SHADOW, 1, 1, 0, 0, 0, 0 };
 
 GtkCssValue *
 gtk_css_shadow_value_new_none (void)
@@ -315,15 +316,18 @@ gtk_css_shadow_value_new (ShadowValue *shadows,
     {
       const ShadowValue *shadow = &retval->shadows[i];
 
-      if (!gtk_css_value_is_computed (shadow->hoffset) ||
-          !gtk_css_value_is_computed (shadow->voffset) ||
-          !gtk_css_value_is_computed (shadow->spread) ||
-          !gtk_css_value_is_computed (shadow->radius) ||
-          !gtk_css_value_is_computed (shadow->color))
+      if (retval->is_computed &&
+          (!gtk_css_value_is_computed (shadow->hoffset) ||
+           !gtk_css_value_is_computed (shadow->voffset) ||
+           !gtk_css_value_is_computed (shadow->spread) ||
+           !gtk_css_value_is_computed (shadow->radius) ||
+           !gtk_css_value_is_computed (shadow->color)))
         {
           retval->is_computed = FALSE;
-          break;
         }
+
+      if (gtk_css_value_contains_current_color (shadow->color))
+        retval->contains_current_color = TRUE;
     }
 
   return retval;
@@ -335,10 +339,10 @@ gtk_css_shadow_value_new_filter (const GtkCssValue *other)
   ShadowValue value;
 
   value.inset = FALSE;
-  value.hoffset = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  value.voffset = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  value.radius = _gtk_css_number_value_new (0, GTK_CSS_PX);
-  value.spread = _gtk_css_number_value_new (0, GTK_CSS_PX);
+  value.hoffset = gtk_css_number_value_new (0, GTK_CSS_PX);
+  value.voffset = gtk_css_number_value_new (0, GTK_CSS_PX);
+  value.radius = gtk_css_number_value_new (0, GTK_CSS_PX);
+  value.spread = gtk_css_number_value_new (0, GTK_CSS_PX);
   value.color = gtk_css_value_ref (other->shadows[0].color);
 
   return gtk_css_shadow_value_new (&value, 1, TRUE);
@@ -385,36 +389,36 @@ parse_lengths (GtkCssParser *parser,
 {
   GtkCssValue **values = option_data;
 
-  values[HOFFSET] = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_PARSE_LENGTH);
+  values[HOFFSET] = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_PARSE_LENGTH);
   if (values[HOFFSET] == NULL)
     return FALSE;
 
-  values[VOFFSET] = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_PARSE_LENGTH);
+  values[VOFFSET] = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_PARSE_LENGTH);
   if (values[VOFFSET] == NULL)
     return FALSE;
 
   if (gtk_css_number_value_can_parse (parser))
     {
-      values[RADIUS] = _gtk_css_number_value_parse (parser,
-                                                    GTK_CSS_PARSE_LENGTH
-                                                    | GTK_CSS_POSITIVE_ONLY);
+      values[RADIUS] = gtk_css_number_value_parse (parser,
+                                                   GTK_CSS_PARSE_LENGTH
+                                                   | GTK_CSS_POSITIVE_ONLY);
       if (values[RADIUS] == NULL)
         return FALSE;
     }
   else
-    values[RADIUS] = _gtk_css_number_value_new (0.0, GTK_CSS_PX);
+    values[RADIUS] = gtk_css_number_value_new (0.0, GTK_CSS_PX);
 
   if (box_shadow_mode && gtk_css_number_value_can_parse (parser))
     {
-      values[SPREAD] = _gtk_css_number_value_parse (parser,
-                                                    GTK_CSS_PARSE_LENGTH);
+      values[SPREAD] = gtk_css_number_value_parse (parser,
+                                                   GTK_CSS_PARSE_LENGTH);
       if (values[SPREAD] == NULL)
         return FALSE;
     }
   else
-    values[SPREAD] = _gtk_css_number_value_new (0.0, GTK_CSS_PX);
+    values[SPREAD] = gtk_css_number_value_new (0.0, GTK_CSS_PX);
 
   return TRUE;
 }
@@ -539,13 +543,13 @@ gtk_css_shadow_value_get_extents (const GtkCssValue *value,
       const ShadowValue *shadow = &value->shadows[i];
       double hoffset, voffset, spread, radius, clip_radius;
 
-      spread = _gtk_css_number_value_get (shadow->spread, 0);
-      radius = _gtk_css_number_value_get (shadow->radius, 0);
+      spread = gtk_css_number_value_get (shadow->spread, 0);
+      radius = gtk_css_number_value_get (shadow->radius, 0);
       if (!value->is_filter)
         radius = radius / 2.0;
       clip_radius = gsk_cairo_blur_compute_pixels (radius);
-      hoffset = _gtk_css_number_value_get (shadow->hoffset, 0);
-      voffset = _gtk_css_number_value_get (shadow->voffset, 0);
+      hoffset = gtk_css_number_value_get (shadow->hoffset, 0);
+      voffset = gtk_css_number_value_get (shadow->voffset, 0);
 
       border->top    = MAX (border->top, ceil (clip_radius + spread - voffset));
       border->right  = MAX (border->right, ceil (clip_radius + spread + hoffset));
@@ -578,10 +582,10 @@ gtk_css_shadow_value_snapshot_outset (const GtkCssValue    *value,
       if (gdk_rgba_is_clear (color))
         continue;
 
-      dx = _gtk_css_number_value_get (shadow->hoffset, 0);
-      dy = _gtk_css_number_value_get (shadow->voffset, 0);
-      spread = _gtk_css_number_value_get (shadow->spread, 0);
-      radius = _gtk_css_number_value_get (shadow->radius, 0);
+      dx = gtk_css_number_value_get (shadow->hoffset, 0);
+      dy = gtk_css_number_value_get (shadow->voffset, 0);
+      spread = gtk_css_number_value_get (shadow->spread, 0);
+      radius = gtk_css_number_value_get (shadow->radius, 0);
       if (value->is_filter)
         radius = 2 * radius;
 
@@ -613,10 +617,10 @@ gtk_css_shadow_value_snapshot_inset (const GtkCssValue    *value,
       if (gdk_rgba_is_clear (color))
         continue;
 
-      dx = _gtk_css_number_value_get (shadow->hoffset, 0);
-      dy = _gtk_css_number_value_get (shadow->voffset, 0);
-      spread = _gtk_css_number_value_get (shadow->spread, 0);
-      radius = _gtk_css_number_value_get (shadow->radius, 0);
+      dx = gtk_css_number_value_get (shadow->hoffset, 0);
+      dy = gtk_css_number_value_get (shadow->voffset, 0);
+      spread = gtk_css_number_value_get (shadow->spread, 0);
+      radius = gtk_css_number_value_get (shadow->radius, 0);
       if (value->is_filter)
         radius = 2 * radius;
 
@@ -711,60 +715,63 @@ gboolean
 gtk_css_shadow_value_push_snapshot (const GtkCssValue *value,
                                     GtkSnapshot       *snapshot)
 {
-  gboolean need_shadow = FALSE;
+  GskShadow *shadows;
   guint i;
 
+  if (gtk_css_shadow_value_is_clear (value))
+    return FALSE;
+
+  shadows = g_newa (GskShadow, value->n_shadows);
+
   for (i = 0; i < value->n_shadows; i++)
     {
       const ShadowValue *shadow = &value->shadows[i];
 
-      if (!gdk_rgba_is_clear (gtk_css_color_value_get_rgba (shadow->color)))
-        {
-          need_shadow = TRUE;
-          break;
-        }
+      shadows[i].color = *gtk_css_color_value_get_rgba (shadow->color);
+
+      shadows[i].dx = gtk_css_number_value_get (shadow->hoffset, 0);
+      shadows[i].dy = gtk_css_number_value_get (shadow->voffset, 0);
+      shadows[i].radius = gtk_css_number_value_get (shadow->radius, 0);
+      if (value->is_filter)
+        shadows[i].radius *= 2;
     }
 
-  if (need_shadow)
-    {
-      GskShadow *shadows = g_newa (GskShadow, value->n_shadows);
+  gtk_snapshot_push_shadow (snapshot, shadows, value->n_shadows);
 
-      for (i = 0; i < value->n_shadows; i++)
-        {
-          const ShadowValue *shadow = &value->shadows[i];
-
-          shadows[i].dx = _gtk_css_number_value_get (shadow->hoffset, 0);
-          shadows[i].dy = _gtk_css_number_value_get (shadow->voffset, 0);
-          shadows[i].color = *gtk_css_color_value_get_rgba (shadow->color);
-          shadows[i].radius = _gtk_css_number_value_get (shadow->radius, 0);
-          if (value->is_filter)
-            shadows[i].radius *= 2;
-        }
-
-      gtk_snapshot_push_shadow (snapshot, shadows, value->n_shadows);
-    }
-
-  return need_shadow;
+  return TRUE;
 }
 
 void
 gtk_css_shadow_value_pop_snapshot (const GtkCssValue *value,
                                    GtkSnapshot       *snapshot)
 {
-  gboolean need_shadow = FALSE;
+  if (!gtk_css_shadow_value_is_clear (value))
+    gtk_snapshot_pop (snapshot);
+}
+
+GtkCssValue *
+gtk_css_shadow_value_resolve (GtkCssValue *value,
+                              GtkCssValue *current_color)
+{
   guint i;
+  ShadowValue *shadows;
+
+  if (!gtk_css_value_contains_current_color (value))
+    return gtk_css_value_ref (value);
+
+  shadows = g_alloca (sizeof (ShadowValue) * value->n_shadows);
 
   for (i = 0; i < value->n_shadows; i++)
     {
       const ShadowValue *shadow = &value->shadows[i];
 
-      if (!gdk_rgba_is_clear (gtk_css_color_value_get_rgba (shadow->color)))
-        {
-          need_shadow = TRUE;
-          break;
-        }
+      shadows[i].hoffset = gtk_css_value_ref (shadow->hoffset);
+      shadows[i].voffset = gtk_css_value_ref (shadow->voffset);
+      shadows[i].radius = gtk_css_value_ref (shadow->radius);
+      shadows[i].spread = gtk_css_value_ref (shadow->spread);
+      shadows[i].color = gtk_css_color_value_resolve (shadow->color, NULL, current_color);
+      shadows[i].inset = shadow->inset;
     }
 
-  if (need_shadow)
-    gtk_snapshot_pop (snapshot);
+  return gtk_css_shadow_value_new (shadows, value->n_shadows, value->is_filter);
 }

gtk/gtkcssshadowvalueprivate.h

@@ -56,5 +56,8 @@ gboolean        gtk_css_shadow_value_push_snapshot    (const GtkCssValue
 void            gtk_css_shadow_value_pop_snapshot     (const GtkCssValue        *value,
                                                        GtkSnapshot              *snapshot);
 
+GtkCssValue *   gtk_css_shadow_value_resolve          (GtkCssValue              *value,
+                                                       GtkCssValue              *current_color);
+
 G_END_DECLS
 

gtk/gtkcssshorthandpropertyimpl.c

@@ -64,7 +64,7 @@ parse_four_numbers (GtkCssShorthandProperty  *shorthand,
       if (!gtk_css_number_value_can_parse (parser))
         break;
 
-      values[i] = _gtk_css_number_value_parse (parser, flags);
+      values[i] = gtk_css_number_value_parse (parser, flags);
       if (values[i] == NULL)
         return FALSE;
     }
@@ -130,10 +130,10 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
     {
       if (!gtk_css_number_value_can_parse (parser))
         break;
-      x[i] = _gtk_css_number_value_parse (parser,
-                                          GTK_CSS_POSITIVE_ONLY
-                                          | GTK_CSS_PARSE_PERCENT
-                                          | GTK_CSS_PARSE_LENGTH);
+      x[i] = gtk_css_number_value_parse (parser,
+                                         GTK_CSS_POSITIVE_ONLY
+                                         | GTK_CSS_PARSE_PERCENT
+                                         | GTK_CSS_PARSE_LENGTH);
       if (x[i] == NULL)
         goto fail;
     }
@@ -156,10 +156,10 @@ parse_border_radius (GtkCssShorthandProperty  *shorthand,
         {
           if (!gtk_css_number_value_can_parse (parser))
             break;
-          y[i] = _gtk_css_number_value_parse (parser,
-                                              GTK_CSS_POSITIVE_ONLY
-                                              | GTK_CSS_PARSE_PERCENT
-                                              | GTK_CSS_PARSE_LENGTH);
+          y[i] = gtk_css_number_value_parse (parser,
+                                             GTK_CSS_POSITIVE_ONLY
+                                             | GTK_CSS_PARSE_PERCENT
+                                             | GTK_CSS_PARSE_LENGTH);
           if (y[i] == NULL)
             goto fail;
         }
@@ -325,9 +325,9 @@ parse_border_side (GtkCssShorthandProperty  *shorthand,
     if (values[0] == NULL &&
         gtk_css_number_value_can_parse (parser))
       {
-        values[0] = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_POSITIVE_ONLY
-                                                 | GTK_CSS_PARSE_LENGTH);
+        values[0] = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_POSITIVE_ONLY
+                                                | GTK_CSS_PARSE_LENGTH);
         if (values[0] == NULL)
           return FALSE;
       }
@@ -366,9 +366,9 @@ parse_border (GtkCssShorthandProperty  *shorthand,
     if (values[0] == NULL &&
         gtk_css_number_value_can_parse (parser))
       {
-        values[0] = _gtk_css_number_value_parse (parser,
-                                                 GTK_CSS_POSITIVE_ONLY
-                                                 | GTK_CSS_PARSE_LENGTH);
+        values[0] = gtk_css_number_value_parse (parser,
+                                                GTK_CSS_POSITIVE_ONLY
+                                                | GTK_CSS_PARSE_LENGTH);
         if (values[0] == NULL)
           return FALSE;
         values[1] = gtk_css_value_ref (values[0]);
@@ -449,11 +449,11 @@ parse_font (GtkCssShorthandProperty  *shorthand,
           if (values[3] == NULL && gtk_css_number_value_can_parse (parser))
             {
               /* This needs to check for font-size, too */
-              GtkCssValue *num = _gtk_css_number_value_parse (parser,
-                                                              GTK_CSS_PARSE_NUMBER |
-                                                              GTK_CSS_PARSE_LENGTH |
-                                                              GTK_CSS_PARSE_PERCENT |
-                                                              GTK_CSS_POSITIVE_ONLY);
+              GtkCssValue *num = gtk_css_number_value_parse (parser,
+                                                             GTK_CSS_PARSE_NUMBER |
+                                                             GTK_CSS_PARSE_LENGTH |
+                                                             GTK_CSS_PARSE_PERCENT |
+                                                             GTK_CSS_POSITIVE_ONLY);
               if (num == NULL)
                 return FALSE;
 
@@ -464,8 +464,8 @@ parse_font (GtkCssShorthandProperty  *shorthand,
                 }
 
               values[3] = num;
-              if (_gtk_css_number_value_get (values[3], 100) < 1 || 
-                  _gtk_css_number_value_get (values[3], 100) > 1000)
+              if (gtk_css_number_value_get (values[3], 100) < 1 || 
+                  gtk_css_number_value_get (values[3], 100) > 1000)
                 {
                   gtk_css_parser_error_value (parser, "Font weight values must be between 1 and 1000");
                   g_clear_pointer (&values[3], gtk_css_value_unref);
@@ -662,7 +662,7 @@ parse_transition_time (GtkCssParser *parser,
 {
   GtkCssValue **value = option_data;
 
-  *value = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
+  *value = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
 
   return *value != NULL;
 }
@@ -752,17 +752,17 @@ parse_one_animation (GtkCssShorthandProperty  *shorthand,
     {
       if (values[1] == NULL && gtk_css_parser_try_ident (parser, "infinite"))
         {
-          values[1] = _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
+          values[1] = gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
         }
       else if ((values[1] == NULL || values[3] == NULL) &&
                gtk_css_number_value_can_parse (parser))
         {
           GtkCssValue *value;
           
-          value = _gtk_css_number_value_parse (parser,
-                                               GTK_CSS_POSITIVE_ONLY
-                                               | (values[1] == NULL ? GTK_CSS_PARSE_NUMBER : 0)
-                                               | (values[3] == NULL ? GTK_CSS_PARSE_TIME : 0));
+          value = gtk_css_number_value_parse (parser,
+                                              GTK_CSS_POSITIVE_ONLY
+                                              | (values[1] == NULL ? GTK_CSS_PARSE_NUMBER : 0)
+                                              | (values[3] == NULL ? GTK_CSS_PARSE_TIME : 0));
           if (value == NULL)
             return FALSE;
 

gtk/gtkcssstaticstyle.c

@@ -39,6 +39,7 @@
 #include "gtkstyleproviderprivate.h"
 #include "gtkcssdimensionvalueprivate.h"
 
+
 static void gtk_css_static_style_compute_value (GtkCssStaticStyle    *style,
                                                 guint                 id,
                                                 GtkCssValue          *specified,
@@ -56,14 +57,17 @@ gtk_css_## NAME ## _values_compute_changes_and_affects (GtkCssStyle *style1, \
 { \
   GtkCssValue **g1 = GET_VALUES (style1->NAME); \
   GtkCssValue **g2 = GET_VALUES (style2->NAME); \
+  GtkCssValue **u1 = GET_VALUES (style1->used); \
+  GtkCssValue **u2 = GET_VALUES (style2->used); \
   int i; \
   for (i = 0; i < G_N_ELEMENTS (NAME ## _props); i++) \
     { \
-      GtkCssValue *v1 = g1[i] ? g1[i] : style1->core->color; \
-      GtkCssValue *v2 = g2[i] ? g2[i] : style2->core->color; \
+      guint id = NAME ## _props[i]; \
+      int j = used_props_map[id]; \
+      GtkCssValue *v1 = j < 0 ? g1[i] : u1[j]; \
+      GtkCssValue *v2 = j < 0 ? g2[i] : u2[j]; \
       if (!gtk_css_value_equal (v1, v2)) \
         { \
-          guint id = NAME ## _props[i]; \
           *changes = _gtk_bitmask_set (*changes, id, TRUE); \
           *affects |= _gtk_css_style_property_get_affects (_gtk_css_style_property_lookup_by_id (id)); \
         } \
@@ -170,11 +174,26 @@ verify_style_groups (void)
 
 #undef VERIFY_MASK
 
+static void
+verify_used_map (void)
+{
+  for (guint id = 0; id < GTK_CSS_PROPERTY_N_PROPERTIES; id++)
+    {
+      if (used_props_map[id] != -1)
+        g_assert (used_props[used_props_map[id]] == id);
+    }
+
+  for (guint i = 0; i < G_N_ELEMENTS (used_props); i++)
+    {
+      g_assert (used_props_map[used_props[i]] == i);
+    }
+}
+
 G_DEFINE_TYPE (GtkCssStaticStyle, gtk_css_static_style, GTK_TYPE_CSS_STYLE)
 
 static GtkCssSection *
 gtk_css_static_style_get_section (GtkCssStyle *style,
-                                    guint        id)
+                                  guint        id)
 {
   GtkCssStaticStyle *sstyle = GTK_CSS_STATIC_STYLE (style);
 
@@ -249,6 +268,7 @@ gtk_css_static_style_class_init (GtkCssStaticStyleClass *klass)
   gtk_css_other_values_init ();
 
   verify_style_groups ();
+  verify_used_map ();
 }
 
 static void
@@ -637,12 +657,18 @@ gtk_css_static_style_get_default (void)
   return default_style;
 }
 
+static inline GtkCssValue *
+initial_color (void)
+{
+  return _gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (GTK_CSS_PROPERTY_COLOR));
+}
+
 static GtkCssValues *
 gtk_css_core_create_initial_values (void)
 {
   return NULL;
-
 }
+
 static GtkCssValues *
 gtk_css_background_create_initial_values (void)
 {
@@ -684,10 +710,10 @@ gtk_css_border_create_initial_values (void)
   values->border_top_right_radius = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS, &context);
   values->border_bottom_left_radius = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS, &context);
   values->border_bottom_right_radius = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS, &context);
-  values->border_top_color = NULL;
-  values->border_right_color = NULL;
-  values->border_bottom_color = NULL;
-  values->border_left_color = NULL;
+  values->border_top_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_TOP_COLOR, &context);
+  values->border_right_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR, &context);
+  values->border_bottom_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR, &context);
+  values->border_left_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_LEFT_COLOR, &context);
   values->border_image_source = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE, &context);
   values->border_image_repeat = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT, &context);
   values->border_image_slice = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE, &context);
@@ -707,7 +733,7 @@ gtk_css_outline_create_initial_values (void)
   values->outline_style = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_OUTLINE_STYLE, &context);
   values->outline_width = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_OUTLINE_WIDTH, &context);
   values->outline_offset = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_OUTLINE_OFFSET, &context);
-  values->outline_color = NULL;
+  values->outline_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_OUTLINE_COLOR, &context);
 
   return (GtkCssValues *)values;
 }
@@ -733,7 +759,7 @@ gtk_css_font_variant_create_initial_values (void)
   values = (GtkCssFontVariantValues *)gtk_css_values_new (GTK_CSS_FONT_VARIANT_INITIAL_VALUES);
 
   values->text_decoration_line = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TEXT_DECORATION_LINE, &context);
-  values->text_decoration_color = NULL;
+  values->text_decoration_color = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR, &context);
   values->text_decoration_style = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TEXT_DECORATION_STYLE, &context);
   values->text_transform = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TEXT_TRANSFORM, &context);
   values->font_kerning = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_FONT_KERNING, &context);
@@ -864,6 +890,7 @@ gtk_css_lookup_resolve (GtkCssLookup      *lookup,
     }
   else if (parent_style && parent_style->variables)
     {
+      g_clear_pointer (&style->variables, gtk_css_variable_set_unref);
       style->variables = gtk_css_variable_set_ref (parent_style->variables);
     }
 
@@ -896,6 +923,8 @@ gtk_css_lookup_resolve (GtkCssLookup      *lookup,
           gtk_css_font_values_new_compute (sstyle, lookup, &context);
         }
 
+      gtk_css_style_resolve_used_values (style, &context);
+
       return;
     }
 
@@ -954,6 +983,8 @@ gtk_css_lookup_resolve (GtkCssLookup      *lookup,
   else
     gtk_css_other_values_new_compute (sstyle, lookup, &context);
 
+  gtk_css_style_resolve_used_values (style, &context);
+
   for (unsigned int i = 0; i < GTK_CSS_SHORTHAND_PROPERTY_N_PROPERTIES; i++)
     {
       if (shorthands[i])
@@ -1062,7 +1093,7 @@ gtk_css_static_style_compute_value (GtkCssStaticStyle    *style,
       GtkCssValue *parent_original_value;
 
       /* Just take the style from the parent */
-      value = gtk_css_value_ref (gtk_css_style_get_value (context->parent_style, id));
+      value = gtk_css_value_ref (gtk_css_style_get_computed_value (context->parent_style, id));
 
       parent_original_value = gtk_css_style_get_original_value (context->parent_style, id);
 

gtk/gtkcssstyle.c

@@ -26,11 +26,13 @@
 #include "gtkcssarrayvalueprivate.h"
 #include "gtkcsscustompropertypoolprivate.h"
 #include "gtkcssenumvalueprivate.h"
+#include "gtkcssimagevalueprivate.h"
 #include "gtkcssinheritvalueprivate.h"
 #include "gtkcssinitialvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtkcsspalettevalueprivate.h"
+#include "gtkcssshadowvalueprivate.h"
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtkcssstringvalueprivate.h"
 #include "gtkcssfontvariationsvalueprivate.h"
@@ -41,6 +43,7 @@
 #include "gtkstyleanimationprivate.h"
 #include "gtkstylepropertyprivate.h"
 #include "gtkstyleproviderprivate.h"
+#include "gtkcssvaluesprivate.h"
 
 G_DEFINE_ABSTRACT_TYPE (GtkCssStyle, gtk_css_style, G_TYPE_OBJECT)
 
@@ -100,6 +103,209 @@ gtk_css_style_init (GtkCssStyle *style)
 GtkCssValue *
 gtk_css_style_get_value (GtkCssStyle *style,
                          guint        id)
+{
+  return gtk_css_style_get_used_value (style, id);
+}
+
+GtkCssValue *
+gtk_css_style_get_used_value (GtkCssStyle *style,
+                              guint        id)
+{
+  switch (id)
+    {
+    case GTK_CSS_PROPERTY_COLOR:
+      return style->used->color;
+    case GTK_CSS_PROPERTY_DPI:
+      return style->core->dpi;
+    case GTK_CSS_PROPERTY_FONT_SIZE:
+      return style->core->font_size;
+    case GTK_CSS_PROPERTY_ICON_PALETTE:
+      return style->used->icon_palette;
+    case GTK_CSS_PROPERTY_BACKGROUND_COLOR:
+      return style->used->background_color;
+    case GTK_CSS_PROPERTY_FONT_FAMILY:
+      return style->font->font_family;
+    case GTK_CSS_PROPERTY_FONT_STYLE:
+      return style->font->font_style;
+    case GTK_CSS_PROPERTY_FONT_WEIGHT:
+      return style->font->font_weight;
+    case GTK_CSS_PROPERTY_FONT_STRETCH:
+      return style->font->font_stretch;
+    case GTK_CSS_PROPERTY_LETTER_SPACING:
+      return style->font->letter_spacing;
+    case GTK_CSS_PROPERTY_LINE_HEIGHT:
+      return style->font->line_height;
+    case GTK_CSS_PROPERTY_TEXT_DECORATION_LINE:
+      return style->font_variant->text_decoration_line;
+    case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
+      return style->used->text_decoration_color;
+    case GTK_CSS_PROPERTY_TEXT_DECORATION_STYLE:
+      return style->font_variant->text_decoration_style;
+    case GTK_CSS_PROPERTY_TEXT_TRANSFORM:
+      return style->font_variant->text_transform;
+    case GTK_CSS_PROPERTY_FONT_KERNING:
+      return style->font_variant->font_kerning;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_LIGATURES:
+      return style->font_variant->font_variant_ligatures;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_POSITION:
+      return style->font_variant->font_variant_position;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_CAPS:
+      return style->font_variant->font_variant_caps;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_NUMERIC:
+      return style->font_variant->font_variant_numeric;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_ALTERNATES:
+      return style->font_variant->font_variant_alternates;
+    case GTK_CSS_PROPERTY_FONT_VARIANT_EAST_ASIAN:
+      return style->font_variant->font_variant_east_asian;
+    case GTK_CSS_PROPERTY_TEXT_SHADOW:
+      return style->used->text_shadow;
+    case GTK_CSS_PROPERTY_BOX_SHADOW:
+      return style->used->box_shadow;
+    case GTK_CSS_PROPERTY_MARGIN_TOP:
+      return style->size->margin_top;
+    case GTK_CSS_PROPERTY_MARGIN_LEFT:
+      return style->size->margin_left;
+    case GTK_CSS_PROPERTY_MARGIN_BOTTOM:
+      return style->size->margin_bottom;
+    case GTK_CSS_PROPERTY_MARGIN_RIGHT:
+      return style->size->margin_right;
+    case GTK_CSS_PROPERTY_PADDING_TOP:
+      return style->size->padding_top;
+    case GTK_CSS_PROPERTY_PADDING_LEFT:
+      return style->size->padding_left;
+    case GTK_CSS_PROPERTY_PADDING_BOTTOM:
+      return style->size->padding_bottom;
+    case GTK_CSS_PROPERTY_PADDING_RIGHT:
+      return style->size->padding_right;
+    case GTK_CSS_PROPERTY_BORDER_TOP_STYLE:
+      return style->border->border_top_style;
+    case GTK_CSS_PROPERTY_BORDER_TOP_WIDTH:
+      return style->border->border_top_width;
+    case GTK_CSS_PROPERTY_BORDER_LEFT_STYLE:
+      return style->border->border_left_style;
+    case GTK_CSS_PROPERTY_BORDER_LEFT_WIDTH:
+      return style->border->border_left_width;
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE:
+      return style->border->border_bottom_style;
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_WIDTH:
+      return style->border->border_bottom_width;
+    case GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE:
+      return style->border->border_right_style;
+    case GTK_CSS_PROPERTY_BORDER_RIGHT_WIDTH:
+      return style->border->border_right_width;
+    case GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS:
+      return style->border->border_top_left_radius;
+    case GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS:
+      return style->border->border_top_right_radius;
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS:
+      return style->border->border_bottom_right_radius;
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS:
+      return style->border->border_bottom_left_radius;
+    case GTK_CSS_PROPERTY_OUTLINE_STYLE:
+      return style->outline->outline_style;
+    case GTK_CSS_PROPERTY_OUTLINE_WIDTH:
+      return style->outline->outline_width;
+    case GTK_CSS_PROPERTY_OUTLINE_OFFSET:
+      return style->outline->outline_offset;
+    case GTK_CSS_PROPERTY_BACKGROUND_CLIP:
+      return style->background->background_clip;
+    case GTK_CSS_PROPERTY_BACKGROUND_ORIGIN:
+      return style->background->background_origin;
+    case GTK_CSS_PROPERTY_BACKGROUND_SIZE:
+      return style->background->background_size;
+    case GTK_CSS_PROPERTY_BACKGROUND_POSITION:
+      return style->background->background_position;
+    case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
+      return style->used->border_top_color;
+    case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
+      return style->used->border_right_color;
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
+      return style->used->border_bottom_color;
+    case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
+      return style->used->border_left_color;
+    case GTK_CSS_PROPERTY_OUTLINE_COLOR:
+      return style->used->outline_color;
+    case GTK_CSS_PROPERTY_BACKGROUND_REPEAT:
+      return style->background->background_repeat;
+    case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
+      return style->used->background_image;
+    case GTK_CSS_PROPERTY_BACKGROUND_BLEND_MODE:
+      return style->background->background_blend_mode;
+    case GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE:
+      return style->used->border_image_source;
+    case GTK_CSS_PROPERTY_BORDER_IMAGE_REPEAT:
+      return style->border->border_image_repeat;
+    case GTK_CSS_PROPERTY_BORDER_IMAGE_SLICE:
+      return style->border->border_image_slice;
+    case GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH:
+      return style->border->border_image_width;
+    case GTK_CSS_PROPERTY_ICON_SOURCE:
+      return style->used->icon_source;
+    case GTK_CSS_PROPERTY_ICON_SIZE:
+      return style->icon->icon_size;
+    case GTK_CSS_PROPERTY_ICON_SHADOW:
+      return style->used->icon_shadow;
+    case GTK_CSS_PROPERTY_ICON_STYLE:
+      return style->icon->icon_style;
+    case GTK_CSS_PROPERTY_ICON_TRANSFORM:
+      return style->other->icon_transform;
+    case GTK_CSS_PROPERTY_ICON_FILTER:
+      return style->other->icon_filter;
+    case GTK_CSS_PROPERTY_BORDER_SPACING:
+      return style->size->border_spacing;
+    case GTK_CSS_PROPERTY_TRANSFORM:
+      return style->other->transform;
+    case GTK_CSS_PROPERTY_TRANSFORM_ORIGIN:
+      return style->other->transform_origin;
+    case GTK_CSS_PROPERTY_MIN_WIDTH:
+      return style->size->min_width;
+    case GTK_CSS_PROPERTY_MIN_HEIGHT:
+      return style->size->min_height;
+    case GTK_CSS_PROPERTY_TRANSITION_PROPERTY:
+      return style->transition->transition_property;
+    case GTK_CSS_PROPERTY_TRANSITION_DURATION:
+      return style->transition->transition_duration;
+    case GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION:
+      return style->transition->transition_timing_function;
+    case GTK_CSS_PROPERTY_TRANSITION_DELAY:
+      return style->transition->transition_delay;
+    case GTK_CSS_PROPERTY_ANIMATION_NAME:
+      return style->animation->animation_name;
+    case GTK_CSS_PROPERTY_ANIMATION_DURATION:
+      return style->animation->animation_duration;
+    case GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION:
+      return style->animation->animation_timing_function;
+    case GTK_CSS_PROPERTY_ANIMATION_ITERATION_COUNT:
+      return style->animation->animation_iteration_count;
+    case GTK_CSS_PROPERTY_ANIMATION_DIRECTION:
+      return style->animation->animation_direction;
+    case GTK_CSS_PROPERTY_ANIMATION_PLAY_STATE:
+      return style->animation->animation_play_state;
+    case GTK_CSS_PROPERTY_ANIMATION_DELAY:
+      return style->animation->animation_delay;
+    case GTK_CSS_PROPERTY_ANIMATION_FILL_MODE:
+      return style->animation->animation_fill_mode;
+    case GTK_CSS_PROPERTY_OPACITY:
+      return style->other->opacity;
+    case GTK_CSS_PROPERTY_FILTER:
+      return style->other->filter;
+    case GTK_CSS_PROPERTY_CARET_COLOR:
+      return style->used->caret_color;
+    case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
+      return style->used->secondary_caret_color;
+    case GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS:
+      return style->font->font_feature_settings;
+    case GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS:
+      return style->font->font_variation_settings;
+
+    default:
+      g_assert_not_reached ();
+    }
+}
+
+GtkCssValue *
+gtk_css_style_get_computed_value (GtkCssStyle *style,
+                                  guint        id)
 {
   switch (id)
     {
@@ -128,7 +334,7 @@ gtk_css_style_get_value (GtkCssStyle *style,
     case GTK_CSS_PROPERTY_TEXT_DECORATION_LINE:
       return style->font_variant->text_decoration_line;
     case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
-      return style->font_variant->text_decoration_color ? style->font_variant->text_decoration_color : style->core->color;
+      return style->font_variant->text_decoration_color;
     case GTK_CSS_PROPERTY_TEXT_DECORATION_STYLE:
       return style->font_variant->text_decoration_style;
     case GTK_CSS_PROPERTY_TEXT_TRANSFORM:
@@ -206,15 +412,15 @@ gtk_css_style_get_value (GtkCssStyle *style,
     case GTK_CSS_PROPERTY_BACKGROUND_POSITION:
       return style->background->background_position;
     case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
-      return style->border->border_top_color ? style->border->border_top_color : style->core->color;
+      return style->border->border_top_color;
     case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
-      return style->border->border_right_color ? style->border->border_right_color : style->core->color;
+      return style->border->border_right_color;
     case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
-      return style->border->border_bottom_color ? style->border->border_bottom_color : style->core->color;
+      return style->border->border_bottom_color;
     case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
-      return style->border->border_left_color ? style->border->border_left_color: style->core->color;
+      return style->border->border_left_color;
     case GTK_CSS_PROPERTY_OUTLINE_COLOR:
-      return style->outline->outline_color ? style->outline->outline_color : style->core->color;
+      return style->outline->outline_color;
     case GTK_CSS_PROPERTY_BACKGROUND_REPEAT:
       return style->background->background_repeat;
     case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
@@ -280,9 +486,9 @@ gtk_css_style_get_value (GtkCssStyle *style,
     case GTK_CSS_PROPERTY_FILTER:
       return style->other->filter;
     case GTK_CSS_PROPERTY_CARET_COLOR:
-      return style->font->caret_color ? style->font->caret_color : style->core->color;
+      return style->font->caret_color;
     case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
-      return style->font->secondary_caret_color ? style->font->secondary_caret_color : style->core->color;
+      return style->font->secondary_caret_color;
     case GTK_CSS_PROPERTY_FONT_FEATURE_SETTINGS:
       return style->font->font_feature_settings;
     case GTK_CSS_PROPERTY_FONT_VARIATION_SETTINGS:
@@ -355,16 +561,23 @@ gtk_css_style_print (GtkCssStyle *style,
     {
       GtkCssSection *section;
       GtkCssStyleProperty *prop;
-      GtkCssValue *value;
+      GtkCssValue *value, *computed, *initial;
       const char *name;
 
-      section = gtk_css_style_get_section (style, i);
-      if (!section && skip_initial)
-        continue;
-
       prop = _gtk_css_style_property_lookup_by_id (i);
       name = _gtk_style_property_get_name (GTK_STYLE_PROPERTY (prop));
-      value = gtk_css_style_get_value (style, i);
+      computed = gtk_css_style_get_computed_value (style, i);
+      value = gtk_css_style_get_used_value (style, i);
+      initial = _gtk_css_style_property_get_initial_value (prop);
+
+      section = gtk_css_style_get_section (style, i);
+      if (skip_initial)
+        {
+          if (!section &&
+              (computed == initial ||
+               !gtk_css_value_contains_current_color (computed)))
+            continue;
+        }
 
       g_string_append_printf (string, "%*s%s: ", indent, "", name);
       gtk_css_value_print (value, string);
@@ -647,20 +860,22 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   GtkTextDecorationStyle decoration_style;
   const GdkRGBA *color;
   const GdkRGBA *decoration_color;
+  gboolean has_decoration_color;
   double letter_spacing;
 
   /* text-decoration */
   decoration_line = _gtk_css_text_decoration_line_value_get (style->font_variant->text_decoration_line);
   decoration_style = _gtk_css_text_decoration_style_value_get (style->font_variant->text_decoration_style);
-  color = gtk_css_color_value_get_rgba (style->core->color);
-  decoration_color = gtk_css_color_value_get_rgba (style->font_variant->text_decoration_color
-                                                   ? style->font_variant->text_decoration_color
-                                                   : style->core->color);
+
+  color = gtk_css_color_value_get_rgba (style->used->color);
+  decoration_color = gtk_css_color_value_get_rgba (style->used->text_decoration_color);
+
+  has_decoration_color = !gdk_rgba_equal (color, decoration_color);
 
   if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE)
     {
       attrs = add_pango_attr (attrs, pango_attr_underline_new (get_pango_underline_from_style (decoration_style)));
-      if (!gdk_rgba_equal (color, decoration_color))
+      if (has_decoration_color)
         attrs = add_pango_attr (attrs, pango_attr_underline_color_new (decoration_color->red * 65535. + 0.5,
                                                                        decoration_color->green * 65535. + 0.5,
                                                                        decoration_color->blue * 65535. + 0.5));
@@ -668,7 +883,7 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_OVERLINE)
     {
       attrs = add_pango_attr (attrs, pango_attr_overline_new (get_pango_overline_from_style (decoration_style)));
-      if (!gdk_rgba_equal (color, decoration_color))
+      if (has_decoration_color)
         attrs = add_pango_attr (attrs, pango_attr_overline_color_new (decoration_color->red * 65535. + 0.5,
                                                                       decoration_color->green * 65535. + 0.5,
                                                                       decoration_color->blue * 65535. + 0.5));
@@ -676,14 +891,14 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
   if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH)
     {
       attrs = add_pango_attr (attrs, pango_attr_strikethrough_new (TRUE));
-      if (!gdk_rgba_equal (color, decoration_color))
+      if (!has_decoration_color)
         attrs = add_pango_attr (attrs, pango_attr_strikethrough_color_new (decoration_color->red * 65535. + 0.5,
                                                                            decoration_color->green * 65535. + 0.5,
                                                                            decoration_color->blue * 65535. + 0.5));
     }
 
   /* letter-spacing */
-  letter_spacing = _gtk_css_number_value_get (style->font->letter_spacing, 100);
+  letter_spacing = gtk_css_number_value_get (style->font->letter_spacing, 100);
   if (letter_spacing != 0)
     {
       attrs = add_pango_attr (attrs, pango_attr_letter_spacing_new (letter_spacing * PANGO_SCALE));
@@ -781,13 +996,13 @@ gtk_css_style_get_pango_font (GtkCssStyle *style)
     }
 
   v = style->core->font_size;
-  pango_font_description_set_absolute_size (description, round (_gtk_css_number_value_get (v, 100) * PANGO_SCALE));
+  pango_font_description_set_absolute_size (description, round (gtk_css_number_value_get (v, 100) * PANGO_SCALE));
 
   v = style->font->font_style;
   pango_font_description_set_style (description, _gtk_css_font_style_value_get (v));
 
   v = style->font->font_weight;
-  pango_font_description_set_weight (description, _gtk_css_number_value_get (v, 100));
+  pango_font_description_set_weight (description, gtk_css_number_value_get (v, 100));
 
   v = style->font->font_stretch;
   pango_font_description_set_stretch (description, _gtk_css_font_stretch_value_get (v));
@@ -805,24 +1020,22 @@ void
 gtk_css_style_lookup_symbolic_colors (GtkCssStyle *style,
                                       GdkRGBA      color_out[4])
 {
-  GtkCssValue *palette, *color;
   const char *names[4] = {
     [GTK_SYMBOLIC_COLOR_ERROR] = "error",
     [GTK_SYMBOLIC_COLOR_WARNING] = "warning",
     [GTK_SYMBOLIC_COLOR_SUCCESS] = "success"
   };
 
-  color = style->core->color;
-  palette = style->core->icon_palette;
-  color_out[GTK_SYMBOLIC_COLOR_FOREGROUND] = *gtk_css_color_value_get_rgba (color);
+  color_out[GTK_SYMBOLIC_COLOR_FOREGROUND] = *gtk_css_color_value_get_rgba (style->used->color);
 
   for (gsize i = 1; i < 4; i++)
     {
-      const GdkRGBA *lookup;
+      GtkCssValue *lookup;
+
+      lookup = gtk_css_palette_value_get_color (style->used->icon_palette, names[i]);
 
-      lookup = gtk_css_palette_value_get_color (palette, names[i]);
       if (lookup)
-        color_out[i] = *lookup;
+        color_out[i] = *gtk_css_color_value_get_rgba (lookup);
       else
         color_out[i] = color_out[GTK_SYMBOLIC_COLOR_FOREGROUND];
     }
@@ -841,7 +1054,8 @@ static const int values_size[] = {
   sizeof (GtkCssAnimationValues),
   sizeof (GtkCssTransitionValues),
   sizeof (GtkCssSizeValues),
-  sizeof (GtkCssOtherValues)
+  sizeof (GtkCssOtherValues),
+  sizeof (GtkCssUsedValues)
 };
 
 #define TYPE_INDEX(type) ((type) - ((type) % 2))
@@ -860,10 +1074,9 @@ GtkCssValues *gtk_css_values_ref (GtkCssValues *values)
 static void
 gtk_css_values_free (GtkCssValues *values)
 {
-  int i;
   GtkCssValue **v = GET_VALUES (values);
 
-  for (i = 0; i < N_VALUES (values->type); i++)
+  for (int i = 0; i < N_VALUES (values->type); i++)
     {
       if (v[i])
         gtk_css_value_unref (v[i]);
@@ -888,14 +1101,13 @@ gtk_css_values_copy (GtkCssValues *values)
 {
   GtkCssValues *copy;
   GtkCssValue **v, **v2;
-  int i;
 
-  copy = gtk_css_values_new (TYPE_INDEX(values->type));
+  copy = gtk_css_values_new (TYPE_INDEX (values->type));
 
   v = GET_VALUES (values);
   v2 = GET_VALUES (copy);
 
-  for (i = 0; i < N_VALUES (values->type); i++)
+  for (int i = 0; i < N_VALUES (values->type); i++)
     {
       if (v[i])
         v2[i] = gtk_css_value_ref (v[i]);
@@ -909,7 +1121,7 @@ gtk_css_values_new (GtkCssValuesType type)
 {
   GtkCssValues *values;
 
-  values = (GtkCssValues *)g_malloc0 (VALUES_SIZE(type));
+  values = (GtkCssValues *) g_malloc0 (VALUES_SIZE (type));
   values->ref_count = 1;
   values->type = type;
 
@@ -934,3 +1146,97 @@ gtk_css_style_list_custom_properties (GtkCssStyle *style)
 
   return NULL;
 }
+
+static GtkCssValue *
+gtk_css_style_resolve_used_value (GtkCssStyle          *style,
+                                  GtkCssValue          *value,
+                                  guint                 id,
+                                  GtkCssComputeContext *context)
+{
+  GtkCssValue *used;
+
+  switch (id)
+    {
+    case GTK_CSS_PROPERTY_COLOR:
+      {
+        GtkCssValue *current;
+
+        if (context->parent_style)
+          current = context->parent_style->used->color;
+        else
+          current = _gtk_css_style_property_get_initial_value (_gtk_css_style_property_lookup_by_id (GTK_CSS_PROPERTY_COLOR));
+
+        used = gtk_css_color_value_resolve (value, NULL, current);
+      }
+      break;
+
+    case GTK_CSS_PROPERTY_BACKGROUND_COLOR:
+    case GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_TOP_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR:
+    case GTK_CSS_PROPERTY_BORDER_LEFT_COLOR:
+    case GTK_CSS_PROPERTY_OUTLINE_COLOR:
+    case GTK_CSS_PROPERTY_CARET_COLOR:
+    case GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR:
+      used = gtk_css_color_value_resolve (value, NULL, style->used->color);
+      break;
+
+    case GTK_CSS_PROPERTY_BOX_SHADOW:
+    case GTK_CSS_PROPERTY_TEXT_SHADOW:
+    case GTK_CSS_PROPERTY_ICON_SHADOW:
+      used = gtk_css_shadow_value_resolve (value, style->used->color);
+      break;
+
+    case GTK_CSS_PROPERTY_ICON_PALETTE:
+      used = gtk_css_palette_value_resolve (value, style->used->color);
+      break;
+
+    case GTK_CSS_PROPERTY_BACKGROUND_IMAGE:
+    case GTK_CSS_PROPERTY_ICON_SOURCE:
+    case GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE:
+      used = gtk_css_image_value_resolve (value, style->used->color);
+      break;
+
+    default:
+      return NULL;
+    }
+
+  g_assert (!gtk_css_value_contains_current_color (used));
+
+  return used;
+}
+
+static inline void
+gtk_css_take_value (GtkCssValue **variable,
+                    GtkCssValue  *value)
+{
+  if (*variable)
+    gtk_css_value_unref (*variable);
+  *variable = value;
+}
+
+void
+gtk_css_style_resolve_used_values (GtkCssStyle          *style,
+                                   GtkCssComputeContext *context)
+{
+  GtkCssValue **values;
+
+  style->used = (GtkCssUsedValues *) gtk_css_values_new (GTK_CSS_USED_VALUES);
+  values = &style->used->color;
+
+  for (guint i = 0; i < G_N_ELEMENTS (used_props); i++)
+    {
+      guint id = used_props[i];
+      GtkCssValue *value, *used;
+
+      value = gtk_css_style_get_computed_value (style, id);
+
+      if (gtk_css_value_contains_current_color (value))
+        used = gtk_css_style_resolve_used_value (style, value, id, context);
+      else
+        used = gtk_css_value_ref (value);
+
+      gtk_css_take_value (&values[i], used);
+    }
+}

gtk/gtkcssstylechange.c

@@ -26,7 +26,8 @@ compute_change (GtkCssStyleChange *change)
 {
   gboolean color_changed = FALSE;
 
-  if (change->old_style->core != change->new_style->core)
+  if (change->old_style->core != change->new_style->core ||
+      gtk_css_value_contains_current_color (change->old_style->core->color))
     {
       gtk_css_core_values_compute_changes_and_affects (change->old_style,
                                                        change->new_style,
@@ -35,45 +36,51 @@ compute_change (GtkCssStyleChange *change)
       color_changed = _gtk_bitmask_get (change->changes, GTK_CSS_PROPERTY_COLOR);
     }
 
-  if (change->old_style->background != change->new_style->background)
+  if (change->old_style->background != change->new_style->background ||
+      (color_changed && (gtk_css_value_contains_current_color (change->old_style->background->background_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->background->box_shadow) ||
+                         gtk_css_value_contains_current_color (change->old_style->background->background_image))))
     gtk_css_background_values_compute_changes_and_affects (change->old_style,
                                                            change->new_style,
                                                            &change->changes,
                                                            &change->affects);
 
   if (change->old_style->border != change->new_style->border ||
-      (color_changed && (change->old_style->border->border_top_color == NULL ||
-                         change->old_style->border->border_right_color == NULL ||
-                         change->old_style->border->border_bottom_color == NULL ||
-                         change->old_style->border->border_left_color == NULL)))
+      (color_changed && (gtk_css_value_contains_current_color (change->old_style->border->border_top_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->border->border_right_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->border->border_bottom_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->border->border_left_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->border->border_image_source))))
     gtk_css_border_values_compute_changes_and_affects (change->old_style,
                                                        change->new_style,
                                                        &change->changes,
                                                        &change->affects);
 
-  if (change->old_style->icon != change->new_style->icon)
+  if (change->old_style->icon != change->new_style->icon ||
+      (color_changed && (gtk_css_value_contains_current_color (change->old_style->icon->icon_shadow))))
     gtk_css_icon_values_compute_changes_and_affects (change->old_style,
                                                      change->new_style,
                                                      &change->changes,
                                                      &change->affects);
 
   if (change->old_style->outline != change->new_style->outline ||
-      (color_changed && change->old_style->outline->outline_color == NULL))
+      (color_changed && gtk_css_value_contains_current_color (change->old_style->outline->outline_color)))
     gtk_css_outline_values_compute_changes_and_affects (change->old_style,
                                                         change->new_style,
                                                         &change->changes,
                                                         &change->affects);
 
   if (change->old_style->font != change->new_style->font ||
-      (color_changed && (change->old_style->font->caret_color == NULL ||
-                         change->old_style->font->secondary_caret_color == NULL)))
+      (color_changed && (gtk_css_value_contains_current_color (change->old_style->font->caret_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->font->secondary_caret_color) ||
+                         gtk_css_value_contains_current_color (change->old_style->font->text_shadow))))
     gtk_css_font_values_compute_changes_and_affects (change->old_style,
                                                      change->new_style,
                                                      &change->changes,
                                                      &change->affects);
 
   if (change->old_style->font_variant != change->new_style->font_variant ||
-      (color_changed && change->old_style->font_variant->text_decoration_color == NULL))
+      (color_changed && gtk_css_value_contains_current_color (change->old_style->font_variant->text_decoration_color)))
     gtk_css_font_variant_values_compute_changes_and_affects (change->old_style,
                                                              change->new_style,
                                                              &change->changes,
@@ -97,7 +104,8 @@ compute_change (GtkCssStyleChange *change)
                                                      &change->changes,
                                                      &change->affects);
 
-  if (change->old_style->other != change->new_style->other)
+  if (change->old_style->other != change->new_style->other ||
+      (color_changed && gtk_css_value_contains_current_color (change->old_style->other->icon_source)))
     gtk_css_other_values_compute_changes_and_affects (change->old_style,
                                                       change->new_style,
                                                       &change->changes,

gtk/gtkcssstyleprivate.h

@@ -59,6 +59,7 @@ typedef enum {
   GTK_CSS_SIZE_INITIAL_VALUES,
   GTK_CSS_OTHER_VALUES,
   GTK_CSS_OTHER_INITIAL_VALUES,
+  GTK_CSS_USED_VALUES,
 } GtkCssValuesType;
 
 typedef struct _GtkCssValues GtkCssValues;
@@ -73,6 +74,7 @@ typedef struct _GtkCssAnimationValues GtkCssAnimationValues;
 typedef struct _GtkCssTransitionValues GtkCssTransitionValues;
 typedef struct _GtkCssSizeValues GtkCssSizeValues;
 typedef struct _GtkCssOtherValues GtkCssOtherValues;
+typedef struct _GtkCssUsedValues GtkCssUsedValues;
 
 struct _GtkCssValues {
   int ref_count;
@@ -81,6 +83,7 @@ struct _GtkCssValues {
 
 struct _GtkCssCoreValues {
   GtkCssValues base;
+
   GtkCssValue *color;
   GtkCssValue *dpi;
   GtkCssValue *font_size;
@@ -89,6 +92,7 @@ struct _GtkCssCoreValues {
 
 struct _GtkCssBackgroundValues {
   GtkCssValues base;
+
   GtkCssValue *background_color;
   GtkCssValue *box_shadow;
   GtkCssValue *background_clip;
@@ -102,6 +106,7 @@ struct _GtkCssBackgroundValues {
 
 struct _GtkCssBorderValues {
   GtkCssValues base;
+
   GtkCssValue *border_top_style;
   GtkCssValue *border_top_width;
   GtkCssValue *border_left_style;
@@ -114,10 +119,10 @@ struct _GtkCssBorderValues {
   GtkCssValue *border_top_right_radius;
   GtkCssValue *border_bottom_right_radius;
   GtkCssValue *border_bottom_left_radius;
-  GtkCssValue *border_top_color; // NULL if currentColor
-  GtkCssValue *border_right_color; // NULL if currentColor
-  GtkCssValue *border_bottom_color; // NULL if currentColor
-  GtkCssValue *border_left_color; // NULL if currentColor
+  GtkCssValue *border_top_color;
+  GtkCssValue *border_right_color;
+  GtkCssValue *border_bottom_color;
+  GtkCssValue *border_left_color;
   GtkCssValue *border_image_source;
   GtkCssValue *border_image_repeat;
   GtkCssValue *border_image_slice;
@@ -126,6 +131,7 @@ struct _GtkCssBorderValues {
 
 struct _GtkCssIconValues {
   GtkCssValues base;
+
   GtkCssValue *icon_size;
   GtkCssValue *icon_shadow;
   GtkCssValue *icon_style;
@@ -134,22 +140,24 @@ struct _GtkCssIconValues {
 
 struct _GtkCssOutlineValues {
   GtkCssValues base;
+
   GtkCssValue *outline_style;
   GtkCssValue *outline_width;
   GtkCssValue *outline_offset;
-  GtkCssValue *outline_color; // NULL if currentColor
+  GtkCssValue *outline_color;
 };
 
 struct _GtkCssFontValues {
   GtkCssValues base;
+
   GtkCssValue *font_family;
   GtkCssValue *font_style;
   GtkCssValue *font_weight;
   GtkCssValue *font_stretch;
   GtkCssValue *letter_spacing;
   GtkCssValue *text_shadow;
-  GtkCssValue *caret_color; // NULL if currentColor
-  GtkCssValue *secondary_caret_color; // NULL if currentColor
+  GtkCssValue *caret_color;
+  GtkCssValue *secondary_caret_color;
   GtkCssValue *font_feature_settings;
   GtkCssValue *font_variation_settings;
   GtkCssValue *line_height;
@@ -157,8 +165,9 @@ struct _GtkCssFontValues {
 
 struct _GtkCssFontVariantValues {
   GtkCssValues base;
+
   GtkCssValue *text_decoration_line;
-  GtkCssValue *text_decoration_color; // NULL if currentColor
+  GtkCssValue *text_decoration_color;
   GtkCssValue *text_decoration_style;
   GtkCssValue *text_transform;
   GtkCssValue *font_kerning;
@@ -172,6 +181,7 @@ struct _GtkCssFontVariantValues {
 
 struct _GtkCssAnimationValues {
   GtkCssValues base;
+
   GtkCssValue *animation_name;
   GtkCssValue *animation_duration;
   GtkCssValue *animation_timing_function;
@@ -184,6 +194,7 @@ struct _GtkCssAnimationValues {
 
 struct _GtkCssTransitionValues {
   GtkCssValues base;
+
   GtkCssValue *transition_property;
   GtkCssValue *transition_duration;
   GtkCssValue *transition_timing_function;
@@ -192,6 +203,7 @@ struct _GtkCssTransitionValues {
 
 struct _GtkCssSizeValues {
   GtkCssValues base;
+
   GtkCssValue *margin_top;
   GtkCssValue *margin_left;
   GtkCssValue *margin_bottom;
@@ -207,6 +219,7 @@ struct _GtkCssSizeValues {
 
 struct _GtkCssOtherValues {
   GtkCssValues base;
+
   GtkCssValue *icon_source;
   GtkCssValue *icon_transform;
   GtkCssValue *icon_filter;
@@ -216,6 +229,28 @@ struct _GtkCssOtherValues {
   GtkCssValue *filter;
 };
 
+struct _GtkCssUsedValues {
+  GtkCssValues base;
+
+  GtkCssValue *color;
+  GtkCssValue *icon_palette;
+  GtkCssValue *background_color;
+  GtkCssValue *box_shadow;
+  GtkCssValue *background_image;
+  GtkCssValue *border_top_color;
+  GtkCssValue *border_right_color;
+  GtkCssValue *border_bottom_color;
+  GtkCssValue *border_left_color;
+  GtkCssValue *border_image_source;
+  GtkCssValue *icon_shadow;
+  GtkCssValue *outline_color;
+  GtkCssValue *caret_color;
+  GtkCssValue *secondary_caret_color;
+  GtkCssValue *text_shadow;
+  GtkCssValue *text_decoration_color;
+  GtkCssValue *icon_source;
+};
+
 /* typedef struct _GtkCssStyle           GtkCssStyle; */
 typedef struct _GtkCssStyleClass      GtkCssStyleClass;
 
@@ -234,6 +269,8 @@ struct _GtkCssStyle
   GtkCssTransitionValues  *transition;
   GtkCssSizeValues        *size;
   GtkCssOtherValues       *other;
+  GtkCssUsedValues        *used;
+
   GtkCssVariableSet       *variables;
 
   GtkCssValue             *variable_values;
@@ -261,6 +298,10 @@ GType                   gtk_css_style_get_type                  (void) G_GNUC_CO
 
 GtkCssValue *           gtk_css_style_get_value                 (GtkCssStyle            *style,
                                                                  guint                   id) G_GNUC_PURE;
+GtkCssValue *           gtk_css_style_get_computed_value        (GtkCssStyle            *style,
+                                                                 guint                   id) G_GNUC_PURE;
+GtkCssValue *           gtk_css_style_get_used_value            (GtkCssStyle            *style,
+                                                                 guint                   id) G_GNUC_PURE;
 GtkCssSection *         gtk_css_style_get_section               (GtkCssStyle            *style,
                                                                  guint                   id) G_GNUC_PURE;
 gboolean                gtk_css_style_is_static                 (GtkCssStyle            *style) G_GNUC_PURE;
@@ -287,6 +328,9 @@ GtkCssVariableValue *   gtk_css_style_get_custom_property       (GtkCssStyle
                                                                  int                     id);
 GArray *                gtk_css_style_list_custom_properties    (GtkCssStyle            *style);
 
+void                    gtk_css_style_resolve_used_values       (GtkCssStyle            *style,
+                                                                 GtkCssComputeContext   *context);
+
 GtkCssValues *gtk_css_values_new   (GtkCssValuesType  type);
 GtkCssValues *gtk_css_values_ref   (GtkCssValues     *values);
 void          gtk_css_values_unref (GtkCssValues     *values);

gtk/gtkcssstylepropertyimpl.c

@@ -163,12 +163,12 @@ font_weight_parse (GtkCssStyleProperty *property,
   value = gtk_css_font_weight_value_try_parse (parser);
   if (value == NULL)
     {
-      value = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY);
+      value = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY);
       if (value == NULL)
         return NULL;
 
-      if (_gtk_css_number_value_get (value, 100) < 1 || 
-          _gtk_css_number_value_get (value, 100) > 1000)
+      if (gtk_css_number_value_get (value, 100) < 1 || 
+          gtk_css_number_value_get (value, 100) > 1000)
         {
           gtk_css_parser_error_value (parser, "Font weight values must be between 1 and 1000");
           g_clear_pointer (&value, gtk_css_value_unref);
@@ -242,7 +242,7 @@ static GtkCssValue *
 opacity_parse (GtkCssStyleProperty *property,
 	       GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
 }
 
 static GtkCssValue *
@@ -285,10 +285,10 @@ static GtkCssValue *
 icon_size_parse (GtkCssStyleProperty *property,
 		 GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser, 
-                                      GTK_CSS_PARSE_LENGTH
-                                      | GTK_CSS_PARSE_PERCENT
-                                      | GTK_CSS_POSITIVE_ONLY);
+  return gtk_css_number_value_parse (parser, 
+                                     GTK_CSS_PARSE_LENGTH
+                                     | GTK_CSS_PARSE_PERCENT
+                                     | GTK_CSS_POSITIVE_ONLY);
 }
 
 static GtkCssValue *
@@ -314,7 +314,7 @@ static GtkCssValue *
 parse_letter_spacing (GtkCssStyleProperty *property,
                       GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
 }
 
 static gboolean
@@ -597,7 +597,7 @@ static GtkCssValue *
 dpi_parse (GtkCssStyleProperty *property,
 	   GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
 }
 
 GtkCssValue *
@@ -609,10 +609,10 @@ gtk_css_font_size_value_parse (GtkCssParser *parser)
   if (value)
     return value;
 
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_PARSE_LENGTH
-                                      | GTK_CSS_PARSE_PERCENT
-                                      | GTK_CSS_POSITIVE_ONLY);
+  return gtk_css_number_value_parse (parser,
+                                     GTK_CSS_PARSE_LENGTH
+                                     | GTK_CSS_PARSE_PERCENT
+                                     | GTK_CSS_POSITIVE_ONLY);
 }
 
 static GtkCssValue *
@@ -626,8 +626,8 @@ static GtkCssValue *
 outline_parse (GtkCssStyleProperty *property,
                GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_PARSE_LENGTH);
+  return gtk_css_number_value_parse (parser,
+                                     GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
@@ -674,9 +674,9 @@ static GtkCssValue *
 minmax_parse (GtkCssStyleProperty *property,
               GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_PARSE_LENGTH
-                                      | GTK_CSS_POSITIVE_ONLY);
+  return gtk_css_number_value_parse (parser,
+                                     GTK_CSS_PARSE_LENGTH
+                                     | GTK_CSS_POSITIVE_ONLY);
 }
 
 static GtkCssValue *
@@ -705,7 +705,7 @@ transition_property_parse (GtkCssStyleProperty *property,
 static GtkCssValue *
 transition_time_parse_one (GtkCssParser *parser)
 {
-  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_TIME);
 }
 
 static GtkCssValue *
@@ -726,9 +726,9 @@ static GtkCssValue *
 iteration_count_parse_one (GtkCssParser *parser)
 {
   if (gtk_css_parser_try_ident (parser, "infinite"))
-    return _gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
+    return gtk_css_number_value_new (HUGE_VAL, GTK_CSS_NUMBER);
 
-  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER | GTK_CSS_POSITIVE_ONLY);
 }
 
 static GtkCssValue *
@@ -742,26 +742,25 @@ static GtkCssValue *
 parse_margin (GtkCssStyleProperty *property,
               GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_PARSE_LENGTH);
+  return gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
 parse_padding (GtkCssStyleProperty *property,
                GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_PARSE_LENGTH);
+  return gtk_css_number_value_parse (parser,
+                                     GTK_CSS_POSITIVE_ONLY
+                                     | GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
 parse_border_width (GtkCssStyleProperty *property,
                     GtkCssParser        *parser)
 {
-  return _gtk_css_number_value_parse (parser,
-                                      GTK_CSS_POSITIVE_ONLY
-                                      | GTK_CSS_PARSE_LENGTH);
+  return gtk_css_number_value_parse (parser,
+                                     GTK_CSS_POSITIVE_ONLY
+                                     | GTK_CSS_PARSE_LENGTH);
 }
 
 static GtkCssValue *
@@ -854,7 +853,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_TEXT_SIZE,
                                           dpi_parse,
-                                          _gtk_css_number_value_new (96.0, GTK_CSS_NUMBER));
+                                          gtk_css_number_value_new (96.0, GTK_CSS_NUMBER));
   gtk_css_style_property_register        ("font-size",
                                           GTK_CSS_PROPERTY_FONT_SIZE,
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
@@ -895,7 +894,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_TEXT_SIZE,
                                           font_weight_parse,
-                                          _gtk_css_number_value_new (PANGO_WEIGHT_NORMAL, GTK_CSS_NUMBER));
+                                          gtk_css_number_value_new (PANGO_WEIGHT_NORMAL, GTK_CSS_NUMBER));
   gtk_css_style_property_register        ("font-stretch",
                                           GTK_CSS_PROPERTY_FONT_STRETCH,
                                           GTK_STYLE_PROPERTY_INHERIT,
@@ -908,7 +907,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_TEXT_ATTRS | GTK_CSS_AFFECTS_TEXT_SIZE,
                                           parse_letter_spacing,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
 
   gtk_css_style_property_register        ("text-decoration-line",
                                           GTK_CSS_PROPERTY_TEXT_DECORATION_LINE,
@@ -995,49 +994,49 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_margin,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("margin-left",
                                           GTK_CSS_PROPERTY_MARGIN_LEFT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_margin,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("margin-bottom",
                                           GTK_CSS_PROPERTY_MARGIN_BOTTOM,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_margin,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("margin-right",
                                           GTK_CSS_PROPERTY_MARGIN_RIGHT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_margin,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("padding-top",
                                           GTK_CSS_PROPERTY_PADDING_TOP,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_padding,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("padding-left",
                                           GTK_CSS_PROPERTY_PADDING_LEFT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_padding,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("padding-bottom",
                                           GTK_CSS_PROPERTY_PADDING_BOTTOM,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_padding,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("padding-right",
                                           GTK_CSS_PROPERTY_PADDING_RIGHT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           parse_padding,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   /* IMPORTANT: the border-width properties must come after border-style properties,
    * they depend on them for their value computation.
    */
@@ -1052,7 +1051,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BORDER | GTK_CSS_AFFECTS_SIZE,
                                           parse_border_width,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-left-style",
                                           GTK_CSS_PROPERTY_BORDER_LEFT_STYLE,
                                           0,
@@ -1064,7 +1063,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BORDER | GTK_CSS_AFFECTS_SIZE,
                                           parse_border_width,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-bottom-style",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_STYLE,
                                           0,
@@ -1076,7 +1075,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BORDER | GTK_CSS_AFFECTS_SIZE,
                                           parse_border_width,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("border-right-style",
                                           GTK_CSS_PROPERTY_BORDER_RIGHT_STYLE,
                                           0,
@@ -1088,36 +1087,36 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BORDER | GTK_CSS_AFFECTS_SIZE,
                                           parse_border_width,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
 
   gtk_css_style_property_register        ("border-top-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_LEFT_RADIUS,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER,
                                           border_corner_radius_value_parse,
-                                          _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
-                                                                     _gtk_css_number_value_new (0, GTK_CSS_PX)));
+                                          _gtk_css_corner_value_new (gtk_css_number_value_new (0, GTK_CSS_PX),
+                                                                     gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-top-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_TOP_RIGHT_RADIUS,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER,
                                           border_corner_radius_value_parse,
-                                          _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
-                                                                     _gtk_css_number_value_new (0, GTK_CSS_PX)));
+                                          _gtk_css_corner_value_new (gtk_css_number_value_new (0, GTK_CSS_PX),
+                                                                     gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-bottom-right-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_RIGHT_RADIUS,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER,
                                           border_corner_radius_value_parse,
-                                          _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
-                                                                     _gtk_css_number_value_new (0, GTK_CSS_PX)));
+                                          _gtk_css_corner_value_new (gtk_css_number_value_new (0, GTK_CSS_PX),
+                                                                     gtk_css_number_value_new (0, GTK_CSS_PX)));
   gtk_css_style_property_register        ("border-bottom-left-radius",
                                           GTK_CSS_PROPERTY_BORDER_BOTTOM_LEFT_RADIUS,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BACKGROUND | GTK_CSS_AFFECTS_BORDER,
                                           border_corner_radius_value_parse,
-                                          _gtk_css_corner_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
-                                                                     _gtk_css_number_value_new (0, GTK_CSS_PX)));
+                                          _gtk_css_corner_value_new (gtk_css_number_value_new (0, GTK_CSS_PX),
+                                                                     gtk_css_number_value_new (0, GTK_CSS_PX)));
 
   gtk_css_style_property_register        ("outline-style",
                                           GTK_CSS_PROPERTY_OUTLINE_STYLE,
@@ -1130,13 +1129,13 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_OUTLINE,
                                           parse_border_width,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("outline-offset",
                                           GTK_CSS_PROPERTY_OUTLINE_OFFSET,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_OUTLINE,
                                           outline_parse,
-                                          _gtk_css_number_value_new (0.0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0.0, GTK_CSS_PX));
   gtk_css_style_property_register        ("background-clip",
                                           GTK_CSS_PROPERTY_BACKGROUND_CLIP,
                                           0,
@@ -1160,8 +1159,8 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_BACKGROUND,
                                           background_position_parse,
-                                          _gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PERCENT),
-                                                                       _gtk_css_number_value_new (0, GTK_CSS_PERCENT)));
+                                          _gtk_css_position_value_new (gtk_css_number_value_new (0, GTK_CSS_PERCENT),
+                                                                       gtk_css_number_value_new (0, GTK_CSS_PERCENT)));
 
   gtk_css_style_property_register        ("border-top-color",
                                           GTK_CSS_PROPERTY_BORDER_TOP_COLOR,
@@ -1234,19 +1233,19 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           GTK_CSS_AFFECTS_BORDER,
                                           border_image_slice_parse,
-                                          _gtk_css_border_value_new (_gtk_css_number_value_new (100, GTK_CSS_PERCENT),
-                                                                     _gtk_css_number_value_new (100, GTK_CSS_PERCENT),
-                                                                     _gtk_css_number_value_new (100, GTK_CSS_PERCENT),
-                                                                     _gtk_css_number_value_new (100, GTK_CSS_PERCENT)));
+                                          _gtk_css_border_value_new (gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+                                                                     gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+                                                                     gtk_css_number_value_new (100, GTK_CSS_PERCENT),
+                                                                     gtk_css_number_value_new (100, GTK_CSS_PERCENT)));
   gtk_css_style_property_register        ("border-image-width",
                                           GTK_CSS_PROPERTY_BORDER_IMAGE_WIDTH,
                                           0,
                                           GTK_CSS_AFFECTS_BORDER,
                                           border_image_width_parse,
-                                          _gtk_css_border_value_new (_gtk_css_number_value_new (1, GTK_CSS_NUMBER),
-                                                                     _gtk_css_number_value_new (1, GTK_CSS_NUMBER),
-                                                                     _gtk_css_number_value_new (1, GTK_CSS_NUMBER),
-                                                                     _gtk_css_number_value_new (1, GTK_CSS_NUMBER)));
+                                          _gtk_css_border_value_new (gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+                                                                     gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+                                                                     gtk_css_number_value_new (1, GTK_CSS_NUMBER),
+                                                                     gtk_css_number_value_new (1, GTK_CSS_NUMBER)));
 
   gtk_css_style_property_register        ("-gtk-icon-source",
                                           GTK_CSS_PROPERTY_ICON_SOURCE,
@@ -1259,7 +1258,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE | GTK_CSS_AFFECTS_ICON_SIZE,
                                           icon_size_parse,
-                                          _gtk_css_number_value_new (16, GTK_CSS_PX));
+                                          gtk_css_number_value_new (16, GTK_CSS_PX));
   gtk_css_style_property_register        ("-gtk-icon-shadow",
                                           GTK_CSS_PROPERTY_ICON_SHADOW,
                                           GTK_STYLE_PROPERTY_INHERIT | GTK_STYLE_PROPERTY_ANIMATED,
@@ -1289,8 +1288,8 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           border_spacing_value_parse,
-                                          _gtk_css_position_value_new (_gtk_css_number_value_new (0, GTK_CSS_PX),
-                                                                       _gtk_css_number_value_new (0, GTK_CSS_PX)));
+                                          _gtk_css_position_value_new (gtk_css_number_value_new (0, GTK_CSS_PX),
+                                                                       gtk_css_number_value_new (0, GTK_CSS_PX)));
 
   gtk_css_style_property_register        ("transform",
                                           GTK_CSS_PROPERTY_TRANSFORM,
@@ -1303,20 +1302,20 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_TRANSFORM,
                                           transform_origin_parse,
-                                          _gtk_css_position_value_new (_gtk_css_number_value_new (50, GTK_CSS_PERCENT),
-                                                                       _gtk_css_number_value_new (50, GTK_CSS_PERCENT)));
+                                          _gtk_css_position_value_new (gtk_css_number_value_new (50, GTK_CSS_PERCENT),
+                                                                       gtk_css_number_value_new (50, GTK_CSS_PERCENT)));
   gtk_css_style_property_register        ("min-width",
                                           GTK_CSS_PROPERTY_MIN_WIDTH,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           minmax_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0, GTK_CSS_PX));
   gtk_css_style_property_register        ("min-height",
                                           GTK_CSS_PROPERTY_MIN_HEIGHT,
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_SIZE,
                                           minmax_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_PX));
+                                          gtk_css_number_value_new (0, GTK_CSS_PX));
 
   gtk_css_style_property_register        ("transition-property",
                                           GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
@@ -1329,7 +1328,7 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           0,
                                           transition_time_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_S));
+                                          gtk_css_number_value_new (0, GTK_CSS_S));
   gtk_css_style_property_register        ("transition-timing-function",
                                           GTK_CSS_PROPERTY_TRANSITION_TIMING_FUNCTION,
                                           0,
@@ -1341,7 +1340,7 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           0,
                                           transition_time_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_S));
+                                          gtk_css_number_value_new (0, GTK_CSS_S));
 
   gtk_css_style_property_register        ("animation-name",
                                           GTK_CSS_PROPERTY_ANIMATION_NAME,
@@ -1354,7 +1353,7 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           0,
                                           transition_time_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_S));
+                                          gtk_css_number_value_new (0, GTK_CSS_S));
   gtk_css_style_property_register        ("animation-timing-function",
                                           GTK_CSS_PROPERTY_ANIMATION_TIMING_FUNCTION,
                                           0,
@@ -1366,7 +1365,7 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           0,
                                           iteration_count_parse,
-                                          _gtk_css_number_value_new (1, GTK_CSS_NUMBER));
+                                          gtk_css_number_value_new (1, GTK_CSS_NUMBER));
   gtk_css_style_property_register        ("animation-direction",
                                           GTK_CSS_PROPERTY_ANIMATION_DIRECTION,
                                           0,
@@ -1384,7 +1383,7 @@ _gtk_css_style_property_init_properties (void)
                                           0,
                                           0,
                                           transition_time_parse,
-                                          _gtk_css_number_value_new (0, GTK_CSS_S));
+                                          gtk_css_number_value_new (0, GTK_CSS_S));
   gtk_css_style_property_register        ("animation-fill-mode",
                                           GTK_CSS_PROPERTY_ANIMATION_FILL_MODE,
                                           0,
@@ -1397,7 +1396,7 @@ _gtk_css_style_property_init_properties (void)
                                           GTK_STYLE_PROPERTY_ANIMATED,
                                           GTK_CSS_AFFECTS_POSTEFFECT,
                                           opacity_parse,
-                                          _gtk_css_number_value_new (1, GTK_CSS_NUMBER));
+                                          gtk_css_number_value_new (1, GTK_CSS_NUMBER));
   gtk_css_style_property_register        ("filter",
                                           GTK_CSS_PROPERTY_FILTER,
                                           GTK_STYLE_PROPERTY_ANIMATED,

gtk/gtkcsstransformvalue.c

@@ -135,30 +135,30 @@ gtk_css_transform_init_identity (GtkCssTransform     *transform,
       graphene_matrix_init_identity (&transform->matrix.matrix);
       break;
     case GTK_CSS_TRANSFORM_TRANSLATE:
-      transform->translate.x = _gtk_css_number_value_new (0, GTK_CSS_PX);
-      transform->translate.y = _gtk_css_number_value_new (0, GTK_CSS_PX);
-      transform->translate.z = _gtk_css_number_value_new (0, GTK_CSS_PX);
+      transform->translate.x = gtk_css_number_value_new (0, GTK_CSS_PX);
+      transform->translate.y = gtk_css_number_value_new (0, GTK_CSS_PX);
+      transform->translate.z = gtk_css_number_value_new (0, GTK_CSS_PX);
       break;
     case GTK_CSS_TRANSFORM_ROTATE:
-      transform->rotate.x = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-      transform->rotate.y = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-      transform->rotate.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-      transform->rotate.angle = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      transform->rotate.x = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+      transform->rotate.y = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+      transform->rotate.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      transform->rotate.angle = gtk_css_number_value_new (0, GTK_CSS_DEG);
       break;
     case GTK_CSS_TRANSFORM_SCALE:
-      transform->scale.x = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-      transform->scale.y = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-      transform->scale.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      transform->scale.x = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      transform->scale.y = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+      transform->scale.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
       break;
     case GTK_CSS_TRANSFORM_SKEW:
-      transform->skew.x = _gtk_css_number_value_new (0, GTK_CSS_DEG);
-      transform->skew.y = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      transform->skew.x = gtk_css_number_value_new (0, GTK_CSS_DEG);
+      transform->skew.y = gtk_css_number_value_new (0, GTK_CSS_DEG);
       break;
     case GTK_CSS_TRANSFORM_SKEW_X:
-      transform->skew_x.skew = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      transform->skew_x.skew = gtk_css_number_value_new (0, GTK_CSS_DEG);
       break;
     case GTK_CSS_TRANSFORM_SKEW_Y:
-      transform->skew_y.skew = _gtk_css_number_value_new (0, GTK_CSS_DEG);
+      transform->skew_y.skew = gtk_css_number_value_new (0, GTK_CSS_DEG);
       break;
     case GTK_CSS_TRANSFORM_PERSPECTIVE:
       return FALSE;
@@ -188,9 +188,9 @@ gtk_css_transform_apply (const GtkCssTransform   *transform,
     case GTK_CSS_TRANSFORM_TRANSLATE:
       return gsk_transform_translate_3d (next,
                                          &GRAPHENE_POINT3D_INIT (
-                                             _gtk_css_number_value_get (transform->translate.x, 100),
-                                             _gtk_css_number_value_get (transform->translate.y, 100),
-                                              _gtk_css_number_value_get (transform->translate.z, 100)
+                                             gtk_css_number_value_get (transform->translate.x, 100),
+                                             gtk_css_number_value_get (transform->translate.y, 100),
+                                             gtk_css_number_value_get (transform->translate.z, 100)
                                          ));
 
     case GTK_CSS_TRANSFORM_ROTATE:
@@ -198,41 +198,41 @@ gtk_css_transform_apply (const GtkCssTransform   *transform,
         graphene_vec3_t axis;
 
         graphene_vec3_init (&axis,
-                            _gtk_css_number_value_get (transform->rotate.x, 1),
-                            _gtk_css_number_value_get (transform->rotate.y, 1),
-                            _gtk_css_number_value_get (transform->rotate.z, 1));
+                            gtk_css_number_value_get (transform->rotate.x, 1),
+                            gtk_css_number_value_get (transform->rotate.y, 1),
+                            gtk_css_number_value_get (transform->rotate.z, 1));
         return gsk_transform_rotate_3d (next,
-                                        _gtk_css_number_value_get (transform->rotate.angle, 100),
+                                        gtk_css_number_value_get (transform->rotate.angle, 100),
                                         &axis);
       }
 
     case GTK_CSS_TRANSFORM_SCALE:
       return gsk_transform_scale_3d (next,
-                                     _gtk_css_number_value_get (transform->scale.x, 1),
-                                     _gtk_css_number_value_get (transform->scale.y, 1),
-                                     _gtk_css_number_value_get (transform->scale.z, 1));
+                                     gtk_css_number_value_get (transform->scale.x, 1),
+                                     gtk_css_number_value_get (transform->scale.y, 1),
+                                     gtk_css_number_value_get (transform->scale.z, 1));
 
     case GTK_CSS_TRANSFORM_SKEW:
       graphene_matrix_init_skew (&skew,
-                                 _gtk_css_number_value_get (transform->skew.x, 100) / 180.0f * G_PI,
-                                 _gtk_css_number_value_get (transform->skew.y, 100) / 180.0f * G_PI);
+                                 gtk_css_number_value_get (transform->skew.x, 100) / 180.0f * G_PI,
+                                 gtk_css_number_value_get (transform->skew.y, 100) / 180.0f * G_PI);
       return gsk_transform_matrix (next, &skew);
 
     case GTK_CSS_TRANSFORM_SKEW_X:
       graphene_matrix_init_skew (&skew,
-                                 _gtk_css_number_value_get (transform->skew_x.skew, 100) / 180.0f * G_PI,
+                                 gtk_css_number_value_get (transform->skew_x.skew, 100) / 180.0f * G_PI,
                                  0);
       return gsk_transform_matrix (next, &skew);
 
     case GTK_CSS_TRANSFORM_SKEW_Y:
       graphene_matrix_init_skew (&skew,
                                  0,
-                                 _gtk_css_number_value_get (transform->skew_y.skew, 100) / 180.0f * G_PI);
+                                 gtk_css_number_value_get (transform->skew_y.skew, 100) / 180.0f * G_PI);
       return gsk_transform_matrix (next, &skew);
 
     case GTK_CSS_TRANSFORM_PERSPECTIVE:
       return gsk_transform_perspective (next,
-                                        _gtk_css_number_value_get (transform->perspective.depth, 100));
+                                        gtk_css_number_value_get (transform->perspective.depth, 100));
 
     case GTK_CSS_TRANSFORM_NONE:
     default:
@@ -712,7 +712,7 @@ gtk_css_transform_print (const GtkCssTransform *transform,
       g_string_append (string, ")");
       break;
     case GTK_CSS_TRANSFORM_SCALE:
-      if (_gtk_css_number_value_get (transform->scale.z, 100) == 1)
+      if (gtk_css_number_value_get (transform->scale.z, 100) == 1)
         {
           g_string_append (string, "scale(");
           gtk_css_value_print (transform->scale.x, string);
@@ -795,7 +795,7 @@ static const GtkCssValueClass GTK_CSS_VALUE_TRANSFORM = {
   gtk_css_value_transform_print
 };
 
-static GtkCssValue transform_none_singleton = { &GTK_CSS_VALUE_TRANSFORM, 1, TRUE, FALSE, 0, {  { GTK_CSS_TRANSFORM_NONE } } };
+static GtkCssValue transform_none_singleton = { &GTK_CSS_VALUE_TRANSFORM, 1, 1, 0, 0, 0, {  { GTK_CSS_TRANSFORM_NONE } } };
 
 static GtkCssValue *
 gtk_css_transform_value_alloc (guint n_transforms)
@@ -844,7 +844,7 @@ gtk_css_transform_parse_length (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
   if (values[n] == NULL)
     return 0;
 
@@ -858,7 +858,7 @@ gtk_css_transform_parse_angle (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
   if (values[n] == NULL)
     return 0;
 
@@ -872,7 +872,7 @@ gtk_css_transform_parse_number (GtkCssParser *parser,
 {
   GtkCssValue **values = data;
 
-  values[n] = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+  values[n] = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
   if (values[n] == NULL)
     return 0;
 
@@ -889,25 +889,25 @@ gtk_css_transform_parse_rotate3d (GtkCssParser *parser,
   switch (n)
   {
     case 0:
-      transform->rotate.x = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+      transform->rotate.x = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
       if (transform->rotate.x == NULL)
         return 0;
       break;
 
     case 1:
-      transform->rotate.y = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+      transform->rotate.y = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
       if (transform->rotate.y == NULL)
         return 0;
       break;
 
     case 2:
-      transform->rotate.z = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
+      transform->rotate.z = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_NUMBER);
       if (transform->rotate.z == NULL)
         return 0;
       break;
 
     case 3:
-      transform->rotate.angle = _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
+      transform->rotate.angle = gtk_css_number_value_parse (parser, GTK_CSS_PARSE_ANGLE);
       if (transform->rotate.angle == NULL)
         return 0;
       break;
@@ -972,9 +972,9 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_ROTATE;
-          transform.rotate.x = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-          transform.rotate.y = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-          transform.rotate.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.rotate.x = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.y = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.rotate.angle);
         }
       else if (gtk_css_parser_has_function (parser, "rotate3d"))
@@ -1000,9 +1000,9 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_ROTATE;
-          transform.rotate.x = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-          transform.rotate.y = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-          transform.rotate.z = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.x = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.rotate.y = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.z = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.rotate.angle);
         }
       else if (gtk_css_parser_has_function (parser, "rotateY"))
@@ -1011,9 +1011,9 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_ROTATE;
-          transform.rotate.x = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
-          transform.rotate.y = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-          transform.rotate.z = _gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.x = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
+          transform.rotate.y = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.rotate.z = gtk_css_number_value_new (0, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.rotate.angle);
         }
       else if (gtk_css_parser_has_function (parser, "scale"))
@@ -1033,7 +1033,7 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             transform.scale.y = values[1];
           else
             transform.scale.y = gtk_css_value_ref (values[0]);
-          transform.scale.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.scale.x) &&
                                  gtk_css_value_is_computed (transform.scale.y);
         }
@@ -1063,8 +1063,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_SCALE;
-          transform.scale.y = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-          transform.scale.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.y = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.scale.x);
         }
       else if (gtk_css_parser_has_function (parser, "scaleY"))
@@ -1073,8 +1073,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_SCALE;
-          transform.scale.x = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-          transform.scale.z = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.x = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.z = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.scale.y);
         }
       else if (gtk_css_parser_has_function (parser, "scaleZ"))
@@ -1083,8 +1083,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_SCALE;
-          transform.scale.x = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
-          transform.scale.y = _gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.x = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
+          transform.scale.y = gtk_css_number_value_new (1, GTK_CSS_NUMBER);
           computed = computed && gtk_css_value_is_computed (transform.scale.z);
         }
       else if (gtk_css_parser_has_function (parser, "skew"))
@@ -1136,8 +1136,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
           if (values[1])
             transform.translate.y = values[1];
           else
-            transform.translate.y = _gtk_css_number_value_new (0, GTK_CSS_PX);
-          transform.translate.z = _gtk_css_number_value_new (0, GTK_CSS_PX);
+            transform.translate.y = gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.z = gtk_css_number_value_new (0, GTK_CSS_PX);
           computed = computed && gtk_css_value_is_computed (transform.translate.x) &&
                                  gtk_css_value_is_computed (transform.translate.y);
         }
@@ -1167,8 +1167,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_TRANSLATE;
-          transform.translate.y = _gtk_css_number_value_new (0, GTK_CSS_PX);
-          transform.translate.z = _gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.y = gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.z = gtk_css_number_value_new (0, GTK_CSS_PX);
           computed = computed && gtk_css_value_is_computed (transform.translate.x);
         }
       else if (gtk_css_parser_has_function (parser, "translateY"))
@@ -1177,8 +1177,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_TRANSLATE;
-          transform.translate.x = _gtk_css_number_value_new (0, GTK_CSS_PX);
-          transform.translate.z = _gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.x = gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.z = gtk_css_number_value_new (0, GTK_CSS_PX);
           computed = computed && gtk_css_value_is_computed (transform.translate.y);
         }
       else if (gtk_css_parser_has_function (parser, "translateZ"))
@@ -1187,8 +1187,8 @@ _gtk_css_transform_value_parse (GtkCssParser *parser)
             goto fail;
 
           transform.type = GTK_CSS_TRANSFORM_TRANSLATE;
-          transform.translate.x = _gtk_css_number_value_new (0, GTK_CSS_PX);
-          transform.translate.y = _gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.x = gtk_css_number_value_new (0, GTK_CSS_PX);
+          transform.translate.y = gtk_css_number_value_new (0, GTK_CSS_PX);
           computed = computed && gtk_css_value_is_computed (transform.translate.z);
         }
       else

gtk/gtkcssvalueprivate.h

@@ -39,7 +39,8 @@ typedef struct _GtkCssValueClass      GtkCssValueClass;
   const GtkCssValueClass *class; \
   int ref_count; \
   guint is_computed: 1; \
-  guint contains_variables: 1;
+  guint contains_variables: 1; \
+  guint contains_current_color: 1;
 
 typedef struct {
   GtkStyleProvider   *provider;
@@ -142,5 +143,13 @@ gtk_css_value_contains_variables (const GtkCssValue *value)
   return value_base->contains_variables;
 }
 
+static inline gboolean
+gtk_css_value_contains_current_color (const GtkCssValue *value)
+{
+  GtkCssValueBase *value_base = (GtkCssValueBase *) value;
+
+  return value_base->contains_current_color;
+}
+
 G_END_DECLS
 

gtk/gtkcssvaluesprivate.h

@@ -148,4 +148,65 @@ static const int other_props[] = {
   GTK_CSS_PROPERTY_FILTER,
 };
 
+static const int used_props[] = {
+  GTK_CSS_PROPERTY_COLOR,
+  GTK_CSS_PROPERTY_ICON_PALETTE,
+  GTK_CSS_PROPERTY_BACKGROUND_COLOR,
+  GTK_CSS_PROPERTY_BOX_SHADOW,
+  GTK_CSS_PROPERTY_BACKGROUND_IMAGE,
+  GTK_CSS_PROPERTY_BORDER_TOP_COLOR,
+  GTK_CSS_PROPERTY_BORDER_RIGHT_COLOR,
+  GTK_CSS_PROPERTY_BORDER_BOTTOM_COLOR,
+  GTK_CSS_PROPERTY_BORDER_LEFT_COLOR,
+  GTK_CSS_PROPERTY_BORDER_IMAGE_SOURCE,
+  GTK_CSS_PROPERTY_ICON_SHADOW,
+  GTK_CSS_PROPERTY_OUTLINE_COLOR,
+  GTK_CSS_PROPERTY_CARET_COLOR,
+  GTK_CSS_PROPERTY_SECONDARY_CARET_COLOR,
+  GTK_CSS_PROPERTY_TEXT_SHADOW,
+  GTK_CSS_PROPERTY_TEXT_DECORATION_COLOR,
+  GTK_CSS_PROPERTY_ICON_SOURCE,
+};
+
+/* Maps back from css property ids to position in used_props.
+ * -1 means 'not present'.
+ */
+static const int used_props_map[] = {
+  0, /* color */
+  -1, -1,
+  1, /* icon-palette */
+  2, /* background-color */
+  -1, -1, -1, -1, -1, -1,
+  15, /* text-decoration-color */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1,
+  14, /* text-shadow */
+  3, /* box-shadow */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1,
+  5, /* border-top-color */
+  6, /* border-right-color */
+  7, /* border-bottom-color */
+  8, /* border-left-color */
+  11, /* outline-color */
+  -1,
+  4, /* background-image */
+  -1,
+  9, /* border-image-source */
+  -1, -1, -1,
+  16, /* icon-source */
+  -1,
+  10, /* icon-shadow */
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1, -1, -1,
+  -1, -1, -1, -1, -1, -1,
+  12, /* caret-color */
+  13, /* secondary-caret-color */
+  -1, -1, -1,
+};
+
+G_STATIC_ASSERT (G_N_ELEMENTS (used_props_map) == GTK_CSS_PROPERTY_N_PROPERTIES);
+
 G_END_DECLS

gtk/gtkdebug.h

@@ -96,6 +96,7 @@ typedef enum {
   GTK_DEBUG_A11Y            = 1 << 17,
   GTK_DEBUG_ICONFALLBACK    = 1 << 18,
   GTK_DEBUG_INVERT_TEXT_DIR = 1 << 19,
+  GTK_DEBUG_CSS             = 1 << 20,
 } GtkDebugFlags;
 
 #define GTK_DEBUG_CHECK(type) G_UNLIKELY (gtk_get_debug_flags () & GTK_DEBUG_##type)

gtk/gtkflowbox.c

@@ -2609,8 +2609,8 @@ G_GNUC_END_IGNORE_DEPRECATIONS
           cairo_append_path (cr, path);
           cairo_path_destroy (path);
 
-          border_color = gtk_css_color_value_get_rgba (style->border->border_top_color ? style->border->border_top_color : style->core->color);
-          border_width = round (_gtk_css_number_value_get (style->border->border_left_width, 100));
+          border_color = gtk_css_color_value_get_rgba (style->used->border_top_color);
+          border_width = round (gtk_css_number_value_get (style->border->border_left_width, 100));
 
           cairo_set_line_width (cr, border_width);
           gdk_cairo_set_source_rgba (cr, border_color);

gtk/gtkfontchooserwidget.c

@@ -23,6 +23,7 @@
 
 #include "deprecated/gtkfontchooserwidget.h"
 #include "gtkfontchooserwidgetprivate.h"
+#include "gtkfontfilterprivate.h"
 
 #include "gtkadjustment.h"
 #include "gtkbuildable.h"
@@ -108,10 +109,10 @@ struct _GtkFontChooserWidget
   GtkWidget    *family_face_list;
   GtkWidget    *list_stack;
   GtkSingleSelection *selection;
-  GtkCustomFilter      *custom_filter;
-  GtkCustomFilter      *user_filter;
-  GtkCustomFilter      *multi_filter;
-  GtkFilterListModel   *filter_model;
+  GtkCustomFilter    *custom_filter;
+  GtkFontFilter      *user_filter;
+  GtkCustomFilter    *multi_filter;
+  GtkFilterListModel *filter_model;
 
   GtkWidget       *preview;
   GtkWidget       *preview2;
@@ -130,16 +131,12 @@ struct _GtkFontChooserWidget
   GtkWidget       *axis_grid;
   GtkWidget       *feature_box;
 
-  GtkFrame          *language_button;
+  GtkCheckButton    *language_button;
   GtkFrame          *language_frame;
   GtkWidget         *language_list;
   GtkStringList     *languages;
   GHashTable        *language_table;
 
-  PangoLanguage     *filter_language;
-  gboolean           filter_by_language;
-  gboolean           filter_by_monospace;
-
   PangoFontMap         *font_map;
 
   PangoFontDescription *font_desc;
@@ -348,77 +345,29 @@ output_cb (GtkSpinButton *spin,
   return TRUE;
 }
 
-static gboolean
-user_filter_cb (gpointer item,
-                gpointer data)
+static void
+update_filter_language (GtkFontChooserWidget *self)
 {
-  GtkFontChooserWidget *self = GTK_FONT_CHOOSER_WIDGET (data);
-  PangoFontFamily *family;
-  PangoFontFace *face;
+  gboolean should_filter_language;
 
-  if (PANGO_IS_FONT_FAMILY (item))
+  should_filter_language = gtk_check_button_get_active (self->language_button);
+  if (!should_filter_language)
     {
-      family = item;
-      face = pango_font_family_get_face (family, NULL);
+      _gtk_font_filter_set_language (self->user_filter, NULL);
     }
   else
     {
-      face = PANGO_FONT_FACE (item);
-      family = pango_font_face_get_family (face);
+      GtkSelectionModel *model;
+      gpointer obj;
+      PangoLanguage *language = NULL;
+
+      model = gtk_list_view_get_model (GTK_LIST_VIEW (self->language_list));
+      obj = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (model));
+      if (obj)
+        language = pango_language_from_string (gtk_string_object_get_string (obj));
+
+      _gtk_font_filter_set_language (self->user_filter, language);
     }
-
-  if (self->filter_by_monospace &&
-      !pango_font_family_is_monospace (family))
-    return FALSE;
-
-  if (self->filter_by_language &&
-      self->filter_language)
-    {
-      PangoFontDescription *desc;
-      PangoContext *context;
-      PangoFont *font;
-      gboolean ret;
-      PangoLanguage **langs;
-
-      desc = pango_font_face_describe (face);
-      pango_font_description_set_size (desc, 20);
-
-      context = gtk_widget_get_pango_context (GTK_WIDGET (self));
-      font = pango_context_load_font (context, desc);
-
-      ret = FALSE;
-
-      langs = pango_font_get_languages (font);
-      if (langs)
-        {
-          for (int i = 0; langs[i]; i++)
-            {
-              if (langs[i] == self->filter_language)
-                {
-                  ret = TRUE;
-                  break;
-                }
-            }
-        }
-
-      g_object_unref (font);
-      pango_font_description_free (desc);
-
-      return ret;
-    }
-
-  return TRUE;
-}
-
-static void
-monospace_check_changed (GtkCheckButton       *check,
-                         GParamSpec           *pspec,
-                         GtkFontChooserWidget *self)
-{
-  self->filter_by_monospace = gtk_check_button_get_active (check);
-  gtk_filter_changed (GTK_FILTER (self->user_filter),
-                      self->filter_by_monospace ? GTK_FILTER_CHANGE_MORE_STRICT
-                                                : GTK_FILTER_CHANGE_LESS_STRICT);
 }
 
 static void
@@ -426,10 +375,7 @@ language_check_changed (GtkCheckButton       *check,
                         GParamSpec           *pspec,
                         GtkFontChooserWidget *self)
 {
-  self->filter_by_language = gtk_check_button_get_active (check);
-  gtk_filter_changed (GTK_FILTER (self->user_filter),
-                      self->filter_by_language ? GTK_FILTER_CHANGE_MORE_STRICT
-                                               : GTK_FILTER_CHANGE_LESS_STRICT);
+  update_filter_language (self);
 }
 
 static void
@@ -551,6 +497,7 @@ maybe_update_preview_text (GtkFontChooserWidget *self,
 {
   PangoContext *context;
   PangoFont *font;
+  PangoLanguage *filter_lang;
   const char *sample;
   PangoLanguage **languages;
   GHashTable *langs = NULL;
@@ -564,9 +511,10 @@ maybe_update_preview_text (GtkFontChooserWidget *self,
   if (self->preview_text_set)
     return;
 
-  if (self->filter_by_language && self->filter_language)
+  filter_lang = _gtk_font_filter_get_language (self->user_filter);
+  if (filter_lang != NULL)
     {
-      sample = pango_language_get_sample_string (self->filter_language);
+      sample = pango_language_get_sample_string (filter_lang);
       gtk_font_chooser_widget_set_preview_text (self, sample);
       return;
     }
@@ -840,15 +788,23 @@ gtk_font_chooser_widget_unmap (GtkWidget *widget)
 static void
 gtk_font_chooser_widget_root (GtkWidget *widget)
 {
+  GtkFontChooserWidget *self = GTK_FONT_CHOOSER_WIDGET (widget);
+
   GTK_WIDGET_CLASS (gtk_font_chooser_widget_parent_class)->root (widget);
 
   g_signal_connect_swapped (gtk_widget_get_root (widget), "notify::focus-widget",
                             G_CALLBACK (update_key_capture), widget);
+  _gtk_font_filter_set_pango_context (self->user_filter,
+                                      gtk_widget_get_pango_context (widget));
 }
 
 static void
 gtk_font_chooser_widget_unroot (GtkWidget *widget)
 {
+  GtkFontChooserWidget *self = GTK_FONT_CHOOSER_WIDGET (widget);
+
+  _gtk_font_filter_set_pango_context (self->user_filter,
+                                      gtk_widget_get_pango_context (widget));
   g_signal_handlers_disconnect_by_func (gtk_widget_get_root (widget),
                                         update_key_capture, widget);
 
@@ -880,6 +836,7 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
   GParamSpec *pspec;
 
   g_type_ensure (G_TYPE_THEMED_ICON);
+  g_type_ensure (GTK_TYPE_FONT_FILTER);
 
   widget_class->root = gtk_font_chooser_widget_root;
   widget_class->unroot = gtk_font_chooser_widget_unroot;
@@ -945,7 +902,6 @@ gtk_font_chooser_widget_class_init (GtkFontChooserWidgetClass *klass)
   gtk_widget_class_bind_template_callback (widget_class, output_cb);
   gtk_widget_class_bind_template_callback (widget_class, selection_changed_cb);
   gtk_widget_class_bind_template_callback (widget_class, resize_by_scroll_cb);
-  gtk_widget_class_bind_template_callback (widget_class, monospace_check_changed);
   gtk_widget_class_bind_template_callback (widget_class, language_check_changed);
 
   gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BIN_LAYOUT);
@@ -1212,17 +1168,7 @@ language_selection_changed (GtkSelectionModel    *model,
                             guint                 n_items,
                             GtkFontChooserWidget *self)
 {
-  gpointer obj;
-
-  obj = gtk_single_selection_get_selected_item (GTK_SINGLE_SELECTION (model));
-
-  if (obj)
-    self->filter_language = pango_language_from_string (gtk_string_object_get_string (obj));
-  else
-    self->filter_language = NULL;
-
-  if (self->filter_by_language)
-    gtk_filter_changed (GTK_FILTER (self->user_filter), GTK_FILTER_CHANGE_DIFFERENT);
+  update_filter_language (self);
 }
 
 static gboolean
@@ -1293,8 +1239,6 @@ gtk_font_chooser_widget_init (GtkFontChooserWidget *self)
 
   gtk_font_chooser_widget_take_font_desc (self, NULL);
 
-  gtk_custom_filter_set_filter_func (self->user_filter, user_filter_cb, self, NULL);
-
   setup_language_list (self);
 }
 

gtk/gtkfontfilter.c

@@ -0,0 +1,272 @@
+/* GTK - The GIMP Toolkit
+ * gtkfontfilter.c:
+ * Copyright (C) 2024 Niels De Graef <nielsdegraef@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "config.h"
+
+#include <stdlib.h>
+#include <glib/gprintf.h>
+#include <string.h>
+
+#include "gtkfontfilterprivate.h"
+#include "gtkprivate.h"
+
+struct _GtkFontFilter
+{
+  GtkFilter parent_instance;
+
+  PangoContext *pango_context;
+
+  gboolean monospace;
+  PangoLanguage *language;
+};
+
+enum {
+  PROP_0,
+  PROP_PANGO_CONTEXT,
+  PROP_MONOSPACE,
+  PROP_LANGUAGE,
+  N_PROPS
+};
+static GParamSpec *properties[N_PROPS] = { NULL, };
+
+G_DEFINE_TYPE (GtkFontFilter, gtk_font_filter, GTK_TYPE_FILTER)
+
+static void
+gtk_font_filter_set_property (GObject         *object,
+                              guint            prop_id,
+                              const GValue    *value,
+                              GParamSpec      *pspec)
+{
+  GtkFontFilter *self = GTK_FONT_FILTER (object);
+
+  switch (prop_id)
+    {
+    case PROP_PANGO_CONTEXT:
+      _gtk_font_filter_set_pango_context (self, g_value_get_object (value));
+      break;
+    case PROP_MONOSPACE:
+      _gtk_font_filter_set_monospace (self, g_value_get_boolean (value));
+      break;
+    case PROP_LANGUAGE:
+      _gtk_font_filter_set_language (self, g_value_get_boxed (value));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static void
+gtk_font_filter_get_property (GObject         *object,
+                              guint            prop_id,
+                              GValue          *value,
+                              GParamSpec      *pspec)
+{
+  GtkFontFilter *self = GTK_FONT_FILTER (object);
+
+  switch (prop_id)
+    {
+    case PROP_PANGO_CONTEXT:
+      g_value_set_object (value, self->pango_context);
+      break;
+    case PROP_MONOSPACE:
+      g_value_set_boolean (value, _gtk_font_filter_get_monospace (self));
+      break;
+    case PROP_LANGUAGE:
+      g_value_set_boxed (value, _gtk_font_filter_get_language (self));
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+    }
+}
+
+static gboolean
+gtk_font_filter_match (GtkFilter *filter,
+                       gpointer   item)
+{
+  GtkFontFilter *self = GTK_FONT_FILTER (filter);
+  PangoFontFamily *family;
+  PangoFontFace *face;
+
+  if (PANGO_IS_FONT_FAMILY (item))
+    {
+      family = item;
+      face = pango_font_family_get_face (family, NULL);
+    }
+  else
+    {
+      face = PANGO_FONT_FACE (item);
+      family = pango_font_face_get_family (face);
+    }
+
+  if (self->monospace &&
+      !pango_font_family_is_monospace (family))
+    return FALSE;
+
+  if (self->language)
+    {
+      PangoFontDescription *desc;
+      PangoFont *font;
+      PangoLanguage **langs;
+      gboolean ret = FALSE;
+
+      desc = pango_font_face_describe (face);
+      pango_font_description_set_size (desc, 20);
+
+      font = pango_context_load_font (self->pango_context, desc);
+
+      langs = pango_font_get_languages (font);
+      if (langs)
+        {
+          for (int i = 0; langs[i]; i++)
+            {
+              if (langs[i] == self->language)
+                {
+                  ret = TRUE;
+                  break;
+                }
+            }
+        }
+
+      g_object_unref (font);
+      pango_font_description_free (desc);
+
+      return ret;
+    }
+
+  return TRUE;
+}
+
+static GtkFilterMatch
+gtk_font_filter_get_strictness (GtkFilter *filter)
+{
+  GtkFontFilter *self = GTK_FONT_FILTER (filter);
+
+  if (!self->monospace && self->language == NULL)
+    return GTK_FILTER_MATCH_ALL;
+
+  return GTK_FILTER_MATCH_SOME;
+}
+
+static void
+gtk_font_filter_class_init (GtkFontFilterClass *klass)
+{
+  GObjectClass *gobject_class = G_OBJECT_CLASS (klass);
+  GtkFilterClass *filter_class = GTK_FILTER_CLASS (klass);
+
+  filter_class->match = gtk_font_filter_match;
+  filter_class->get_strictness = gtk_font_filter_get_strictness;
+
+  gobject_class->set_property = gtk_font_filter_set_property;
+  gobject_class->get_property = gtk_font_filter_get_property;
+
+  properties[PROP_PANGO_CONTEXT] =
+    g_param_spec_object ("pango-context", NULL, NULL,
+                         PANGO_TYPE_CONTEXT,
+                         GTK_PARAM_READWRITE);
+  properties[PROP_MONOSPACE] =
+    g_param_spec_boolean ("monospace", NULL, NULL,
+                          FALSE,
+                          GTK_PARAM_READWRITE);
+  properties[PROP_LANGUAGE] =
+    g_param_spec_boxed ("language", NULL, NULL,
+                        PANGO_TYPE_LANGUAGE,
+                        GTK_PARAM_READWRITE);
+
+  g_object_class_install_properties (gobject_class, N_PROPS, properties);
+}
+
+static void
+gtk_font_filter_init (GtkFontFilter *self)
+{
+}
+
+void
+_gtk_font_filter_set_pango_context (GtkFontFilter *self,
+                                    PangoContext  *context)
+{
+  g_return_if_fail (GTK_IS_FONT_FILTER (self));
+  g_return_if_fail (PANGO_IS_CONTEXT (context));
+
+  if (self->pango_context == context)
+    return;
+
+  self->pango_context = context;
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_PANGO_CONTEXT]);
+}
+
+gboolean
+_gtk_font_filter_get_monospace (GtkFontFilter *self)
+{
+  g_return_val_if_fail (GTK_IS_FONT_FILTER (self), FALSE);
+
+  return self->monospace;
+}
+
+void
+_gtk_font_filter_set_monospace (GtkFontFilter *self,
+                                gboolean       monospace)
+{
+  g_return_if_fail (GTK_IS_FONT_FILTER (self));
+
+  if (self->monospace == monospace)
+    return;
+
+  self->monospace = monospace;
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_MONOSPACE]);
+  gtk_filter_changed (GTK_FILTER (self),
+                      monospace ? GTK_FILTER_CHANGE_MORE_STRICT
+                                : GTK_FILTER_CHANGE_LESS_STRICT);
+}
+
+PangoLanguage *
+_gtk_font_filter_get_language (GtkFontFilter *self)
+{
+  g_return_val_if_fail (GTK_IS_FONT_FILTER (self), NULL);
+
+  return self->language;
+}
+
+void
+_gtk_font_filter_set_language (GtkFontFilter *self,
+                               PangoLanguage *lang)
+{
+  GtkFilterChange filter_change = GTK_FILTER_CHANGE_DIFFERENT;
+
+  g_return_if_fail (GTK_IS_FONT_FILTER (self));
+
+  if (self->language == lang)
+    return;
+
+  if (lang == NULL || self->language == NULL)
+    {
+      filter_change = (lang != NULL) ? GTK_FILTER_CHANGE_MORE_STRICT
+                                     : GTK_FILTER_CHANGE_LESS_STRICT;
+    }
+
+  self->language = lang;
+  g_object_notify_by_pspec (G_OBJECT (self), properties[PROP_LANGUAGE]);
+  gtk_filter_changed (GTK_FILTER (self), filter_change);
+}
+
+GtkFilter *
+_gtk_font_filter_new (void)
+{
+  return g_object_new (GTK_TYPE_FONT_FILTER, NULL);
+}

gtk/gtkfontfilterprivate.h

@@ -0,0 +1,46 @@
+/* GTK - The GIMP Toolkit
+ * gtkfontfilterprivate.h:
+ * Copyright (C) 2024 Niels De Graef <nielsdegraef@gmail.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#pragma once
+
+#include <gtk/gtkfilter.h>
+
+G_BEGIN_DECLS
+
+#define GTK_TYPE_FONT_FILTER (gtk_font_filter_get_type ())
+G_DECLARE_FINAL_TYPE (GtkFontFilter, gtk_font_filter,
+                      GTK, FONT_FILTER,
+                      GtkFilter)
+
+GtkFilter *        _gtk_font_filter_new                    (void);
+
+void               _gtk_font_filter_set_pango_context      (GtkFontFilter *self,
+                                                            PangoContext  *context);
+
+gboolean           _gtk_font_filter_get_monospace          (GtkFontFilter *self);
+
+void               _gtk_font_filter_set_monospace          (GtkFontFilter *self,
+                                                            gboolean       monospace);
+
+PangoLanguage *    _gtk_font_filter_get_language           (GtkFontFilter *self);
+
+void               _gtk_font_filter_set_language           (GtkFontFilter *self,
+                                                            PangoLanguage *language);
+
+G_END_DECLS
+

gtk/gtkiconhelper.c

@@ -456,7 +456,7 @@ gtk_icon_helper_get_size (GtkIconHelper *self)
     return self->pixel_size;
 
   style = gtk_css_node_get_style (self->node);
-  return _gtk_css_number_value_get (style->icon->icon_size, 100);
+  return gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 void

gtk/gtklabel.c

@@ -839,7 +839,8 @@ gtk_label_update_layout_attributes (GtkLabel      *self,
               g_slist_free (attributes);
             }
 
-          link_color = gtk_css_color_value_get_rgba (style->core->color);
+          link_color = gtk_css_color_value_get_rgba (style->used->color);
+
           attr = pango_attr_foreground_new (link_color->red * 65535,
                                             link_color->green * 65535,
                                             link_color->blue * 65535);

gtk/gtkmain.c

@@ -200,6 +200,7 @@ static const GdkDebugKey gtk_debug_keys[] = {
   { "accessibility", GTK_DEBUG_A11Y, "Information about accessibility state changes" },
   { "iconfallback", GTK_DEBUG_ICONFALLBACK, "Information about icon fallback" },
   { "invert-text-dir", GTK_DEBUG_INVERT_TEXT_DIR, "Invert the default text direction" },
+  { "css", GTK_DEBUG_CSS, "Information about deprecated CSS features" },
 };
 
 /* This checks to see if the process is running suid or sgid

gtk/gtknative.c

@@ -341,15 +341,11 @@ subtract_decoration_corners_from_region (cairo_region_t        *region,
 }
 
 static int
-get_translucent_border_edge (const GtkCssValue *color,
-                             const GtkCssValue *border_color,
-                             const GtkCssValue *border_width)
+get_translucent_border_edge (GtkCssValue *border_color,
+                             GtkCssValue *border_width)
 {
-  if (border_color == NULL)
-    border_color = color;
-
   if (!gdk_rgba_is_opaque (gtk_css_color_value_get_rgba (border_color)))
-    return round (_gtk_css_number_value_get (border_width, 100));
+    return round (gtk_css_number_value_get (border_width, 100));
 
   return 0;
 }
@@ -361,29 +357,36 @@ get_translucent_border_width (GtkWidget *widget,
   GtkCssNode *css_node = gtk_widget_get_css_node (widget);
   GtkCssStyle *style = gtk_css_node_get_style (css_node);
 
-  border->top = get_translucent_border_edge (style->core->color,
-                                             style->border->border_top_color,
+  border->top = get_translucent_border_edge (style->used->border_top_color,
                                              style->border->border_top_width);
-  border->bottom = get_translucent_border_edge (style->core->color,
-                                                style->border->border_bottom_color,
+  border->bottom = get_translucent_border_edge (style->used->border_bottom_color,
                                                 style->border->border_bottom_width);
-  border->left = get_translucent_border_edge (style->core->color,
-                                              style->border->border_left_color,
+  border->left = get_translucent_border_edge (style->used->border_left_color,
                                               style->border->border_left_width);
-  border->right = get_translucent_border_edge (style->core->color,
-                                               style->border->border_right_color,
+  border->right = get_translucent_border_edge (style->used->border_right_color,
                                                style->border->border_right_width);
 }
 
 static gboolean
 get_opaque_rect (GtkWidget             *widget,
-                 const GtkCssStyle     *style,
                  cairo_rectangle_int_t *rect)
 {
-  gboolean is_opaque = gdk_rgba_is_opaque (gtk_css_color_value_get_rgba (style->background->background_color));
+  gboolean is_opaque;
 
-  if (is_opaque && gtk_widget_get_opacity (widget) < 1.0)
+  if (gtk_widget_get_opacity (widget) < 1)
     is_opaque = FALSE;
+  else
+    {
+      GtkCssNode *node;
+      GtkCssStyle *style;
+      const GdkRGBA *color;
+
+      node = gtk_widget_get_css_node (widget);
+      style = gtk_css_node_get_style (node);
+
+      color = gtk_css_color_value_get_rgba (style->used->background_color);
+      is_opaque = gdk_rgba_is_opaque (color);
+    }
 
   if (is_opaque)
     {
@@ -429,8 +432,6 @@ gtk_native_update_opaque_region (GtkNative  *native,
 {
   cairo_rectangle_int_t rect;
   cairo_region_t *opaque_region = NULL;
-  const GtkCssStyle *style;
-  GtkCssNode *css_node;
   GdkSurface *surface;
   GtkBorder shadow;
 
@@ -444,17 +445,14 @@ gtk_native_update_opaque_region (GtkNative  *native,
       !_gtk_widget_get_realized (contents))
     return;
 
-  css_node = gtk_widget_get_css_node (contents);
-
   if (subtract_shadow)
     get_shadow_width (contents, &shadow, resize_handle_size);
   else
     shadow = (GtkBorder) {0, 0, 0, 0};
 
   surface = gtk_native_get_surface (native);
-  style = gtk_css_node_get_style (css_node);
 
-  if (get_opaque_rect (contents, style, &rect))
+  if (get_opaque_rect (contents, &rect))
     {
       double native_x, native_y;
 
@@ -476,7 +474,12 @@ gtk_native_update_opaque_region (GtkNative  *native,
       opaque_region = cairo_region_create_rectangle (&rect);
 
       if (subtract_decoration_corners)
-        subtract_decoration_corners_from_region (opaque_region, &rect, style);
+        {
+          GtkCssStyle *style;
+
+          style = gtk_css_node_get_style (gtk_widget_get_css_node (contents));
+          subtract_decoration_corners_from_region (opaque_region, &rect, style);
+        }
     }
 
   gdk_surface_set_opaque_region (surface, opaque_region);

gtk/gtkpicture.c

@@ -215,7 +215,7 @@ gtk_picture_measure (GtkWidget      *widget,
     }
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  default_size = _gtk_css_number_value_get (style->icon->icon_size, 100);
+  default_size = gtk_css_number_value_get (style->icon->icon_size, 100);
 
   if (self->can_shrink)
     {

gtk/gtkpopover.c

@@ -1246,9 +1246,9 @@ gtk_popover_get_gap_coords (GtkPopover *popover,
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (priv->contents_widget));
   border_radius = round (get_border_radius (widget));
-  border_top = _gtk_css_number_value_get (style->border->border_top_width, 100);
-  border_right = _gtk_css_number_value_get (style->border->border_right_width, 100);
-  border_bottom = _gtk_css_number_value_get (style->border->border_bottom_width, 100);
+  border_top = gtk_css_number_value_get (style->border->border_top_width, 100);
+  border_right = gtk_css_number_value_get (style->border->border_right_width, 100);
+  border_bottom = gtk_css_number_value_get (style->border->border_bottom_width, 100);
 
   gtk_css_shadow_value_get_extents (style->background->box_shadow, &shadow_width);
 
@@ -1327,10 +1327,10 @@ get_border (GtkCssNode *node,
 
   style = gtk_css_node_get_style (node);
 
-  border->top = _gtk_css_number_value_get (style->border->border_top_width, 100);
-  border->right = _gtk_css_number_value_get (style->border->border_right_width, 100);
-  border->bottom = _gtk_css_number_value_get (style->border->border_bottom_width, 100);
-  border->left = _gtk_css_number_value_get (style->border->border_left_width, 100);
+  border->top = gtk_css_number_value_get (style->border->border_top_width, 100);
+  border->right = gtk_css_number_value_get (style->border->border_right_width, 100);
+  border->bottom = gtk_css_number_value_get (style->border->border_bottom_width, 100);
+  border->left = gtk_css_number_value_get (style->border->border_left_width, 100);
 }
 
 static void
@@ -1627,7 +1627,7 @@ create_arrow_render_node (GtkPopover *popover)
     {
       const GdkRGBA *border_color;
 
-      border_color = gtk_css_color_value_get_rgba (style->border->border_left_color ? style->border->border_left_color : style->core->color);
+      border_color = gtk_css_color_value_get_rgba (style->used->border_left_color);
 
       gtk_popover_apply_tail_path (popover, cr);
       gdk_cairo_set_source_rgba (cr, border_color);

gtk/gtkrenderbackground.c

@@ -49,10 +49,11 @@ gtk_theming_background_snapshot_color (GtkCssBoxes       *boxes,
                                        const GdkRGBA     *bg_color,
                                        guint              n_bg_values)
 {
+  GtkCssStyle *style = boxes->style;
   const GskRoundedRect *box;
   GtkCssArea clip;
 
-  clip = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (boxes->style->background->background_clip, n_bg_values - 1));
+  clip = _gtk_css_area_value_get (_gtk_css_array_value_get_nth (style->background->background_clip, n_bg_values - 1));
   box = gtk_css_boxes_get_box (boxes, clip);
 
   if (gsk_rounded_rect_is_rectilinear (box))
@@ -76,7 +77,7 @@ gtk_theming_background_snapshot_layer (GtkCssBoxes *bg,
                                        guint        idx,
                                        GtkSnapshot *snapshot)
 {
-  GtkCssBackgroundValues *background = bg->style->background;
+  GtkCssStyle *style = bg->style;
   GtkCssRepeatStyle hrepeat, vrepeat;
   const GtkCssValue *pos, *repeat;
   GtkCssImage *image;
@@ -85,17 +86,17 @@ gtk_theming_background_snapshot_layer (GtkCssBoxes *bg,
   double width, height;
   double x, y;
 
-  image = _gtk_css_image_value_get_image (_gtk_css_array_value_get_nth (background->background_image, idx));
+  image = _gtk_css_image_value_get_image (_gtk_css_array_value_get_nth (style->used->background_image, idx));
 
   if (image == NULL)
     return;
 
-  pos = _gtk_css_array_value_get_nth (background->background_position, idx);
-  repeat = _gtk_css_array_value_get_nth (background->background_repeat, idx);
+  pos = _gtk_css_array_value_get_nth (style->background->background_position, idx);
+  repeat = _gtk_css_array_value_get_nth (style->background->background_repeat, idx);
 
   origin = gtk_css_boxes_get_box (bg,
                                   _gtk_css_area_value_get (
-                                      _gtk_css_array_value_get_nth (background->background_origin, idx)));
+                                      _gtk_css_array_value_get_nth (style->background->background_origin, idx)));
 
   width = origin->bounds.size.width;
   height = origin->bounds.size.height;
@@ -105,9 +106,9 @@ gtk_theming_background_snapshot_layer (GtkCssBoxes *bg,
 
   clip = gtk_css_boxes_get_box (bg,
                                 _gtk_css_area_value_get (
-                                    _gtk_css_array_value_get_nth (background->background_clip, idx)));
+                                    _gtk_css_array_value_get_nth (style->background->background_clip, idx)));
 
-  _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (background->background_size, idx),
+  _gtk_css_bg_size_value_compute_size (_gtk_css_array_value_get_nth (style->background->background_size, idx),
                                        image,
                                        width,
                                        height,
@@ -245,7 +246,7 @@ void
 gtk_css_style_snapshot_background (GtkCssBoxes *boxes,
                                    GtkSnapshot *snapshot)
 {
-  const GtkCssBackgroundValues *background = boxes->style->background;
+  GtkCssStyle *style = boxes->style;
   GtkCssValue *background_image;
   const GdkRGBA *bg_color;
   const GtkCssValue *box_shadow;
@@ -255,12 +256,12 @@ gtk_css_style_snapshot_background (GtkCssBoxes *boxes,
   int idx;
   guint number_of_layers;
 
-  if (background->base.type == GTK_CSS_BACKGROUND_INITIAL_VALUES)
+  if (style->background->base.type == GTK_CSS_BACKGROUND_INITIAL_VALUES)
     return;
 
-  background_image = background->background_image;
-  bg_color = gtk_css_color_value_get_rgba (background->background_color);
-  box_shadow = background->box_shadow;
+  background_image = style->used->background_image;
+  bg_color = gtk_css_color_value_get_rgba (style->used->background_color);
+  box_shadow = style->used->box_shadow;
 
   has_bg_color = !gdk_rgba_is_clear (bg_color);
   has_bg_image = _gtk_css_image_value_get_image (_gtk_css_array_value_get_nth (background_image, 0)) != NULL;
@@ -281,7 +282,7 @@ gtk_css_style_snapshot_background (GtkCssBoxes *boxes,
 
   if (has_bg_image)
     {
-      GtkCssValue *blend_modes = background->background_blend_mode;
+      GtkCssValue *blend_modes = style->background->background_blend_mode;
       GskBlendMode *blend_mode_values = g_alloca (sizeof (GskBlendMode) * number_of_layers);
 
       for (idx = number_of_layers - 1; idx >= 0; idx--)

gtk/gtkrenderborder.c

@@ -83,13 +83,13 @@ gtk_border_image_compute_border_size (GtkBorderImageSliceSize  sizes[3],
   double start, end;
 
   if (gtk_css_number_value_get_dimension (start_border) == GTK_CSS_DIMENSION_NUMBER)
-    start = start_border_width * _gtk_css_number_value_get (start_border, 100);
+    start = start_border_width * gtk_css_number_value_get (start_border, 100);
   else
-    start = _gtk_css_number_value_get (start_border, area_size);
+    start = gtk_css_number_value_get (start_border, area_size);
   if (gtk_css_number_value_get_dimension (end_border) == GTK_CSS_DIMENSION_NUMBER)
-    end = end_border_width * _gtk_css_number_value_get (end_border, 100);
+    end = end_border_width * gtk_css_number_value_get (end_border, 100);
   else
-    end = _gtk_css_number_value_get (end_border, area_size);
+    end = gtk_css_number_value_get (end_border, area_size);
 
   /* XXX: reduce vertical and horizontal by the same factor */
   if (start + end > area_size)
@@ -271,12 +271,12 @@ gtk_border_image_render (GtkBorderImage        *image,
 
   gtk_border_image_compute_slice_size (horizontal_slice,
                                        source_width, 
-                                       _gtk_css_number_value_get (_gtk_css_border_value_get_left (image->slice), source_width),
-                                       _gtk_css_number_value_get (_gtk_css_border_value_get_right (image->slice), source_width));
+                                       gtk_css_number_value_get (_gtk_css_border_value_get_left (image->slice), source_width),
+                                       gtk_css_number_value_get (_gtk_css_border_value_get_right (image->slice), source_width));
   gtk_border_image_compute_slice_size (vertical_slice,
                                        source_height, 
-                                       _gtk_css_number_value_get (_gtk_css_border_value_get_top (image->slice), source_height),
-                                       _gtk_css_number_value_get (_gtk_css_border_value_get_bottom (image->slice), source_height));
+                                       gtk_css_number_value_get (_gtk_css_border_value_get_top (image->slice), source_height),
+                                       gtk_css_number_value_get (_gtk_css_border_value_get_bottom (image->slice), source_height));
   gtk_border_image_compute_border_size (horizontal_border,
                                         rect->origin.x,
                                         rect->size.width,
@@ -569,7 +569,7 @@ snapshot_border (GtkSnapshot          *snapshot,
                 else
                   dont_draw |= (1 << j);
               }
-            
+
             snapshot_frame_stroke (snapshot, border_box, border_width, colors, dont_draw, border_style[i]);
           }
           break;
@@ -647,22 +647,22 @@ void
 gtk_css_style_snapshot_border (GtkCssBoxes *boxes,
                                GtkSnapshot *snapshot)
 {
-  const GtkCssBorderValues *border = boxes->style->border;
+  GtkCssStyle *style = boxes->style;
   GtkBorderImage border_image;
   float border_width[4];
 
-  if (border->base.type == GTK_CSS_BORDER_INITIAL_VALUES)
+  if (style->border->base.type == GTK_CSS_BORDER_INITIAL_VALUES)
     return;
 
-  if (gtk_border_image_init (&border_image, boxes->style))
+  if (gtk_border_image_init (&border_image, style))
     {
       cairo_t *cr;
       const graphene_rect_t *bounds;
 
-      border_width[0] = _gtk_css_number_value_get (border->border_top_width, 100);
-      border_width[1] = _gtk_css_number_value_get (border->border_right_width, 100);
-      border_width[2] = _gtk_css_number_value_get (border->border_bottom_width, 100);
-      border_width[3] = _gtk_css_number_value_get (border->border_left_width, 100);
+      border_width[0] = gtk_css_number_value_get (style->border->border_top_width, 100);
+      border_width[1] = gtk_css_number_value_get (style->border->border_right_width, 100);
+      border_width[2] = gtk_css_number_value_get (style->border->border_bottom_width, 100);
+      border_width[3] = gtk_css_number_value_get (style->border->border_left_width, 100);
 
       bounds = gtk_css_boxes_get_border_rect (boxes);
 
@@ -683,24 +683,24 @@ gtk_css_style_snapshot_border (GtkCssBoxes *boxes,
                           gtk_css_boxes_get_padding_rect (boxes)))
         return;
 
-      colors[0] = *gtk_css_color_value_get_rgba (border->border_top_color ? border->border_top_color : boxes->style->core->color);
-      colors[1] = *gtk_css_color_value_get_rgba (border->border_right_color ? border->border_right_color : boxes->style->core->color);
-      colors[2] = *gtk_css_color_value_get_rgba (border->border_bottom_color ? border->border_bottom_color : boxes->style->core->color);
-      colors[3] = *gtk_css_color_value_get_rgba (border->border_left_color ? border->border_left_color : boxes->style->core->color);
+      colors[0] = *gtk_css_color_value_get_rgba (style->used->border_top_color);
+      colors[1] = *gtk_css_color_value_get_rgba (style->used->border_right_color);
+      colors[2] = *gtk_css_color_value_get_rgba (style->used->border_bottom_color);
+      colors[3] = *gtk_css_color_value_get_rgba (style->used->border_left_color);
 
       alpha_test_vector = graphene_simd4f_init (colors[0].alpha, colors[1].alpha, colors[2].alpha, colors[3].alpha);
       if (graphene_simd4f_is_zero4 (alpha_test_vector))
         return;
 
-      border_style[0] = _gtk_css_border_style_value_get (border->border_top_style);
-      border_style[1] = _gtk_css_border_style_value_get (border->border_right_style);
-      border_style[2] = _gtk_css_border_style_value_get (border->border_bottom_style);
-      border_style[3] = _gtk_css_border_style_value_get (border->border_left_style);
+      border_style[0] = _gtk_css_border_style_value_get (style->border->border_top_style);
+      border_style[1] = _gtk_css_border_style_value_get (style->border->border_right_style);
+      border_style[2] = _gtk_css_border_style_value_get (style->border->border_bottom_style);
+      border_style[3] = _gtk_css_border_style_value_get (style->border->border_left_style);
 
-      border_width[0] = _gtk_css_number_value_get (border->border_top_width, 100);
-      border_width[1] = _gtk_css_number_value_get (border->border_right_width, 100);
-      border_width[2] = _gtk_css_number_value_get (border->border_bottom_width, 100);
-      border_width[3] = _gtk_css_number_value_get (border->border_left_width, 100);
+      border_width[0] = gtk_css_number_value_get (style->border->border_top_width, 100);
+      border_width[1] = gtk_css_number_value_get (style->border->border_right_width, 100);
+      border_width[2] = gtk_css_number_value_get (style->border->border_bottom_width, 100);
+      border_width[3] = gtk_css_number_value_get (style->border->border_left_width, 100);
 
       gtk_snapshot_push_debug (snapshot, "CSS border");
       if (border_style[0] <= GTK_BORDER_STYLE_SOLID &&
@@ -730,21 +730,22 @@ void
 gtk_css_style_snapshot_outline (GtkCssBoxes *boxes,
                                 GtkSnapshot *snapshot)
 {
-  GtkCssOutlineValues *outline = boxes->style->outline;
+  GtkCssStyle *style = boxes->style;
   GtkBorderStyle border_style[4];
   float border_width[4];
   GdkRGBA colors[4];
 
-  border_style[0] = _gtk_css_border_style_value_get (outline->outline_style);
+  border_style[0] = _gtk_css_border_style_value_get (style->outline->outline_style);
   if (border_style[0] != GTK_BORDER_STYLE_NONE)
     {
-      const GdkRGBA *color = gtk_css_color_value_get_rgba (outline->outline_color ?
-                                                           outline->outline_color :
-                                                           boxes->style->core->color);
+      const GdkRGBA *color;
+
+      color = gtk_css_color_value_get_rgba (style->used->outline_color);
+
       if (gdk_rgba_is_clear (color))
         return;
 
-      border_width[0] = _gtk_css_number_value_get (outline->outline_width, 100);
+      border_width[0] = gtk_css_number_value_get (style->outline->outline_width, 100);
 
       if (G_APPROX_VALUE (border_width[0], 0, FLT_EPSILON))
         return;

gtk/gtkrendericon.c

@@ -35,22 +35,22 @@
 #include <math.h>
 
 void
-gtk_css_style_snapshot_icon (GtkCssStyle            *style,
-                             GtkSnapshot            *snapshot,
-                             double                  width,
-                             double                  height)
+gtk_css_style_snapshot_icon (GtkCssStyle *style,
+                             GtkSnapshot *snapshot,
+                             double       width,
+                             double       height)
 {
   GskTransform *transform;
   GtkCssImage *image;
   gboolean has_shadow;
 
-  g_return_if_fail (GTK_IS_CSS_STYLE (style));
+  g_return_if_fail (style != NULL);
   g_return_if_fail (snapshot != NULL);
 
   if (width == 0.0 || height == 0.0)
     return;
 
-  image = _gtk_css_image_value_get_image (style->other->icon_source);
+  image = _gtk_css_image_value_get_image (style->used->icon_source);
   if (image == NULL)
     return;
 
@@ -60,7 +60,7 @@ gtk_css_style_snapshot_icon (GtkCssStyle            *style,
 
   gtk_css_filter_value_push_snapshot (style->other->icon_filter, snapshot);
 
-  has_shadow = gtk_css_shadow_value_push_snapshot (style->icon->icon_shadow, snapshot);
+  has_shadow = gtk_css_shadow_value_push_snapshot (style->used->icon_shadow, snapshot);
 
   if (transform == NULL)
     {
@@ -102,7 +102,7 @@ gtk_css_style_snapshot_icon_paintable (GtkCssStyle  *style,
   gboolean is_symbolic_paintable;
   GdkRGBA colors[4];
 
-  g_return_if_fail (GTK_IS_CSS_STYLE (style));
+  g_return_if_fail (style != NULL);
   g_return_if_fail (snapshot != NULL);
   g_return_if_fail (GDK_IS_PAINTABLE (paintable));
   g_return_if_fail (width > 0);
@@ -112,7 +112,7 @@ gtk_css_style_snapshot_icon_paintable (GtkCssStyle  *style,
 
   gtk_css_filter_value_push_snapshot (style->other->icon_filter, snapshot);
 
-  has_shadow = gtk_css_shadow_value_push_snapshot (style->icon->icon_shadow, snapshot);
+  has_shadow = gtk_css_shadow_value_push_snapshot (style->used->icon_shadow, snapshot);
 
   is_symbolic_paintable = GTK_IS_SYMBOLIC_PAINTABLE (paintable);
   if (is_symbolic_paintable)

gtk/gtkrenderlayout.c

@@ -47,8 +47,9 @@ gtk_css_style_snapshot_layout (GtkCssBoxes *boxes,
     }
 
   style = boxes->style;
-  color = gtk_css_color_value_get_rgba (style->core->color);
-  has_shadow = gtk_css_shadow_value_push_snapshot (style->font->text_shadow, snapshot);
+  color = gtk_css_color_value_get_rgba (style->used->color);
+
+  has_shadow = gtk_css_shadow_value_push_snapshot (style->used->text_shadow, snapshot);
 
   gtk_snapshot_append_layout (snapshot, layout, color);
 
@@ -187,12 +188,12 @@ snapshot_insertion_cursor (GtkSnapshot     *snapshot,
                            PangoDirection   direction,
                            gboolean         draw_arrow)
 {
-  GdkRGBA color;
+  const GdkRGBA *color;
 
   if (is_primary)
-    color = *gtk_css_color_value_get_rgba (style->font->caret_color ? style->font->caret_color : style->core->color);
+    color = gtk_css_color_value_get_rgba (style->used->caret_color);
   else
-    color = *gtk_css_color_value_get_rgba (style->font->secondary_caret_color ? style->font->secondary_caret_color : style->core->color);
+    color = gtk_css_color_value_get_rgba (style->used->secondary_caret_color);
 
   if (width != 0 || draw_arrow)
     {
@@ -202,7 +203,7 @@ snapshot_insertion_cursor (GtkSnapshot     *snapshot,
       get_insertion_cursor_bounds (width, height, aspect_ratio, direction, draw_arrow, &bounds);
       cr = gtk_snapshot_append_cairo (snapshot, &bounds);
 
-      draw_insertion_cursor (cr, 0, 0, width, height, aspect_ratio, &color, direction, draw_arrow);
+      draw_insertion_cursor (cr, 0, 0, width, height, aspect_ratio, color, direction, draw_arrow);
 
       cairo_destroy (cr);
     }
@@ -220,7 +221,7 @@ snapshot_insertion_cursor (GtkSnapshot     *snapshot,
         offset = stem_width - stem_width / 2;
 
       gtk_snapshot_append_color (snapshot,
-                                 &color,
+                                 color,
                                  &GRAPHENE_RECT_INIT (- offset, 0, stem_width, height));
     }
 }

gtk/gtksizerequest.c

@@ -84,7 +84,7 @@ fetch_request_mode (GtkWidget *widget)
 static int
 get_number (GtkCssValue *value)
 {
-  double d = _gtk_css_number_value_get (value, 100);
+  double d = gtk_css_number_value_get (value, 100);
 
   if (d < 1)
     return ceil (d);
@@ -96,7 +96,7 @@ get_number (GtkCssValue *value)
 static int
 get_number_ceil (GtkCssValue *value)
 {
-  return ceil (_gtk_css_number_value_get (value, 100));
+  return ceil (gtk_css_number_value_get (value, 100));
 }
 
 static void

gtk/gtkspinner.c

@@ -64,6 +64,8 @@ typedef struct _GtkSpinnerClass GtkSpinnerClass;
 struct _GtkSpinner
 {
   GtkWidget parent;
+
+  guint spinning : 1;
 };
 
 struct _GtkSpinnerClass
@@ -81,6 +83,17 @@ G_DEFINE_TYPE (GtkSpinner, gtk_spinner, GTK_TYPE_WIDGET)
 
 #define DEFAULT_SIZE 16
 
+static void
+update_state_flags (GtkSpinner *spinner)
+{
+  if (spinner->spinning && gtk_widget_get_mapped (GTK_WIDGET (spinner)))
+    gtk_widget_set_state_flags (GTK_WIDGET (spinner),
+                                GTK_STATE_FLAG_CHECKED, FALSE);
+  else
+    gtk_widget_unset_state_flags (GTK_WIDGET (spinner),
+                                  GTK_STATE_FLAG_CHECKED);
+}
+
 static void
 gtk_spinner_measure (GtkWidget      *widget,
                      GtkOrientation  orientation,
@@ -93,7 +106,7 @@ gtk_spinner_measure (GtkWidget      *widget,
   GtkCssStyle *style;
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
+  *minimum = *natural = gtk_css_number_value_get (style->icon->icon_size, 100);
 }
 
 static void
@@ -108,6 +121,26 @@ gtk_spinner_snapshot (GtkWidget   *widget,
                                gtk_widget_get_height (widget));
 }
 
+static void
+gtk_spinner_map (GtkWidget *widget)
+{
+  GtkSpinner *spinner = GTK_SPINNER (widget);
+
+  GTK_WIDGET_CLASS (gtk_spinner_parent_class)->map (widget);
+
+  update_state_flags (spinner);
+}
+
+static void
+gtk_spinner_unmap (GtkWidget *widget)
+{
+  GtkSpinner *spinner = GTK_SPINNER (widget);
+
+  GTK_WIDGET_CLASS (gtk_spinner_parent_class)->unmap (widget);
+
+  update_state_flags (spinner);
+}
+
 static void
 gtk_spinner_css_changed (GtkWidget         *widget,
                          GtkCssStyleChange *change)
@@ -139,7 +172,7 @@ gtk_spinner_get_spinning (GtkSpinner *spinner)
 {
   g_return_val_if_fail (GTK_IS_SPINNER (spinner), FALSE);
 
-  return (gtk_widget_get_state_flags ((GtkWidget *)spinner) & GTK_STATE_FLAG_CHECKED) > 0;
+  return spinner->spinning;
 }
 
 /**
@@ -157,17 +190,14 @@ gtk_spinner_set_spinning (GtkSpinner *spinner,
 
   spinning = !!spinning;
 
-  if (spinning != gtk_spinner_get_spinning (spinner))
-    {
-      g_object_notify (G_OBJECT (spinner), "spinning");
+  if (spinning == spinner->spinning)
+    return;
 
-      if (spinning)
-        gtk_widget_set_state_flags (GTK_WIDGET (spinner),
-                                    GTK_STATE_FLAG_CHECKED, FALSE);
-      else
-        gtk_widget_unset_state_flags (GTK_WIDGET (spinner),
-                                      GTK_STATE_FLAG_CHECKED);
-    }
+  spinner->spinning = spinning;
+
+  update_state_flags (spinner);
+
+  g_object_notify (G_OBJECT (spinner), "spinning");
 }
 
 static void
@@ -215,6 +245,8 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
   widget_class = GTK_WIDGET_CLASS(klass);
   widget_class->snapshot = gtk_spinner_snapshot;
   widget_class->measure = gtk_spinner_measure;
+  widget_class->map = gtk_spinner_map;
+  widget_class->unmap = gtk_spinner_unmap;
   widget_class->css_changed = gtk_spinner_css_changed;
 
   /**

gtk/gtktext.c

@@ -4834,7 +4834,7 @@ gtk_text_draw_cursor (GtkText     *self,
       gtk_css_boxes_init_border_box (&boxes, style, 0, 0, width, height);
       gtk_snapshot_push_clip (snapshot, &bounds);
       gtk_css_style_snapshot_background (&boxes, snapshot);
-      gtk_css_style_snapshot_layout (&boxes,snapshot, x, y, layout);
+      gtk_css_style_snapshot_layout (&boxes, snapshot, x, y, layout);
       gtk_snapshot_pop (snapshot);
     }
 

gtk/gtktexthandle.c

@@ -118,10 +118,10 @@ gtk_text_handle_get_padding (GtkTextHandle *handle,
   GtkWidget *widget = GTK_WIDGET (handle);
   GtkCssStyle *style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
 
-  padding->left = _gtk_css_number_value_get (style->size->padding_left, 100);
-  padding->right = _gtk_css_number_value_get (style->size->padding_right, 100);
-  padding->top = _gtk_css_number_value_get (style->size->padding_top, 100);
-  padding->bottom = _gtk_css_number_value_get (style->size->padding_bottom, 100);
+  padding->left = gtk_css_number_value_get (style->size->padding_left, 100);
+  padding->right = gtk_css_number_value_get (style->size->padding_right, 100);
+  padding->top = gtk_css_number_value_get (style->size->padding_top, 100);
+  padding->bottom = gtk_css_number_value_get (style->size->padding_bottom, 100);
 }
 
 static void

gtk/gtktextlayout.c

@@ -4030,8 +4030,9 @@ render_para (GskPangoRenderer   *crenderer,
                    (line_display->insert_index < byte_offset + pango_layout_line_get_length (line) ||
                     (at_last_line && line_display->insert_index == byte_offset + pango_layout_line_get_length (line))))
             {
+              GtkCssNode *node;
               GtkCssStyle *style;
-              GdkRGBA cursor_color;
+              const GdkRGBA *cursor_color;
               graphene_rect_t bounds = {
                 .origin.x = line_display->x_offset + line_display->block_cursor.x,
                 .origin.y = line_display->block_cursor.y + line_display->top_margin,
@@ -4042,11 +4043,13 @@ render_para (GskPangoRenderer   *crenderer,
               /* we draw text using base color on filled cursor rectangle
                * of cursor color (normally white on black)
                */
-              style = gtk_css_node_get_style (gtk_widget_get_css_node (crenderer->widget));
-              cursor_color = *gtk_css_color_value_get_rgba (style->font->caret_color ? style->font->caret_color : style->core->color);
+              node = gtk_widget_get_css_node (crenderer->widget);
+              style = gtk_css_node_get_style (node);
+
+              cursor_color = gtk_css_color_value_get_rgba (style->used->caret_color);
 
               gtk_snapshot_push_opacity (crenderer->snapshot, cursor_alpha);
-              gtk_snapshot_append_color (crenderer->snapshot, &cursor_color, &bounds);
+              gtk_snapshot_append_color (crenderer->snapshot, cursor_color, &bounds);
 
               /* draw text under the cursor if any */
               if (!line_display->cursor_at_line_end)
@@ -4101,11 +4104,12 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
   gboolean have_selection;
   gboolean draw_selection_text;
   const GdkRGBA *selection;
-  GdkRGBA color;
+  const GdkRGBA *color;
   GtkSnapshot *cursor_snapshot;
   GtkTextBTree *btree;
   GtkTextLine *first_line;
   GtkTextLine *last_line;
+  GtkCssNode *node;
   GtkCssStyle *style;
 
   g_return_if_fail (GTK_IS_TEXT_LAYOUT (layout));
@@ -4128,8 +4132,10 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
   if (last_line == NULL)
     last_line = _gtk_text_btree_get_end_iter_line (btree);
 
-  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  color = *gtk_css_color_value_get_rgba (style->core->color);
+  node = gtk_widget_get_css_node (widget);
+  style = gtk_css_node_get_style (node);
+
+  color = gtk_css_color_value_get_rgba (style->used->color);
 
   gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (0, offset_y));
   offset_y = 0;
@@ -4142,7 +4148,7 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
 
   crenderer->widget = widget;
   crenderer->snapshot = snapshot;
-  crenderer->fg_color = &color;
+  crenderer->fg_color = color;
 
   have_selection = gtk_text_buffer_get_selection_bounds (layout->buffer,
                                                          &selection_start,
@@ -4150,7 +4156,7 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
   if (have_selection)
     {
       GtkCssNode *selection_node;
-      GdkRGBA text_color;
+      const GdkRGBA *text_color;
 
       selection_start_line = gtk_text_iter_get_line (&selection_start);
       selection_end_line = gtk_text_iter_get_line (&selection_end);
@@ -4158,10 +4164,10 @@ gtk_text_layout_snapshot (GtkTextLayout      *layout,
       selection_node = gtk_text_view_get_selection_node ((GtkTextView*)widget);
       style = gtk_css_node_get_style (selection_node);
 
-      selection = gtk_css_color_value_get_rgba (style->background->background_color);
-      text_color = *gtk_css_color_value_get_rgba (style->core->color);
+      selection = gtk_css_color_value_get_rgba (style->used->background_color);
+      text_color = gtk_css_color_value_get_rgba (style->used->color);
 
-      draw_selection_text = text_color.alpha > 0;
+      draw_selection_text = text_color->alpha > 0;
     }
   else
     {

gtk/gtktextutil.c

@@ -132,7 +132,7 @@ gtk_text_util_create_drag_icon (GtkWidget *widget,
   snapshot = gtk_snapshot_new ();
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
-  color = gtk_css_color_value_get_rgba (style->core->color);
+  color = gtk_css_color_value_get_rgba (style->used->color);
 
   display = gtk_widget_get_display (widget);
 
@@ -179,8 +179,8 @@ set_attributes_from_style (GtkWidget         *widget,
 
   style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
 
-  *values->appearance.bg_rgba = *gtk_css_color_value_get_rgba (style->background->background_color);
-  *values->appearance.fg_rgba = *gtk_css_color_value_get_rgba (style->core->color);
+  *values->appearance.bg_rgba = *gtk_css_color_value_get_rgba (style->used->background_color);
+  *values->appearance.fg_rgba = *gtk_css_color_value_get_rgba (style->used->color);
 
   if (values->font)
     pango_font_description_free (values->font);

gtk/gtktextview.c

@@ -7836,7 +7836,6 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
 {
   GtkCssStyle *style;
   const GdkRGBA black = { 0, };
-  const GdkRGBA *color;
   const GdkRGBA *decoration_color;
   GtkTextDecorationLine decoration_line;
   GtkTextDecorationStyle decoration_style;
@@ -7846,12 +7845,10 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
   if (!values->appearance.fg_rgba)
     values->appearance.fg_rgba = gdk_rgba_copy (&black);
 
-  style = gtk_css_node_get_style (gtk_widget_get_css_node (GTK_WIDGET (text_view)));
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (GTK_WIDGET (text_view)));;
 
-  color = gtk_css_color_value_get_rgba (style->background->background_color);
-  *values->appearance.bg_rgba = *color;
-  color = gtk_css_color_value_get_rgba (style->core->color);
-  *values->appearance.fg_rgba = *color;
+  *values->appearance.bg_rgba = *gtk_css_color_value_get_rgba (style->used->background_color);
+  *values->appearance.fg_rgba = *gtk_css_color_value_get_rgba (style->used->color);
 
   if (values->font)
     pango_font_description_free (values->font);
@@ -7862,9 +7859,7 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
 
   decoration_line = _gtk_css_text_decoration_line_value_get (style->font_variant->text_decoration_line);
   decoration_style = _gtk_css_text_decoration_style_value_get (style->font_variant->text_decoration_style);
-  decoration_color = gtk_css_color_value_get_rgba (style->font_variant->text_decoration_color
-                                                   ? style->font_variant->text_decoration_color
-                                                   : style->core->color);
+  decoration_color = gtk_css_color_value_get_rgba (style->used->text_decoration_color);
 
   if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE)
     {
@@ -7922,10 +7917,9 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
     }
 
   /* letter-spacing */
-  values->letter_spacing = _gtk_css_number_value_get (style->font->letter_spacing, 100) * PANGO_SCALE;
+  values->letter_spacing = gtk_css_number_value_get (style->font->letter_spacing, 100) * PANGO_SCALE;
 
   /* line-height */
-
   values->line_height = gtk_css_line_height_value_get (style->font->line_height);
   values->line_height_is_absolute = FALSE;
   if (values->line_height != 0.0)

gtk/gtkwidget.c

@@ -3683,7 +3683,7 @@ gtk_widget_get_frame_clock (GtkWidget *widget)
 static int
 get_number (GtkCssValue *value)
 {
-  double d = _gtk_css_number_value_get (value, 100);
+  double d = gtk_css_number_value_get (value, 100);
 
   if (d < 1)
     return ceil (d);
@@ -6478,7 +6478,7 @@ gtk_widget_update_pango_context (GtkWidget        *widget,
                                          ? PANGO_DIRECTION_LTR
                                          : PANGO_DIRECTION_RTL);
 
-  pango_cairo_context_set_resolution (context, _gtk_css_number_value_get (style->core->dpi, 100));
+  pango_cairo_context_set_resolution (context, gtk_css_number_value_get (style->core->dpi, 100));
 
   pango_context_set_font_map (context, gtk_widget_get_effective_font_map (widget));
 
@@ -11857,7 +11857,7 @@ gtk_widget_create_render_node (GtkWidget   *widget,
 
   style = gtk_css_node_get_style (priv->cssnode);
 
-  css_opacity = _gtk_css_number_value_get (style->other->opacity, 100);
+  css_opacity = gtk_css_number_value_get (style->other->opacity, 100);
   opacity = CLAMP (css_opacity, 0.0, 1.0) * priv->user_alpha / 255.0;
 
   if (opacity <= 0.0)
@@ -13172,7 +13172,7 @@ gtk_widget_get_color (GtkWidget *widget,
   g_return_if_fail (GTK_IS_WIDGET (widget));
 
   style = gtk_css_node_get_style (priv->cssnode);
-  *color = *gtk_css_color_value_get_rgba (style->core->color);
+  *color = *gtk_css_color_value_get_rgba (style->used->color);
 }
 
 /*< private >

gtk/gtkwindow.c

@@ -1395,7 +1395,7 @@ constraints_for_edge (GdkSurfaceEdge edge)
 static int
 get_number (GtkCssValue *value)
 {
-  double d = _gtk_css_number_value_get (value, 100);
+  double d = gtk_css_number_value_get (value, 100);
 
   if (d < 1)
     return ceil (d);

gtk/inspector/layoutoverlay.c

@@ -23,7 +23,7 @@ G_DEFINE_TYPE (GtkLayoutOverlay, gtk_layout_overlay, GTK_TYPE_INSPECTOR_OVERLAY)
 static int
 get_number (GtkCssValue *value)
 {
-  double d = _gtk_css_number_value_get (value, 100);
+  double d = gtk_css_number_value_get (value, 100);
 
   if (d < 1)
     return ceil (d);

gtk/meson.build

@@ -113,6 +113,7 @@ gtk_private_sources = files([
   'gtkfilechoosercell.c',
   'gtkfilesystemmodel.c',
   'gtkfilethumbnail.c',
+  'gtkfontfilter.c',
   'gtkgizmo.c',
   'gtkiconcache.c',
   'gtkiconcachevalidator.c',
@@ -412,6 +413,7 @@ gtk_public_sources += gtk_print_sources
 
 gtk_private_type_headers = files([
   'gtkcsstypesprivate.h',
+  'gtkfontfilterprivate.h',
   'gtktexthandleprivate.h',
   'gtkplacessidebarprivate.h',
 ])

gtk/print/gtkprintunixdialog.c

@@ -2425,14 +2425,16 @@ draw_page (GtkDrawingArea *da,
     }
 
   style = gtk_css_node_get_style (dialog->page_layout_paper_node);
-  color = *gtk_css_color_value_get_rgba (style->core->color);
+  color = *gtk_css_color_value_get_rgba (style->used->color);
 
   pos_x = (width - w) / 2;
   pos_y = (height - h) / 2 - 10;
   cairo_translate (cr, pos_x, pos_y);
 
   snapshot = gtk_snapshot_new ();
-  gtk_css_boxes_init_border_box (&boxes, style, 1, 1, w, h);
+  gtk_css_boxes_init_border_box (&boxes,
+                                 gtk_css_node_get_style (dialog->page_layout_paper_node),
+                                 1, 1, w, h);
   gtk_css_style_snapshot_background (&boxes, snapshot);
   gtk_css_style_snapshot_border (&boxes, snapshot);
 

gtk/ui/gtkfontchooserwidget.ui

@@ -23,7 +23,9 @@
               <object class="GtkCustomFilter" id="custom_filter"/>
             </child>
             <child>
-              <object class="GtkCustomFilter" id="user_filter"/>
+              <object class="GtkFontFilter" id="user_filter">
+                <property name="monospace" bind-source="monospace_button" bind-property="active"/>
+              </object>
             </child>
           </object>
         </property>
@@ -97,7 +99,6 @@
                                 <child>
                                   <object class="GtkCheckButton" id="monospace_button">
                                     <property name="label" translatable="yes">Monospace</property>
-                                    <signal name="notify::active" handler="monospace_check_changed"/>
                                   </object>
                                 </child>
                                 <child>

testsuite/css/parser/at-invalid-12.errors

@@ -1 +1,3 @@
+at-invalid-12.css:1:25-29: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+at-invalid-12.css:1:31-36: error: GTK_CSS_PARSER_WARNING_DEPRECATED
 at-invalid-12.css:1:38-44: error: GTK_CSS_PARSER_ERROR_SYNTAX

testsuite/css/parser/at-invalid-13.errors

@@ -1 +1,2 @@
+at-invalid-13.css:1:25-30: error: GTK_CSS_PARSER_WARNING_DEPRECATED
 at-invalid-13.css:1:32-35: error: GTK_CSS_PARSER_ERROR_SYNTAX

testsuite/css/parser/at-invalid-15.errors

@@ -1 +1,3 @@
+at-invalid-15.css:1:25-30: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+at-invalid-15.css:1:32-36: error: GTK_CSS_PARSER_WARNING_DEPRECATED
 at-invalid-15.css:1:36-37: error: GTK_CSS_PARSER_ERROR_SYNTAX

testsuite/css/parser/at-invalid-16.errors

@@ -1 +1,2 @@
+at-invalid-16.css:1:25-30: error: GTK_CSS_PARSER_WARNING_DEPRECATED
 at-invalid-16.css:1:30-31: error: GTK_CSS_PARSER_ERROR_SYNTAX

testsuite/css/parser/at-valid-07.errors

@@ -0,0 +1 @@
+at-valid-07.css:1:21-30: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-11.errors

@@ -0,0 +1 @@
+at-valid-11.css:1:29-34: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-12.errors

@@ -0,0 +1 @@
+at-valid-12.css:1:27-32: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-13.errors

@@ -0,0 +1 @@
+at-valid-13.css:1:27-32: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-14.errors

@@ -0,0 +1,2 @@
+at-valid-14.css:1:25-30: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+at-valid-14.css:1:32-36: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-16.errors

@@ -0,0 +1 @@
+at-valid-16.css:1:69-74: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/at-valid-17.errors

@@ -0,0 +1 @@
+at-valid-17.css:1:20-25: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/background-shorthand.errors

@@ -0,0 +1,94 @@
+background-shorthand.css:10:273-278: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:46:163-168: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:118:38-43: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:158:89-94: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:194:316-321: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:214:122-127: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:222:381-386: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:226:48-53: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:238:214-219: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:246:88-93: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:306:15-20: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:346:358-363: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:374:31-36: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:422:96-101: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:430:719-724: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:446:252-257: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:458:153-158: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:498:46-51: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:546:201-206: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:562:260-265: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:618:801-806: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:646:86-91: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:666:279-284: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:738:355-360: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:742:194-199: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:798:95-100: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:826:75-80: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:854:15-20: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:862:76-81: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:866:116-121: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:874:517-522: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:894:98-103: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:898:157-162: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:906:225-230: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:986:712-717: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:994:304-309: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1078:542-547: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1090:719-724: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1110:586-591: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1146:127-132: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1242:261-266: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1306:24-29: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1314:393-398: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1398:283-288: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1414:236-241: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1418:268-273: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1438:406-411: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1446:102-107: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1482:94-99: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1494:766-771: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1510:45-50: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1534:84-89: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1538:268-273: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1626:786-791: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1642:231-236: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1658:69-74: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1694:607-612: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1782:59-64: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1794:214-219: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1850:113-118: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1858:108-113: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1894:535-540: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1898:301-306: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1902:373-378: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1922:154-159: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1926:391-396: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1938:224-229: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1942:533-538: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1958:15-20: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1970:412-417: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:1994:202-207: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2110:547-552: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2138:356-361: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2174:204-209: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2266:59-64: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2278:305-310: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2286:71-76: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2290:106-111: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2334:133-138: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2374:489-494: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2386:197-202: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2414:15-20: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2454:173-178: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2470:527-532: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2506:49-54: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2522:181-186: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2562:369-374: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2586:583-588: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2598:574-579: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2602:247-252: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2622:109-114: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2646:34-39: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2662:63-68: error: GTK_CSS_PARSER_WARNING_DEPRECATED
+background-shorthand.css:2674:24-29: error: GTK_CSS_PARSER_WARNING_DEPRECATED

testsuite/css/parser/calc.ref.css

@@ -3,7 +3,7 @@ a {
 }
 
 b {
-  transition-duration: calc(-200ms + 1s);
+  transition-duration: 0.80000000000000004s;
 }
 
 c {

testsuite/css/parser/color.css

@@ -71,3 +71,27 @@ q {
 r {
   color: @mygreen;
 }
+
+s {
+  color: rgb(255 0 0);
+}
+
+t {
+  color: rgb(255% 0 0);
+}
+
+u {
+  color: rgb(255 0 0 / 50%);
+}
+
+v {
+  color: rgb(calc(128 + 127) calc(10 - 10) calc(100 * 0) / calc(1 / 2));
+}
+
+w {
+  color: rgba(255 0 0);
+}
+
+x {
+  color: rgba(255 0 0 / 0.5);
+}

testsuite/css/parser/color.errors

@@ -0,0 +1 @@
+color.css:72:10-18: error: GTK_CSS_PARSER_WARNING_DEPRECATED