Try to fix cairo node serialization

Place the saved png at the right offset. This depends on https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/118 to make the cairo recording surface produce a proper png.
Update POTFILES.in
2021-01-30 19:47:45 -05:00 · 2021-01-30 14:21:32 +01:00 · 2021-01-30 03:25:19 +00:00 · 2021-01-29 21:41:16 -05:00 · 2021-01-29 20:16:13 +00:00 · 2021-01-29 19:06:03 +00:00
197 changed files with 10012 additions and 12828 deletions
@@ -65,6 +65,7 @@ RUN dnf -y install \
    libxslt \
    mesa-dri-drivers \
    mesa-libEGL-devel \
+    mesa-libGLES-devel \
    mesa-libwayland-egl-devel \
    ninja-build \
    pango-devel \
@@ -1,4 +1,4 @@
-FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v25
+FROM registry.gitlab.gnome.org/gnome/gtk/fedora-base:v27

 # Enable sudo for wheel users
 RUN sed -i -e 's/# %wheel/%wheel/' -e '0,/%wheel/{s/%wheel/# %wheel/}' /etc/sudoers
@@ -8,7 +8,8 @@ builddir=$1
 backend=$2

 # Ignore memory leaks lower in dependencies
-export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp
+export LSAN_OPTIONS=suppressions=$srcdir/lsan.supp:print_suppressions=0
+export G_SLICE=always-malloc

 case "${backend}" in
  x11)
@@ -1,4 +1,13 @@
+<!--
+  Please, read the CONTRIBUTING.md guide on how to file a new issue.
+
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
+-->
 ## Steps to reproduce
+<!--
+  Please, explain the sequence of actions necessary to reproduce the
+  bug
+-->

 1. ...
 2. ...
@@ -32,5 +41,8 @@
 ## Additional information
 <!--
 - Screenshots or screen recordings are useful for visual errors
+  - Attaching a screenshot or a video without explaining the current
+    behavior and the actions necessary to reproduce the bug will lead
+    to the bug being closed
 - Please report any warning or message printed on the terminal
 -->
@@ -1,4 +1,14 @@
+<!--
+  Please, read the CONTRIBUTING.md guide on how to file a new issue.
+
+  https://gitlab.gnome.org/GNOME/gtk/-/blob/master/CONTRIBUTING.md
+-->
+
 ## Steps to reproduce
+<!--
+  Please, explain the sequence of actions necessary to reproduce the
+  crash
+-->

 1. ...
 2. ...
@@ -1,57 +1,3 @@
-Overview of Changes in 4.0.3
-============================
-
-* GtkWidget:
- - Enforce the can-focus property
-
-* GtkVideo:
- - Avoid tearing when using gstreamer with GL
-
-* Accessibility:
- - Speed up cache population
- - Make context realization lazier
-
-* CSS:
- - Fix shadow transitions
-
-* Themes:
- - Adwaita: Allow suggested and destructive action in lists
-
-* GDK:
- - Remove warnings about exceeding size bounds
-
-* Vulkan:
- - Fix uploading image regions
-
-* Wayland:
- - Abort if the shared memory pool cannot be created
- - Explicitly announce ssd for kwin
- - Signal gtk-shell surface destruction to mutter
-
-* X11:
- - Fix several DND problems
-
-* Windows:
- - Avoid UAC in gtk4-update-icon-cache on 32bit Windows
-
-* MacOS:
- - Use correct module file extension
-
-* tools:
- - Make gtk-builder-tool translate GtkImage:pixbuf to :file
-
-* Translation updates:
- Brazilian Portuguese
- Czech
- Galician
- Greek
- Portuguese
- Punjabi
- Slovenian
- Spanish
- Swedish
-
-
 Overview of Changes in 4.0.2
 ============================

@@ -279,31 +279,11 @@ drag_prepare_texture (GtkDragSource *source,
                      GtkWidget     *widget)
 {
  GdkPaintable *paintable = get_image_paintable (GTK_IMAGE (widget));
-  GtkSnapshot *snapshot;
-  double width, height;
-  GskRenderNode *node;
-  GskRenderer *renderer;
-  GdkTexture *texture;
-  GdkContentProvider *ret;

  if (!GDK_IS_PAINTABLE (paintable))
    return NULL;

-  snapshot = gtk_snapshot_new ();
-  width = gdk_paintable_get_intrinsic_width (paintable);
-  height = gdk_paintable_get_intrinsic_height (paintable);
-  gdk_paintable_snapshot (paintable, snapshot, width, height);
-  node = gtk_snapshot_free_to_node (snapshot);
-
-  renderer = gtk_native_get_renderer (gtk_widget_get_native (widget));
-  texture = gsk_renderer_render_texture (renderer, node, &GRAPHENE_RECT_INIT (0, 0, width, height));
-
-  ret = gdk_content_provider_new_typed (GDK_TYPE_TEXTURE, texture);
-
-  g_object_unref (texture);
-  gsk_render_node_unref (node);
-
-  return ret;
+  return gdk_content_provider_new_typed (GDK_TYPE_PAINTABLE, paintable);
 }

 static GdkContentProvider *
@@ -910,6 +910,26 @@ node_editor_window_init (NodeEditorWindow *self)
  self->text_buffer = gtk_text_buffer_new (self->tag_table);
  g_signal_connect (self->text_buffer, "changed", G_CALLBACK (text_changed), self);
  gtk_text_view_set_buffer (GTK_TEXT_VIEW (self->text_view), self->text_buffer);
+
+  /* Default */
+  gtk_text_buffer_set_text (self->text_buffer,
+         "shadow {\n"
+         "  child: texture {\n"
+         "    bounds: 0 0 128 128;\n"
+         "    texture: url(\"resource:///org/gtk/gtk4/node-editor/icons/apps/org.gtk.gtk4.NodeEditor.Devel.svg\");\n"
+         "  }\n"
+         "  shadows: rgba(0,0,0,0.5) 0 1 12;\n"
+         "}\n"
+         "\n"
+         "transform {\n"
+         "  child: text {\n"
+         "    color: rgb(46,52,54);\n"
+         "    font: \"Cantarell Bold 11\";\n"
+         "    glyphs: \"GTK Node Editor\";\n"
+         "    offset: 8 14.418;\n"
+         "  }\n"
+         "  transform: translate(0, 140);\n"
+         "}", -1);
 }

 NodeEditorWindow *
@@ -18,9 +18,9 @@ Length
 Percentage
 : %, calc()
 Angle
- : deg | grad | turn, calc()
+ : deg, grad, turn, calc()
 Time
- : s | ms, calc()
+ : s, ms, calc()

 Length values with the em or ex units are resolved using the font
 size value, unless they occur in setting the font-size itself, in
@@ -32,7 +32,7 @@ not quite the same as the CSS definition of rem.
 The calc() notation adds considerable expressive power. There are limits
 on what types can be combined in such an expression (e.g. it does not make
 sense to add a number and a time). For the full details, see the
-[CSS3 VAlues and Units](https://www.w3.org/TR/css3-values/#calc-notation)
+[CSS3 Values and Units](https://www.w3.org/TR/css3-values/#calc-notation)
 spec.

 A common pattern among shorthand properties (called 'four sides') is one
@@ -129,7 +129,7 @@ done with
 |:-----------|:----------|:------|
 |color       | [CSS Color Level 3](https://www.w3.org/TR/css3-color/#foreground) | |
 |opacity     | [CSS Color Level 3](https://www.w3.org/TR/css3-color/#opacity) | |
-|filter      | [CSS Filter Effect Level 1](https://drafts.fxtf.org/filters/#FilterProperty) | CSS allows drop-shadow |
+|filter      | [CSS Filter Effect Level 1](https://drafts.fxtf.org/filters/#FilterProperty) | |
 |font-family | [CSS Fonts Level 3](https://www.w3.org/TR/css3-fonts/#font-family-prop) | defaults to gtk-font-name setting |
 |font-size   | [CSS Fonts Level 3](https://www.w3.org/TR/css3-fonts/#font-size-prop) | defaults to gtk-font-name setting |
 |font-style  | [CSS Fonts Level 3](https://www.w3.org/TR/css3-fonts/#font-style-prop) | |
@@ -151,7 +151,7 @@ done with
 |caret-color|[CSS Basic User Interface Level 3](https://www.w3.org/TR/css3-ui/#caret-color) | CSS allows an auto value |
 |-gtk-secondary-caret-color|[Color](https://www.w3.org/TR/css-color-3/#valuea-def-color) | used for the secondary caret in bidirectional text |
 |letter-spacing| [CSS Text Level 3](https://www.w3.org/TR/css3-text/#letter-spacing) | |
-|text-decoration-line| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property) | CSS allows overline |
+|text-decoration-line| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-line-property) | |
 |text-decoration-color| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-color-property) | |
 |text-decoration-style| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-decoration-style-property) | CSS allows dashed and dotted |
 |text-shadow| [CSS Text Decoration Level 3](https://www.w3.org/TR/css-text-decor-3/#text-shadow-property) | |
@@ -159,11 +159,12 @@ done with
 |-gtk-icon-source| [Image](https://www.w3.org/TR/css-backgrounds-3/#typedef-image), `builtin` or `none` | used for builtin icons in buttons and expanders |
 |-gtk-icon-size| [Length](https://www.w3.org/TR/css3-values/#length-value) | size used for builtin icons in buttons and expanders |
 |-gtk-icon-style| `requested`, `regular` or `symbolic` | preferred style for application-loaded icons |
-|-gtk-icon-transform| [Transform list](https://drafts.csswg.org/css-transforms-1/#typedef-transform-list) or `none` | applied to builtin and application-loaded icons |
+|-gtk-icon-transform| [Transform list](https://www.w3.org/TR/css-transforms-1/#typedef-transform-list) or `none` | applied to builtin and application-loaded icons |
 |-gtk-icon-palette| Color palette, as explained above | used to recolor symbolic icons |
 |-gtk-icon-shadow| [Shadow](https://www.w3.org/TR/css-backgrounds-3/#typedef-shadow) or `none` | applied to builtin and application-loaded icons |
 |-gtk-icon-filter| [Filter value list](https://www.w3.org/TR/filter-effects-1/#typedef-filter-value-list) or `none` | applied to builtin and application-loaded icons |
-|transform| [CSS Transforms Level 2](https://drafts.csswg.org/css-transforms-2/) | |
+|transform| [CSS Transforms Level 1](https://www.w3.org/TR/css-transforms-1/#transform-property) | |
+|transform-origin| [CSS Transforms Level 1](https://www.w3.org/TR/css-transforms-1/#transform-origin-property) | CSS allows specifying a z component|
 |min-width| [CSS Box Model Level 3](https://www.w3.org/TR/css3-box/#min-width) | CSS allows percentages |
 |min-height| [CSS Box Model Level 3](https://www.w3.org/TR/css3-box/#min-height) | CSS allows percentages |
 |margin-top| [CSS Box Model Level 3](https://www.w3.org/TR/css3-box/#margin-top) | CSS allows percentages or auto |
@@ -217,7 +218,7 @@ done with
 |background-size| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background-size) | |
 |background-position| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background-position) | |
 |background-repeat| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background-repeat) | |
-|background-image| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background-image) | not supported: urls without quotes, colors in crossfades |
+|background-image| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background-image) | not supported: urls without quotes |
 |box-shadow| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#box-shadow) | |
 |background-blend-mode| [CSS Compositing and Blending Level 1](https://www.w3.org/TR/compositing-1/#propdef-background-blend-mode) | only affects multiple backgrounds |
 |background| [CSS Backgrounds and Borders Level 3](https://www.w3.org/TR/css3-background/#background) | |
@@ -343,20 +343,19 @@ Many widgets, like buttons, do all their drawing themselves. You just tell
 them the label you want to see, and they figure out what font to use, draw
 the button outline and focus rectangle, etc. Sometimes, it is necessary to
 do some custom drawing. In that case, a GtkDrawingArea might be the right
-widget to use. It offers a canvas on which you can draw by connecting to
-the ::draw signal.
+widget to use. It offers a canvas on which you can draw by setting its
+draw function.

 The contents of a widget often need to be partially or fully redrawn,
 e.g. when another window is moved and uncovers part of the widget, or
 when the window containing it is resized. It is also possible to explicitly
-cause part or all of the widget to be redrawn, by calling
-gtk_widget_queue_draw() or its variants. GTK takes care of most of the
-details by providing a ready-to-use cairo context to the ::draw signal
-handler.
+cause a widget to be redrawn, by calling gtk_widget_queue_draw(). GTK takes
+care of most of the details by providing a ready-to-use cairo context to the
+draw function.

-The following example shows a ::draw signal handler. It is a bit more
-complicated than the previous examples, since it also demonstrates
-input event handling by means of event controllers.
+The following example shows how to use a draw function with GtkDrawingArea.
+It is a bit more complicated than the previous examples, since it also
+demonstrates input event handling with event controllers.

 ![Drawing](drawing.png)

@@ -0,0 +1,293 @@
+#include <gtk/gtk.h>
+
+#include "exampleapp.h"
+#include "exampleappwin.h"
+
+struct _ExampleAppWindow
+{
+  GtkApplicationWindow parent;
+
+  GSettings *settings;
+  GtkWidget *stack;
+  GtkWidget *search;
+  GtkWidget *searchbar;
+  GtkWidget *searchentry;
+  GtkWidget *gears;
+  GtkWidget *sidebar;
+  GtkWidget *words;
+  GtkWidget *lines;
+  GtkWidget *lines_label;
+};
+
+G_DEFINE_TYPE (ExampleAppWindow, example_app_window, GTK_TYPE_APPLICATION_WINDOW)
+
+static void
+search_text_changed (GtkEntry         *entry,
+                     ExampleAppWindow *win)
+{
+  const char *text;
+  GtkWidget *tab;
+  GtkWidget *view;
+  GtkTextBuffer *buffer;
+  GtkTextIter start, match_start, match_end;
+
+  text = gtk_editable_get_text (GTK_EDITABLE (entry));
+
+  if (text[0] == '\0')
+    return;
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+  /* Very simple-minded search implementation */
+  gtk_text_buffer_get_start_iter (buffer, &start);
+  if (gtk_text_iter_forward_search (&start, text, GTK_TEXT_SEARCH_CASE_INSENSITIVE,
+                                    &match_start, &match_end, NULL))
+    {
+      gtk_text_buffer_select_range (buffer, &match_start, &match_end);
+      gtk_text_view_scroll_to_iter (GTK_TEXT_VIEW (view), &match_start,
+                                    0.0, FALSE, 0.0, 0.0);
+    }
+}
+
+static void
+find_word (GtkButton        *button,
+           ExampleAppWindow *win)
+{
+  const char *word;
+
+  word = gtk_button_get_label (button);
+  gtk_editable_set_text (GTK_EDITABLE (win->searchentry), word);
+}
+
+static void
+update_words (ExampleAppWindow *win)
+{
+  GHashTable *strings;
+  GHashTableIter iter;
+  GtkWidget *tab, *view, *row;
+  GtkTextBuffer *buffer;
+  GtkTextIter start, end;
+  char *word, *key;
+  GtkWidget *child;
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+
+  if (tab == NULL)
+    return;
+
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+  strings = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, NULL);
+
+  gtk_text_buffer_get_start_iter (buffer, &start);
+  while (!gtk_text_iter_is_end (&start))
+    {
+      while (!gtk_text_iter_starts_word (&start))
+        {
+          if (!gtk_text_iter_forward_char (&start))
+            goto done;
+        }
+      end = start;
+      if (!gtk_text_iter_forward_word_end (&end))
+        goto done;
+      word = gtk_text_buffer_get_text (buffer, &start, &end, FALSE);
+      g_hash_table_add (strings, g_utf8_strdown (word, -1));
+      g_free (word);
+      start = end;
+    }
+
+done:
+  while ((child = gtk_widget_get_first_child (win->words)))
+    gtk_list_box_remove (GTK_LIST_BOX (win->words), child);
+
+  g_hash_table_iter_init (&iter, strings);
+  while (g_hash_table_iter_next (&iter, (gpointer *)&key, NULL))
+    {
+      row = gtk_button_new_with_label (key);
+      g_signal_connect (row, "clicked",
+                        G_CALLBACK (find_word), win);
+      gtk_box_append (GTK_BOX (win->words), row);
+    }
+
+  g_hash_table_unref (strings);
+}
+
+static void
+update_lines (ExampleAppWindow *win)
+{
+  GtkWidget *tab, *view;
+  GtkTextBuffer *buffer;
+  int count;
+  char *lines;
+
+  tab = gtk_stack_get_visible_child (GTK_STACK (win->stack));
+
+  if (tab == NULL)
+    return;
+
+  view = gtk_scrolled_window_get_child (GTK_SCROLLED_WINDOW (tab));
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+  count = gtk_text_buffer_get_line_count (buffer);
+  lines = g_strdup_printf ("%d", count);
+  gtk_label_set_text (GTK_LABEL (win->lines), lines);
+  g_free (lines);
+}
+
+static void
+visible_child_changed (GObject          *stack,
+                       GParamSpec       *pspec,
+                       ExampleAppWindow *win)
+{
+  if (gtk_widget_in_destruction (GTK_WIDGET (stack)))
+    return;
+
+  gtk_search_bar_set_search_mode (GTK_SEARCH_BAR (win->searchbar), FALSE);
+  update_words (win);
+  update_lines (win);
+}
+
+static void
+words_changed (GObject          *sidebar,
+               GParamSpec       *pspec,
+               ExampleAppWindow *win)
+{
+  update_words (win);
+}
+
+static void
+example_app_window_init (ExampleAppWindow *win)
+{
+  GtkBuilder *builder;
+  GMenuModel *menu;
+  GAction *action;
+
+  gtk_widget_init_template (GTK_WIDGET (win));
+  win->settings = g_settings_new ("org.gtk.exampleapp");
+
+  g_settings_bind (win->settings, "transition",
+                   win->stack, "transition-type",
+                   G_SETTINGS_BIND_DEFAULT);
+
+  g_settings_bind (win->settings, "show-words",
+                   win->sidebar, "reveal-child",
+                   G_SETTINGS_BIND_DEFAULT);
+
+  g_object_bind_property (win->search, "active",
+                          win->searchbar, "search-mode-enabled",
+                          G_BINDING_BIDIRECTIONAL);
+
+  g_signal_connect (win->sidebar, "notify::reveal-child",
+                    G_CALLBACK (words_changed), win);
+
+  builder = gtk_builder_new_from_resource ("/org/gtk/exampleapp/gears-menu.ui");
+  menu = G_MENU_MODEL (gtk_builder_get_object (builder, "menu"));
+  gtk_menu_button_set_menu_model (GTK_MENU_BUTTON (win->gears), menu);
+  g_object_unref (builder);
+
+  action = g_settings_create_action (win->settings, "show-words");
+  g_action_map_add_action (G_ACTION_MAP (win), action);
+  g_object_unref (action);
+
+  action = (GAction*) g_property_action_new ("show-lines", win->lines, "visible");
+  g_action_map_add_action (G_ACTION_MAP (win), action);
+  g_object_unref (action);
+
+  g_object_bind_property (win->lines, "visible",
+                          win->lines_label, "visible",
+                          G_BINDING_DEFAULT);
+
+  g_object_set (gtk_settings_get_default (), "gtk-shell-shows-app-menu", FALSE, NULL);
+  gtk_application_window_set_show_menubar (GTK_APPLICATION_WINDOW (win), TRUE);
+}
+
+static void
+example_app_window_dispose (GObject *object)
+{
+  ExampleAppWindow *win;
+
+  win = EXAMPLE_APP_WINDOW (object);
+
+  g_clear_object (&win->settings);
+
+  G_OBJECT_CLASS (example_app_window_parent_class)->dispose (object);
+}
+
+static void
+example_app_window_class_init (ExampleAppWindowClass *class)
+{
+  G_OBJECT_CLASS (class)->dispose = example_app_window_dispose;
+
+  gtk_widget_class_set_template_from_resource (GTK_WIDGET_CLASS (class),
+                                               "/org/gtk/exampleapp/window.ui");
+
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, stack);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, search);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchbar);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, searchentry);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, gears);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, words);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, sidebar);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines);
+  gtk_widget_class_bind_template_child (GTK_WIDGET_CLASS (class), ExampleAppWindow, lines_label);
+
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), search_text_changed);
+  gtk_widget_class_bind_template_callback (GTK_WIDGET_CLASS (class), visible_child_changed);
+}
+
+ExampleAppWindow *
+example_app_window_new (ExampleApp *app)
+{
+  return g_object_new (EXAMPLE_APP_WINDOW_TYPE, "application", app, NULL);
+}
+
+void
+example_app_window_open (ExampleAppWindow *win,
+                         GFile            *file)
+{
+  char *basename;
+  GtkWidget *scrolled, *view;
+  char *contents;
+  gsize length;
+  GtkTextBuffer *buffer;
+  GtkTextTag *tag;
+  GtkTextIter start_iter, end_iter;
+
+  basename = g_file_get_basename (file);
+
+  scrolled = gtk_scrolled_window_new ();
+  gtk_widget_set_hexpand (scrolled, TRUE);
+  gtk_widget_set_vexpand (scrolled, TRUE);
+  view = gtk_text_view_new ();
+  gtk_text_view_set_editable (GTK_TEXT_VIEW (view), FALSE);
+  gtk_text_view_set_cursor_visible (GTK_TEXT_VIEW (view), FALSE);
+  gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (scrolled), view);
+  gtk_stack_add_titled (GTK_STACK (win->stack), scrolled, basename, basename);
+
+  buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (view));
+
+  if (g_file_load_contents (file, NULL, &contents, &length, NULL, NULL))
+    {
+      gtk_text_buffer_set_text (buffer, contents, length);
+      g_free (contents);
+    }
+
+  tag = gtk_text_buffer_create_tag (buffer, NULL, NULL);
+  g_settings_bind (win->settings, "font",
+                   tag, "font",
+                   G_SETTINGS_BIND_DEFAULT);
+
+  gtk_text_buffer_get_start_iter (buffer, &start_iter);
+  gtk_text_buffer_get_end_iter (buffer, &end_iter);
+  gtk_text_buffer_apply_tag (buffer, tag, &start_iter, &end_iter);
+
+  g_free (basename);
+
+  gtk_widget_set_sensitive (win->search, TRUE);
+
+  update_words (win);
+  update_lines (win);
+}
@@ -173,7 +173,7 @@ stash_desktop_startup_notification_id (void)
      if (!g_utf8_validate (desktop_startup_id, -1, NULL))
        g_warning ("DESKTOP_STARTUP_ID contains invalid UTF-8");
      else
-        startup_notification_id = g_strdup (desktop_startup_id);
+        startup_notification_id = g_strdup (desktop_startup_id ? desktop_startup_id : "");
    }

  /* Clear the environment variable so it won't be inherited by
@@ -2960,8 +2960,8 @@ gdk_surface_request_motion (GdkSurface *surface)
 * gdk_surface_translate_coordinates:
 * @from: the origin surface
 * @to: the target surface
- * @x: coordinates to translate
- * @y: coordinates to translate
+ * @x: (inout): coordinates to translate
+ * @y: (inout): coordinates to translate
 *
 * Translates the given coordinates from being
 * relative to the @from surface to being relative
@@ -2980,9 +2980,18 @@ gdk_surface_translate_coordinates (GdkSurface *from,
                                   double     *x,
                                   double     *y)
 {
+  double in_x, in_y, out_x, out_y;
  int x1, y1, x2, y2;
  GdkSurface *f, *t;

+  g_return_val_if_fail (GDK_IS_SURFACE (from), FALSE);
+  g_return_val_if_fail (GDK_IS_SURFACE (to), FALSE);
+  g_return_val_if_fail (x != NULL, FALSE);
+  g_return_val_if_fail (y != NULL, FALSE);
+
+  in_x = *x;
+  in_y = *y;
+
  x1 = 0;
  y1 = 0;
  f = from;
@@ -3006,8 +3015,11 @@ gdk_surface_translate_coordinates (GdkSurface *from,
  if (f != t)
    return FALSE;

-  *x += x1 - x2;
-  *y += y1 - y2;
+  out_x = in_x + (x1 - x2);
+  out_y = in_y + (y1 - y2);
+
+  *x = out_x;
+  *y = out_y;

  return TRUE;
 }
@@ -149,6 +149,12 @@ gdk_toplevel_size_validate (GdkToplevelSize *size)
 {
  int geometry_width, geometry_height;

+  if (size->min_width > size->bounds_width ||
+      size->min_height > size->bounds_height)
+    g_warning ("GdkToplevelSize: min_size (%d, %d) exceeds bounds (%d, %d)",
+               size->min_width, size->min_height,
+               size->bounds_width, size->bounds_height);
+
  geometry_width = size->width;
  geometry_height = size->height;
  if (size->shadow.is_valid)
@@ -156,4 +162,15 @@ gdk_toplevel_size_validate (GdkToplevelSize *size)
      geometry_width -= size->shadow.left + size->shadow.right;
      geometry_height -= size->shadow.top + size->shadow.bottom;
    }
+  if (geometry_width > size->bounds_width ||
+      geometry_height > size->bounds_height)
+    g_warning ("GdkToplevelSize: geometry size (%d, %d) exceeds bounds (%d, %d)",
+               size->width, size->height,
+               size->bounds_width, size->bounds_height);
+
+  if (size->min_width > size->width ||
+      size->min_height > size->height)
+    g_warning ("GdkToplevelSize: min_size (%d, %d) exceeds size (%d, %d)",
+               size->min_width, size->min_height,
+               size->width, size->height);
 }
@@ -78,6 +78,14 @@
 */
 #define GDK_VERSION_4_0        (G_ENCODE_VERSION (4, 0))

+/**
+ * GDK_VERSION_4_2:
+ *
+ * A macro that evaluates to the 4.2 version of GDK, in a format
+ * that can be used by the C pre-processor.
+ */
+#define GDK_VERSION_4_2        (G_ENCODE_VERSION (4, 2))
+

 /* evaluates to the current stable version; for development cycles,
 * this means the next stable target, with a hard backstop to the
@@ -175,4 +183,19 @@
 # define GDK_DEPRECATED_IN_4_0_FOR(f)           _GDK_EXTERN
 #endif

+
+#if GDK_VERSION_MAX_ALLOWED < GDK_VERSION_4_2
+# define GDK_AVAILABLE_IN_4_2                   GDK_UNAVAILABLE(4, 2)
+#else
+# define GDK_AVAILABLE_IN_4_2                   _GDK_EXTERN
+#endif
+
+#if GDK_VERSION_MIN_REQUIRED >= GDK_VERSION_4_2
+# define GDK_DEPRECATED_IN_4_2                  GDK_DEPRECATED
+# define GDK_DEPRECATED_IN_4_2_FOR(f)           GDK_DEPRECATED_FOR(f)
+#else
+# define GDK_DEPRECATED_IN_4_2                  _GDK_EXTERN
+# define GDK_DEPRECATED_IN_4_2_FOR(f)           _GDK_EXTERN
+#endif
+
 #endif  /* __GDK_VERSION_MACROS_H__ */
@@ -547,6 +547,20 @@ _gdk_macos_display_surface_resigned_key (GdkMacosDisplay *self,
  _gdk_macos_display_clear_sorting (self);
 }

+/* Raises a transient window.
+ */
+static void
+raise_transient (GdkMacosSurface *surface)
+{
+  GdkMacosSurface *parent_surface = GDK_MACOS_SURFACE (GDK_SURFACE (surface)->transient_for);
+
+  NSWindow *parent = _gdk_macos_surface_get_native (parent_surface);
+  NSWindow *window = _gdk_macos_surface_get_native (surface);
+
+  [parent removeChildWindow:window];
+  [parent addChildWindow:window ordered:NSWindowAbove];
+}
+
 void
 _gdk_macos_display_surface_became_main (GdkMacosDisplay *self,
                                        GdkMacosSurface *surface)
@@ -559,6 +573,9 @@ _gdk_macos_display_surface_became_main (GdkMacosDisplay *self,

  g_queue_push_head_link (&self->main_surfaces, &surface->main);

+  if (GDK_SURFACE (surface)->transient_for)
+    raise_transient (surface);
+
  _gdk_macos_display_clear_sorting (self);
 }

@@ -296,20 +296,15 @@ gdk_x11_drag_find (GdkDisplay *display,
 static void
 precache_target_list (GdkDrag *drag)
 {
-  GdkContentFormats *formats;
+  GdkContentFormats *formats = gdk_drag_get_formats (drag);
  const char * const *atoms;
  gsize n_atoms;

-  formats = gdk_content_formats_ref (gdk_drag_get_formats (drag));
-  formats = gdk_content_formats_union_serialize_mime_types (formats);
-
  atoms = gdk_content_formats_get_mime_types (formats, &n_atoms);

  _gdk_x11_precache_atoms (gdk_drag_get_display (drag),
                           (const char **) atoms,
                           n_atoms);
-
-  gdk_content_formats_unref (formats);
 }

 /* Utility functions */
@@ -922,12 +917,8 @@ xdnd_set_targets (GdkX11Drag *drag_x11)
  const char * const *atoms;
  gsize i, n_atoms;
  GdkDisplay *display = gdk_drag_get_display (drag);
-  GdkContentFormats *formats;

-  formats = gdk_content_formats_ref (gdk_drag_get_formats (drag));
-  formats = gdk_content_formats_union_serialize_mime_types (formats);
-
-  atoms = gdk_content_formats_get_mime_types (formats, &n_atoms);
+  atoms = gdk_content_formats_get_mime_types (gdk_drag_get_formats (drag), &n_atoms);
  atomlist = g_new (Atom, n_atoms);
  for (i = 0; i < n_atoms; i++)
    atomlist[i] = gdk_x11_get_xatom_by_name_for_display (display, atoms[i]);
@@ -941,8 +932,6 @@ xdnd_set_targets (GdkX11Drag *drag_x11)
  g_free (atomlist);

  drag_x11->xdnd_targets_set = 1;
-
-  gdk_content_formats_unref (formats);
 }

 static void
@@ -1106,8 +1095,6 @@ xdnd_send_enter (GdkX11Drag *drag_x11)
    }

  xdnd_send_xevent (drag_x11, &xev);
-
-  gdk_content_formats_unref (formats);
 }

 static void
@@ -1347,7 +1334,7 @@ _gdk_x11_display_get_drag_protocol (GdkDisplay      *display,

 static GdkSurfaceCache *
 drag_find_window_cache (GdkX11Drag *drag_x11,
-                        GdkDisplay *display)
+                                GdkDisplay        *display)
 {
  if (!drag_x11->cache)
    drag_x11->cache = gdk_surface_cache_get (display);
@@ -1378,7 +1365,7 @@ gdk_x11_drag_find_surface (GdkDrag         *drag,
                                      drag_surface && GDK_IS_X11_SURFACE (drag_surface) ?
                                      GDK_SURFACE_XID (drag_surface) : None,
                                      x_root * screen_x11->surface_scale,
-                                      y_root * screen_x11->surface_scale);
+				      y_root * screen_x11->surface_scale);

  if (drag_x11->dest_xid != dest)
    {
@@ -1408,8 +1395,8 @@ gdk_x11_drag_find_surface (GdkDrag         *drag,

 static void
 move_drag_surface (GdkDrag *drag,
-                   guint    x_root,
-                   guint    y_root)
+                  guint           x_root,
+                  guint           y_root)
 {
  GdkX11Drag *drag_x11 = GDK_X11_DRAG (drag);

@@ -1420,14 +1407,14 @@ move_drag_surface (GdkDrag *drag,
 }

 static gboolean
-gdk_x11_drag_drag_motion (GdkDrag         *drag,
-                          Window           proxy_xid,
-                          GdkDragProtocol  protocol,
-                          int              x_root,
-                          int              y_root,
-                          GdkDragAction    suggested_action,
-                          GdkDragAction    possible_actions,
-                          guint32          time)
+gdk_x11_drag_drag_motion (GdkDrag *drag,
+                                  Window          proxy_xid,
+                                  GdkDragProtocol protocol,
+                                  int             x_root,
+                                  int             y_root,
+                                  GdkDragAction   suggested_action,
+                                  GdkDragAction   possible_actions,
+                                  guint32         time)
 {
  GdkX11Drag *drag_x11 = GDK_X11_DRAG (drag);

@@ -1619,8 +1606,8 @@ gdk_x11_drag_get_drag_surface (GdkDrag *drag)

 static void
 gdk_x11_drag_set_hotspot (GdkDrag *drag,
-                          int      hot_x,
-                          int      hot_y)
+                                  int             hot_x,
+                                  int             hot_y)
 {
  GdkX11Drag *x11_drag = GDK_X11_DRAG (drag);

@@ -1636,8 +1623,8 @@ gdk_x11_drag_set_hotspot (GdkDrag *drag,

 static void
 gdk_x11_drag_default_output_done (GObject      *drag,
-                                  GAsyncResult *result,
-                                  gpointer      user_data)
+                                          GAsyncResult *result,
+                                          gpointer      user_data)
 {
  GError *error = NULL;

@@ -1649,17 +1636,17 @@ gdk_x11_drag_default_output_done (GObject      *drag,
 }

 static void
-gdk_x11_drag_default_output_handler (GOutputStream *stream,
-                                     const char    *mime_type,
-                                     gpointer       user_data)
+gdk_x11_drag_default_output_handler (GOutputStream   *stream,
+                                             const char      *mime_type,
+                                             gpointer         user_data)
 {
  gdk_drag_write_async (GDK_DRAG (user_data),
-                        mime_type,
-                        stream,
-                        G_PRIORITY_DEFAULT,
-                        NULL,
-                        gdk_x11_drag_default_output_done,
-                        NULL);
+                                mime_type,
+                                stream,
+                                G_PRIORITY_DEFAULT,
+                                NULL,
+                                gdk_x11_drag_default_output_done,
+                                NULL);
  g_object_unref (stream);
 }

@@ -1688,7 +1675,7 @@ gdk_x11_drag_xevent (GdkDisplay   *display,
      if (xevent->xselectionclear.time < x11_drag->timestamp)
        {
          GDK_DISPLAY_NOTE (display, CLIPBOARD, g_printerr ("ignoring SelectionClear with too old timestamp (%lu vs %lu)\n",
-                            xevent->xselectionclear.time, x11_drag->timestamp));
+                                          xevent->xselectionclear.time, x11_drag->timestamp));
          return FALSE;
        }

@@ -1698,7 +1685,6 @@ gdk_x11_drag_xevent (GdkDisplay   *display,

    case SelectionRequest:
      {
-        GdkContentFormats *formats;
 #ifdef G_ENABLE_DEBUG
        const char *target, *property;
 #endif
@@ -1717,30 +1703,23 @@ gdk_x11_drag_xevent (GdkDisplay   *display,
        if (xevent->xselectionrequest.requestor == None)
          {
            GDK_DISPLAY_NOTE (display, CLIPBOARD, g_printerr ("got SelectionRequest for %s @ %s with NULL window, ignoring\n",
-                              target, property));
+                                            target, property));
            return TRUE;
          }
        
        GDK_DISPLAY_NOTE (display, CLIPBOARD, g_printerr ("got SelectionRequest for %s @ %s\n",
-                          target, property));
-
-        formats = gdk_content_formats_ref (gdk_drag_get_formats (drag));
-        formats = gdk_content_formats_union_serialize_mime_types (formats);
+                                        target, property));

        gdk_x11_selection_output_streams_create (display,
-                                                 formats,
+                                                 gdk_drag_get_formats (drag),
                                                 xevent->xselectionrequest.requestor,
                                                 xevent->xselectionrequest.selection,
                                                 xevent->xselectionrequest.target,
-                                                 xevent->xselectionrequest.property
-                                                   ? xevent->xselectionrequest.property
-                                                   : xevent->xselectionrequest.target,
+                                                 xevent->xselectionrequest.property ? xevent->xselectionrequest.property
+                                                                                    : xevent->xselectionrequest.target,
                                                 xevent->xselectionrequest.time,
                                                 gdk_x11_drag_default_output_handler,
                                                 drag);
-
-        gdk_content_formats_unref (formats);
-
        return TRUE;
      }

@@ -39,7 +39,6 @@
 #include "gdkscreen-x11.h"
 #include "gdkselectioninputstream-x11.h"
 #include "gdkselectionoutputstream-x11.h"
-#include "gdktextlistconverter-x11.h"

 #include <X11/Xlib.h>
 #include <X11/Xutil.h>
@@ -104,49 +103,6 @@ static const struct {

 G_DEFINE_TYPE (GdkX11Drop, gdk_x11_drop, GDK_TYPE_DROP)

-static GInputStream *
-text_list_convert (GdkDisplay   *display,
-                   GInputStream *stream,
-                   const char   *encoding,
-                   int           format)
-{
-  GInputStream *converter_stream;
-  GConverter *converter;
-
-  converter = gdk_x11_text_list_converter_to_utf8_new (display, encoding, format);
-  converter_stream = g_converter_input_stream_new (stream, converter);
-
-  g_object_unref (converter);
-  g_object_unref (stream);
-
-  return converter_stream;
-}
-
-static GInputStream *
-no_convert (GdkDisplay   *display,
-            GInputStream *stream,
-            const char   *encoding,
-            int           format)
-{
-  return stream;
-}
-
-static const struct {
-  const char *x_target;
-  const char *mime_type;
-  GInputStream * (* convert) (GdkDisplay *, GInputStream *, const char *, int);
-  const char *type;
-  int format;
-} special_targets[] = {
-  { "UTF8_STRING",   "text/plain;charset=utf-8", no_convert,        "UTF8_STRING",   8 },
-  { "COMPOUND_TEXT", "text/plain;charset=utf-8", text_list_convert, "COMPOUND_TEXT", 8 },
-  { "TEXT",          "text/plain;charset=utf-8", text_list_convert, "STRING",        8 },
-  { "STRING",        "text/plain;charset=utf-8", text_list_convert, "STRING",        8 },
-  { "TARGETS",       NULL,                       NULL,              "ATOM",          32 },
-  { "TIMESTAMP",     NULL,                       NULL,              "INTEGER",       32 },
-  { "SAVE_TARGETS",  NULL,                       NULL,              "NULL",          32 }
-};
-
 static void
 gdk_x11_drop_read_got_stream (GObject      *source,
                              GAsyncResult *res,
@@ -189,9 +145,9 @@ gdk_x11_drop_read_got_stream (GObject      *source,
    }
  else
    {
+#if 0
      gsize i;
      const char *mime_type = ((GSList *) g_task_get_task_data (task))->data;
-      GdkDrop *drop = GDK_DROP (g_task_get_source_object (task));

      for (i = 0; i < G_N_ELEMENTS (special_targets); i++)
        {
@@ -199,12 +155,15 @@ gdk_x11_drop_read_got_stream (GObject      *source,
            {
              g_assert (special_targets[i].mime_type != NULL);

+              GDK_DISPLAY_NOTE (CLIPBOARD, g_printerr ("%s: reading with converter from %s to %s\n",
+                                              cb->selection, mime_type, special_targets[i].mime_type));
              mime_type = g_intern_string (special_targets[i].mime_type);
              g_task_set_task_data (task, g_slist_prepend (NULL, (gpointer) mime_type), (GDestroyNotify) g_slist_free);
-              stream = special_targets[i].convert (gdk_drop_get_display (drop), stream, type, format);
+              stream = special_targets[i].convert (cb, stream, type, format);
              break;
            }
        }
+#endif

      GDK_NOTE (DND, g_printerr ("reading DND as %s now\n",
                                 (const char *)((GSList *) g_task_get_task_data (task))->data));
@@ -1383,7 +1383,7 @@ gdk_x11_keymap_translate_keyboard_state (GdkKeymap       *keymap,

      tmp_keyval = translate_keysym (keymap_x11, hardware_keycode,
                                     group, state,
-                                     effective_group, level);
+                                     level, effective_group);
    }

  if (consumed_modifiers)
@@ -149,10 +149,10 @@ render_glyph (GlyphCacheKey    *key,
  glyph_info.glyph = key->data.glyph;
  glyph_info.geometry.width = value->draw_width * 1024;
  if (glyph_info.glyph & PANGO_GLYPH_UNKNOWN_FLAG)
-    glyph_info.geometry.x_offset = 0;
+    glyph_info.geometry.x_offset = 250 * key->data.xshift;
  else
-    glyph_info.geometry.x_offset = - value->draw_x * 1024;
-  glyph_info.geometry.y_offset = - value->draw_y * 1024;
+    glyph_info.geometry.x_offset = 250 * key->data.xshift - value->draw_x * 1024;
+  glyph_info.geometry.y_offset = 250 * key->data.yshift - value->draw_y * 1024;

  glyph_string.num_glyphs = 1;
  glyph_string.glyphs = &glyph_info;
@@ -1452,6 +1452,7 @@ render_linear_gradient_node (GskGLRenderer   *self,
      ops_set_linear_gradient (builder,
                               n_color_stops,
                               stops,
+                               gsk_render_node_get_node_type (node) == GSK_REPEATING_LINEAR_GRADIENT_NODE,
                               builder->dx + start->x,
                               builder->dy + start->y,
                               builder->dx + end->x,
@@ -1485,6 +1486,7 @@ render_radial_gradient_node (GskGLRenderer   *self,
      ops_set_radial_gradient (builder,
                               n_color_stops,
                               stops,
+                               gsk_render_node_get_node_type (node) == GSK_REPEATING_RADIAL_GRADIENT_NODE,
                               builder->dx + center->x,
                               builder->dy + center->y,
                               start, end,
@@ -1510,7 +1512,7 @@ render_conic_gradient_node (GskGLRenderer   *self,
    {
      const GskColorStop *stops = gsk_conic_gradient_node_get_color_stops (node, NULL);
      const graphene_point_t *center = gsk_conic_gradient_node_get_center (node);
-      const float rotation = gsk_conic_gradient_node_get_rotation (node);
+      const float angle = gsk_conic_gradient_node_get_angle (node);

      ops_set_program (builder, &self->programs->conic_gradient_program);
      ops_set_conic_gradient (builder,
@@ -1518,7 +1520,7 @@ render_conic_gradient_node (GskGLRenderer   *self,
                              stops,
                              builder->dx + center->x,
                              builder->dy + center->y,
-                              rotation);
+                              angle);

      load_vertex_data (ops_draw (builder, NULL), &node->bounds, builder);
    }
@@ -3041,14 +3043,19 @@ apply_linear_gradient_op (const Program          *program,
                  op->n_color_stops.value * 5,
                  (float *)op->color_stops.value);

-  glUniform2f (program->linear_gradient.start_point_location, op->start_point[0], op->start_point[1]);
-  glUniform2f (program->linear_gradient.end_point_location, op->end_point[0], op->end_point[1]);
+  glUniform4f (program->linear_gradient.points_location,
+               op->start_point[0], op->start_point[1],
+               op->end_point[0] - op->start_point[0], op->end_point[1] - op->start_point[1]);
+  glUniform1i (program->linear_gradient.repeat_location, op->repeat);
 }

 static inline void
 apply_radial_gradient_op (const Program          *program,
                          const OpRadialGradient *op)
 {
+  float scale;
+  float bias;
+
  OP_PRINT (" -> Radial gradient");
  if (op->n_color_stops.send)
    glUniform1i (program->radial_gradient.num_color_stops_location, op->n_color_stops.value);
@@ -3058,16 +3065,23 @@ apply_radial_gradient_op (const Program          *program,
                  op->n_color_stops.value * 5,
                  (float *)op->color_stops.value);

-  glUniform1f (program->radial_gradient.start_location, op->start);
-  glUniform1f (program->radial_gradient.end_location, op->end);
-  glUniform2f (program->radial_gradient.radius_location, op->radius[0], op->radius[1]);
-  glUniform2f (program->radial_gradient.center_location, op->center[0], op->center[1]);
+  scale = 1.0f / (op->end - op->start);
+  bias = -op->start * scale;
+
+  glUniform1i (program->radial_gradient.repeat_location, op->repeat);
+  glUniform2f (program->radial_gradient.range_location, scale, bias);
+  glUniform4f (program->radial_gradient.geometry_location,
+               op->center[0], op->center[1],
+               1.0f / op->radius[0], 1.0f / op->radius[1]);
 }

 static inline void
 apply_conic_gradient_op (const Program         *program,
                         const OpConicGradient *op)
 {
+  float bias;
+  float scale;
+
  OP_PRINT (" -> Conic gradient");
  if (op->n_color_stops.send)
    glUniform1i (program->conic_gradient.num_color_stops_location, op->n_color_stops.value);
@@ -3077,8 +3091,9 @@ apply_conic_gradient_op (const Program         *program,
                  op->n_color_stops.value * 5,
                  (float *)op->color_stops.value);

-  glUniform1f (program->conic_gradient.rotation_location, op->rotation);
-  glUniform2f (program->conic_gradient.center_location, op->center[0], op->center[1]);
+  scale = 0.5f * M_1_PI;
+  bias = op->angle * scale + 2.0f;
+  glUniform4f (program->conic_gradient.geometry_location, op->center[0], op->center[1], scale, bias);
 }

 static inline void
@@ -3368,22 +3383,20 @@ gsk_gl_renderer_create_programs (GskGLRenderer  *self,
  /* linear gradient */
  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, color_stops);
  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, num_color_stops);
-  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, start_point);
-  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, end_point);
+  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, repeat);
+  INIT_PROGRAM_UNIFORM_LOCATION (linear_gradient, points);

  /* radial gradient */
  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, color_stops);
  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, num_color_stops);
-  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, center);
-  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, start);
-  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, end);
-  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, radius);
+  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, repeat);
+  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, geometry);
+  INIT_PROGRAM_UNIFORM_LOCATION (radial_gradient, range);

  /* conic gradient */
  INIT_PROGRAM_UNIFORM_LOCATION (conic_gradient, color_stops);
  INIT_PROGRAM_UNIFORM_LOCATION (conic_gradient, num_color_stops);
-  INIT_PROGRAM_UNIFORM_LOCATION (conic_gradient, center);
-  INIT_PROGRAM_UNIFORM_LOCATION (conic_gradient, rotation);
+  INIT_PROGRAM_UNIFORM_LOCATION (conic_gradient, geometry);

  /* blur */
  INIT_PROGRAM_UNIFORM_LOCATION (blur, blur_radius);
@@ -3729,10 +3742,12 @@ gsk_gl_renderer_add_render_ops (GskGLRenderer   *self,
    break;

    case GSK_LINEAR_GRADIENT_NODE:
+    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
      render_linear_gradient_node (self, node, builder);
    break;

    case GSK_RADIAL_GRADIENT_NODE:
+    case GSK_REPEATING_RADIAL_GRADIENT_NODE:
      render_radial_gradient_node (self, node, builder);
    break;

@@ -3799,8 +3814,6 @@ gsk_gl_renderer_add_render_ops (GskGLRenderer   *self,
      render_gl_shader_node (self, node, builder);
    break;

-    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
-    case GSK_REPEATING_RADIAL_GRADIENT_NODE:
    case GSK_CAIRO_NODE:
    default:
      {
@@ -3820,7 +3833,7 @@ add_offscreen_ops (GskGLRenderer         *self,
 {
  const float dx = builder->dx;
  const float dy = builder->dy;
-  float width, height;
+  float scaled_width, scaled_height;
  float scale_x;
  float scale_y;
  int render_target;
@@ -3876,8 +3889,6 @@ add_offscreen_ops (GskGLRenderer         *self,
      return TRUE;
    }

-  width = bounds->size.width;
-  height = bounds->size.height;
  scale_x = builder->scale_x;
  scale_y = builder->scale_y;

@@ -3888,23 +3899,23 @@ add_offscreen_ops (GskGLRenderer         *self,
  {
    const int max_texture_size = gsk_gl_driver_get_max_texture_size (self->gl_driver);

-    width = ceilf (width * scale_x);
-    if (width > max_texture_size)
+    scaled_width = ceilf (bounds->size.width * scale_x);
+    if (scaled_width > max_texture_size)
      {
-        scale_x *= (float)max_texture_size / width;
-        width = max_texture_size;
+        scale_x *= (float)max_texture_size / scaled_width;
+        scaled_width = max_texture_size;
      }

-    height = ceilf (height * scale_y);
-    if (height > max_texture_size)
+    scaled_height = ceilf (bounds->size.height * scale_y);
+    if (scaled_height > max_texture_size)
      {
-        scale_y *= (float)max_texture_size / height;
-        height = max_texture_size;
+        scale_y *= (float)max_texture_size / scaled_height;
+        scaled_height = max_texture_size;
      }
  }

  gsk_gl_driver_create_render_target (self->gl_driver,
-                                      width, height,
+                                      scaled_width, scaled_height,
                                      filter, filter,
                                      &texture_id, &render_target);
  if (gdk_gl_context_has_debug (self->gl_context))
@@ -3919,9 +3930,11 @@ add_offscreen_ops (GskGLRenderer         *self,
                                          render_target);
    }

-  viewport = GRAPHENE_RECT_INIT ((bounds->origin.x + dx) * scale_x,
-                                 (bounds->origin.y + dy) * scale_y,
-                                 width, height);
+  ops_transform_bounds_modelview (builder, bounds, &viewport);
+  /* Code above will scale the size with the scale we use in the render ops,
+   * but for the viewport size, we need our own size limited by the texture size */
+  viewport.size.width = scaled_width;
+  viewport.size.height = scaled_height;

  init_projection_matrix (&item_proj, &viewport);
  prev_render_target = ops_set_render_target (builder, render_target);
@@ -3949,7 +3962,7 @@ add_offscreen_ops (GskGLRenderer         *self,
                                             g_type_name_from_instance ((GTypeInstance *) child_node),
                                             child_node,
                                             k ++),
-                            width, height);
+                            scaled_width, scaled_height);
    }
 #endif

@@ -859,6 +859,7 @@ void
 ops_set_linear_gradient (RenderOpBuilder     *self,
                         guint                n_color_stops,
                         const GskColorStop  *color_stops,
+                         gboolean             repeat,
                         float                start_x,
                         float                start_y,
                         float                end_x,
@@ -912,6 +913,7 @@ ops_set_linear_gradient (RenderOpBuilder     *self,
              sizeof (GskColorStop) * real_n_color_stops);
    }

+  op->repeat = repeat;
  op->start_point[0] = start_x;
  op->start_point[1] = start_y;
  op->end_point[0] = end_x;
@@ -922,6 +924,7 @@ void
 ops_set_radial_gradient (RenderOpBuilder    *self,
                         guint               n_color_stops,
                         const GskColorStop *color_stops,
+                         gboolean            repeat,
                         float               center_x,
                         float               center_y,
                         float               start,
@@ -945,6 +948,7 @@ ops_set_radial_gradient (RenderOpBuilder    *self,
  op->radius[1] = vradius;
  op->start = start;
  op->end = end;
+  op->repeat = repeat;
 }

 void
@@ -953,7 +957,7 @@ ops_set_conic_gradient (RenderOpBuilder    *self,
                        const GskColorStop *color_stops,
                        float               center_x,
                        float               center_y,
-                        float               rotation)
+                        float               angle)
 {
  const guint real_n_color_stops = MIN (GL_MAX_GRADIENT_STOPS, n_color_stops);
  OpConicGradient *op;
@@ -967,6 +971,6 @@ ops_set_conic_gradient (RenderOpBuilder    *self,
  op->color_stops.send = true;
  op->center[0] = center_x;
  op->center[1] = center_y;
-  op->rotation = rotation;
+  op->angle = angle;
 }

@@ -118,22 +118,20 @@ struct _Program
    struct {
      int num_color_stops_location;
      int color_stops_location;
-      int start_point_location;
-      int end_point_location;
+      int points_location;
+      int repeat_location;
    } linear_gradient;
    struct {
      int num_color_stops_location;
      int color_stops_location;
-      int center_location;
-      int start_location;
-      int end_location;
-      int radius_location;
+      int geometry_location;
+      int range_location;
+      int repeat_location;
    } radial_gradient;
    struct {
      int num_color_stops_location;
      int color_stops_location;
-      int center_location;
-      int rotation_location;
+      int geometry_location;
    } conic_gradient;
    struct {
      int blur_radius_location;
@@ -319,6 +317,7 @@ void              ops_set_unblurred_outset_shadow   (RenderOpBuilder         *se
 void              ops_set_linear_gradient (RenderOpBuilder     *self,
                                           guint                n_color_stops,
                                           const GskColorStop  *color_stops,
+                                           gboolean             repeat,
                                           float                start_x,
                                           float                start_y,
                                           float                end_x,
@@ -326,6 +325,7 @@ void              ops_set_linear_gradient (RenderOpBuilder     *self,
 void              ops_set_radial_gradient (RenderOpBuilder        *self,
                                           guint                   n_color_stops,
                                           const GskColorStop     *color_stops,
+                                           gboolean                repeat,
                                           float                   center_x,
                                           float                   center_y,
                                           float                   start,
@@ -337,7 +337,7 @@ void              ops_set_conic_gradient  (RenderOpBuilder        *self,
                                           const GskColorStop     *color_stops,
                                           float                   center_x,
                                           float                   center_y,
-                                           float                   rotation);
+                                           float                   angle);

 GskQuadVertex *   ops_draw               (RenderOpBuilder        *builder,
                                          const GskQuadVertex     vertex_data[GL_N_VERTICES]);
@@ -234,7 +234,7 @@ gsk_gl_shader_builder_create_program (GskGLShaderBuilder  *self,
  glAttachShader (program_id, vertex_id);
  glAttachShader (program_id, fragment_id);
  glBindAttribLocation (program_id, 0, "aPosition");
-  glBindAttribLocation (program_id, 1, "vUv");
+  glBindAttribLocation (program_id, 1, "aUv");
  glLinkProgram (program_id);
  glDetachShader (program_id, vertex_id);
  glDetachShader (program_id, fragment_id);
@@ -146,6 +146,7 @@ typedef struct
  IntUniformValue n_color_stops;
  float start_point[2];
  float end_point[2];
+  gboolean repeat;
 } OpLinearGradient;

 typedef struct
@@ -156,6 +157,7 @@ typedef struct
  float end;
  float radius[2];
  float center[2];
+  gboolean repeat;
 } OpRadialGradient;

 typedef struct
@@ -163,7 +165,7 @@ typedef struct
  ColorStopUniformValue color_stops;
  IntUniformValue n_color_stops;
  float center[2];
-  float rotation;
+  float angle;
 } OpConicGradient;

 typedef struct
@@ -257,6 +257,8 @@ const graphene_point_t * gsk_conic_gradient_node_get_center         (GskRenderNo
 GDK_AVAILABLE_IN_ALL
 float                    gsk_conic_gradient_node_get_rotation       (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
+float                    gsk_conic_gradient_node_get_angle          (GskRenderNode            *node);
+GDK_AVAILABLE_IN_ALL
 gsize                    gsk_conic_gradient_node_get_n_color_stops  (GskRenderNode            *node);
 GDK_AVAILABLE_IN_ALL
 const GskColorStop *     gsk_conic_gradient_node_get_color_stops    (GskRenderNode            *node,
@@ -782,6 +782,7 @@ struct _GskConicGradientNode

  graphene_point_t center;
  float rotation;
+  float angle;

  gsize n_stops;
  GskColorStop *stops;
@@ -1023,6 +1024,12 @@ gsk_conic_gradient_node_new (const graphene_rect_t  *bounds,
  self->stops = g_malloc_n (n_color_stops, sizeof (GskColorStop));
  memcpy (self->stops, color_stops, n_color_stops * sizeof (GskColorStop));

+  self->angle = 90.f - self->rotation;
+  self->angle = G_PI * self->angle / 180.f;
+  self->angle = fmodf (self->angle, 2.f * G_PI);
+  if (self->angle < 0.f)
+    self->angle += 2.f * G_PI;
+
  return node;
 }

@@ -1095,6 +1102,26 @@ gsk_conic_gradient_node_get_rotation (GskRenderNode *node)
  return self->rotation;
 }

+/**
+ * gsk_conic_gradient_node_get_angle:
+ * @node: (type GskConicGradientNode): a #GskRenderNode for a conic gradient
+ *
+ * Retrieves the angle for the gradient in radians, normalized in [0, 2 * PI]
+ *
+ * The angle is starting at the top and going clockwise, as expressed
+ * in the css specification:
+ * angle = 90 - gsk_conic_gradient_node_get_rotation()
+ *
+ * Returns: the angle for the gradient
+ */
+float
+gsk_conic_gradient_node_get_angle (GskRenderNode *node)
+{
+  GskConicGradientNode *self = (GskConicGradientNode *) node;
+
+  return self->angle;
+}
+
 /*** GSK_BORDER_NODE ***/

 /**
@@ -689,14 +689,16 @@ create_ascii_glyphs (PangoFont *font)
  for (i = MIN_ASCII_GLYPH; i < MAX_ASCII_GLYPH; i++)
    {
      const char text[2] = { i, 0 };
+      PangoShapeFlags flags = 0;

-      pango_shape_with_flags (text,
-                              1,
-                              text,
-                              1,
+      if (cairo_version () < CAIRO_VERSION_ENCODE (1, 17, 4))
+        flags = PANGO_SHAPE_ROUND_POSITIONS;
+
+      pango_shape_with_flags (text, 1,
+                              text, 1,
                              &not_a_hack,
                              glyph_string,
-                              PANGO_SHAPE_ROUND_POSITIONS);
+                              flags);

      if (glyph_string->num_glyphs != 1)
        {
@@ -1392,7 +1394,7 @@ parse_cairo_node (GtkCssParser *parser)
  if (surface != NULL)
    {
      cairo_t *cr = gsk_cairo_node_get_draw_context (node);
-      cairo_set_source_surface (cr, surface, 0, 0);
+      cairo_set_source_surface (cr, surface, bounds.origin.x, bounds.origin.y);
      cairo_paint (cr);
      cairo_destroy (cr);
    }
@@ -1,34 +1,17 @@
 // VERTEX_SHADER
-uniform vec2 u_center;
-uniform float u_rotation;
-uniform float u_color_stops[6 * 5];
-uniform int u_num_color_stops;
+uniform vec4 u_geometry;

-const float PI = 3.1415926535897932384626433832795;
-
-_OUT_ vec2 center;
-_OUT_ float rotation;
-_OUT_ vec4 color_stops[6];
-_OUT_ float color_offsets[6];
+_NOPERSPECTIVE_ _OUT_ vec2 coord;

 void main() {
-  gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
+  gl_Position = u_projection * (u_modelview * vec4(aPosition, 0.0, 1.0));

-  // The -90 is because conics point to the top by default
-  rotation = mod (u_rotation - 90.0, 360.0);
-  if (rotation < 0.0)
-    rotation += 360.0;
-  rotation = PI / 180.0 * rotation;
+  vec2 mv0 = u_modelview[0].xy;
+  vec2 mv1 = u_modelview[1].xy;
+  vec2 offset = aPosition - u_geometry.xy;

-  center = (u_modelview * vec4(u_center, 0, 1)).xy;
-
-  for (int i = 0; i < u_num_color_stops; i ++) {
-    color_offsets[i] = u_color_stops[(i * 5) + 0];
-    color_stops[i] = gsk_premultiply(vec4(u_color_stops[(i * 5) + 1],
-                                          u_color_stops[(i * 5) + 2],
-                                          u_color_stops[(i * 5) + 3],
-                                          u_color_stops[(i * 5) + 4]));
-  }
+  coord = vec2(dot(mv0, offset),
+               dot(mv1, offset));
 }

 // FRAGMENT_SHADER:
@@ -38,32 +21,53 @@ uniform int u_num_color_stops;
 uniform highp int u_num_color_stops; // Why? Because it works like this.
 #endif

-const float PI = 3.1415926535897932384626433832795;
+uniform vec4 u_geometry;
+uniform float u_color_stops[6 * 5];

-_IN_ vec2 center;
-_IN_ float rotation;
-_IN_ vec4 color_stops[6];
-_IN_ float color_offsets[6];
+_NOPERSPECTIVE_ _IN_ vec2 coord;
+
+float get_offset(int index) {
+  return u_color_stops[5 * index];
+}
+
+vec4 get_color(int index) {
+  int base = 5 * index + 1;
+
+  return vec4(u_color_stops[base],
+              u_color_stops[base + 1],
+              u_color_stops[base + 2],
+              u_color_stops[base + 3]);
+}

 void main() {
-  // Position relative to center
-  vec2 pos = gsk_get_frag_coord() - center;
-
  // direction of point in range [-PI, PI]
-  float angle = atan (pos.y, pos.x);
-  // rotate, it's now [-2 * PI, PI]
-  angle -= rotation;
+  vec2 pos = floor(coord);
+  float angle = atan(pos.y, pos.x);
+
  // fract() does the modulo here, so now we have progress
  // into the current conic
-  float offset = fract (angle / 2.0 / PI + 2.0);
+  float offset = fract(angle * u_geometry.z + u_geometry.w);

-  vec4 color = color_stops[0];
-  for (int i = 1; i < u_num_color_stops; i ++) {
-    if (offset >= color_offsets[i - 1])  {
-      float o = (offset - color_offsets[i - 1]) / (color_offsets[i] - color_offsets[i - 1]);
-      color = mix(color_stops[i - 1], color_stops[i], clamp(o, 0.0, 1.0));
+  if (offset < get_offset(0)) {
+    gskSetOutputColor(gsk_scaled_premultiply(get_color(0), u_alpha));
+    return;
+  }
+
+  int n = u_num_color_stops - 1;
+  for (int i = 0; i < n; i++) {
+    float curr_offset = get_offset(i);
+    float next_offset = get_offset(i + 1);
+
+    if (offset >= curr_offset && offset < next_offset) {
+      float f = (offset - curr_offset) / (next_offset - curr_offset);
+      vec4 curr_color = gsk_premultiply(get_color(i));
+      vec4 next_color = gsk_premultiply(get_color(i + 1));
+      vec4 color = mix(curr_color, next_color, f);
+
+      gskSetOutputColor(color * u_alpha);
+      return;
    }
  }

-  gskSetOutputColor(color * u_alpha);
+  gskSetOutputColor(gsk_scaled_premultiply(get_color(n), u_alpha));
 }
@@ -1,35 +1,41 @@
 // VERTEX_SHADER
-uniform vec2 u_start_point;
-uniform vec2 u_end_point;
-uniform float u_color_stops[6 * 5];
-uniform int u_num_color_stops;
+uniform vec4 u_points;

-_OUT_ vec2 startPoint;
-_OUT_ vec2 endPoint;
-_OUT_ float maxDist;
-_OUT_ vec2 gradient;
-_OUT_ float gradientLength;
-_OUT_ vec4 color_stops[6];
-_OUT_ float color_offsets[6];
+_NOPERSPECTIVE_ _OUT_ vec4 info;

 void main() {
-  gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
+  gl_Position = u_projection * (u_modelview * vec4(aPosition, 0.0, 1.0));

-  startPoint = (u_modelview * vec4(u_start_point, 0, 1)).xy;
-  endPoint   = (u_modelview * vec4(u_end_point,   0, 1)).xy;
-  maxDist    = length(endPoint - startPoint);
+  vec2 mv0 = u_modelview[0].xy;
+  vec2 mv1 = u_modelview[1].xy;
+  vec2 offset = aPosition - u_points.xy;
+  vec2 coord = vec2(dot(mv0, offset),
+                    dot(mv1, offset));

-  // Gradient direction
-  gradient = endPoint - startPoint;
-  gradientLength = length(gradient);
+  // Original equation:
+  // VS | maxDist = length(end - start);
+  // VS | gradient = end - start;
+  // VS | gradientLength = length(gradient);
+  // FS | pos = frag_coord - start
+  // FS | proj = (dot(gradient, pos) / (gradientLength * gradientLength)) * gradient
+  // FS | offset = length(proj) / maxDist

-  for (int i = 0; i < u_num_color_stops; i ++) {
-    color_offsets[i] = u_color_stops[(i * 5) + 0];
-    color_stops[i] = gsk_premultiply(vec4(u_color_stops[(i * 5) + 1],
-                                          u_color_stops[(i * 5) + 2],
-                                          u_color_stops[(i * 5) + 3],
-                                          u_color_stops[(i * 5) + 4]));
-  }
+  // Simplified formula derivation:
+  // 1. Notice that maxDist = gradientLength:
+  // offset = length(proj) / gradientLength
+  // 2. Let gnorm = gradient / gradientLength, then:
+  // proj = (dot(gnorm * gradientLength, pos) / (gradientLength * gradientLength)) * (gnorm * gradientLength) =
+  //      = dot(gnorm, pos) * gnorm
+  // 3. Since gnorm is unit length then:
+  // length(proj) = length(dot(gnorm, pos) * gnorm) = dot(gnorm, pos)
+  // 4. We can avoid the FS division by passing a scaled pos from the VS:
+  // offset = dot(gnorm, pos) / gradientLength = dot(gnorm, pos / gradientLength)
+  // 5. 1.0 / length(gradient) is inversesqrt(dot(gradient, gradient)) in GLSL
+  vec2 gradient = vec2(dot(mv0, u_points.zw),
+                       dot(mv1, u_points.zw));
+  float rcp_gradient_length = inversesqrt(dot(gradient, gradient));
+
+  info = rcp_gradient_length * vec4(coord, gradient);
 }

 // FRAGMENT_SHADER:
@@ -39,32 +45,51 @@ uniform int u_num_color_stops;
 uniform highp int u_num_color_stops; // Why? Because it works like this.
 #endif

-_IN_ vec2 startPoint;
-_IN_ vec2 endPoint;
-_IN_ float maxDist;
-_IN_ vec2 gradient;
-_IN_ float gradientLength;
-_IN_ vec4 color_stops[6];
-_IN_ float color_offsets[6];
+uniform float u_color_stops[6 * 5];
+uniform bool u_repeat;
+
+_NOPERSPECTIVE_ _IN_ vec4 info;
+
+float get_offset(int index) {
+  return u_color_stops[5 * index];
+}
+
+vec4 get_color(int index) {
+  int base = 5 * index + 1;
+
+  return vec4(u_color_stops[base],
+              u_color_stops[base + 1],
+              u_color_stops[base + 2],
+              u_color_stops[base + 3]);
+}

 void main() {
-  // Position relative to startPoint
-  vec2 pos = gsk_get_frag_coord() - startPoint;
+  float offset = dot(info.xy, info.zw);

-  // Current pixel, projected onto the line between the start point and the end point
-  // The projection will be relative to the start point!
-  vec2 proj = (dot(gradient, pos) / (gradientLength * gradientLength)) * gradient;
+  if (u_repeat) {
+    offset = fract(offset);
+  }

-  // Offset of the current pixel
-  float offset = length(proj) / maxDist;
+  if (offset < get_offset(0)) {
+    gskSetOutputColor(gsk_scaled_premultiply(get_color(0), u_alpha));
+    return;
+  }

-  vec4 color = color_stops[0];
-  for (int i = 1; i < u_num_color_stops; i ++) {
-    if (offset >= color_offsets[i - 1])  {
-      float o = (offset - color_offsets[i - 1]) / (color_offsets[i] - color_offsets[i - 1]);
-      color = mix(color_stops[i - 1], color_stops[i], clamp(o, 0.0, 1.0));
+  int n = u_num_color_stops - 1;
+  for (int i = 0; i < n; i++) {
+    float curr_offset = get_offset(i);
+    float next_offset = get_offset(i + 1);
+
+    if (offset >= curr_offset && offset < next_offset) {
+      float f = (offset - curr_offset) / (next_offset - curr_offset);
+      vec4 curr_color = gsk_premultiply(get_color(i));
+      vec4 next_color = gsk_premultiply(get_color(i + 1));
+      vec4 color = mix(curr_color, next_color, f);
+
+      gskSetOutputColor(color * u_alpha);
+      return;
    }
  }

-  gskSetOutputColor(color * u_alpha);
+  gskSetOutputColor(gsk_scaled_premultiply(get_color(n), u_alpha));
 }
@@ -5,10 +5,12 @@ precision highp float;
 #if defined(GSK_GLES) || defined(GSK_LEGACY)
 #define _OUT_ varying
 #define _IN_ varying
+#define _NOPERSPECTIVE_
 #define _GSK_ROUNDED_RECT_UNIFORM_ vec4[3]
 #else
 #define _OUT_ out
 #define _IN_ in
+#define _NOPERSPECTIVE_ noperspective
 #define _GSK_ROUNDED_RECT_UNIFORM_ GskRoundedRect
 #endif

@@ -39,3 +41,11 @@ gsk_create_rect(vec4[3] data)
 vec4 gsk_premultiply(vec4 c) {
  return vec4(c.rgb * c.a, c.a);
 }
+
+vec4 gsk_scaled_premultiply(vec4 c, float s) {
+  // Fast version of gsk_premultiply(c) * s
+  // 4 muls instead of 7
+  float a = s * c.a;
+
+  return vec4(c.rgb * a, a);
+}
@@ -1,31 +1,18 @@
 // VERTEX_SHADER
-uniform float u_start;
-uniform float u_end;
-uniform float u_color_stops[6 * 5];
-uniform int u_num_color_stops;
-uniform vec2 u_radius;
-uniform vec2 u_center;
+uniform vec4 u_geometry;

-_OUT_ vec2 center;
-_OUT_ vec4 color_stops[6];
-_OUT_ float color_offsets[6];
-_OUT_ float start;
-_OUT_ float end;
+_NOPERSPECTIVE_ _OUT_ vec2 coord;

 void main() {
-  gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
+  gl_Position = u_projection * (u_modelview * vec4(aPosition, 0.0, 1.0));

-  center = (u_modelview * vec4(u_center, 0, 1)).xy;
-  start = u_start;
-  end = u_end;
+  vec2 mv0 = u_modelview[0].xy;
+  vec2 mv1 = u_modelview[1].xy;
+  vec2 offset = aPosition - u_geometry.xy;
+  vec2 dir = vec2(dot(mv0, offset),
+                  dot(mv1, offset));

-  for (int i = 0; i < u_num_color_stops; i ++) {
-    color_offsets[i] = u_color_stops[(i * 5) + 0];
-    color_stops[i] = gsk_premultiply(vec4(u_color_stops[(i * 5) + 1],
-                                          u_color_stops[(i * 5) + 2],
-                                          u_color_stops[(i * 5) + 3],
-                                          u_color_stops[(i * 5) + 4]));
-  }
+  coord = dir * u_geometry.zw;
 }

 // FRAGMENT_SHADER:
@@ -35,50 +22,53 @@ uniform int u_num_color_stops;
 uniform highp int u_num_color_stops;
 #endif

-uniform vec2 u_radius;
-uniform float u_end;
+uniform bool u_repeat;
+uniform vec2 u_range;
+uniform float u_color_stops[6 * 5];

-_IN_ vec2 center;
-_IN_ vec4 color_stops[6];
-_IN_ float color_offsets[6];
-_IN_ float start;
-_IN_ float end;
+_NOPERSPECTIVE_ _IN_ vec2 coord;

-// The offsets in the color stops are relative to the
-// start and end values of the gradient.
-float abs_offset(float offset)  {
-  return start + ((end - start) * offset);
+float get_offset(int index) {
+  return u_color_stops[5 * index];
+}
+
+vec4 get_color(int index) {
+  int base = 5 * index + 1;
+
+  return vec4(u_color_stops[base],
+              u_color_stops[base + 1],
+              u_color_stops[base + 2],
+              u_color_stops[base + 3]);
 }

 void main() {
-  vec2 pixel = gsk_get_frag_coord();
-  vec2 rel = (center - pixel) / (u_radius);
-  float d = sqrt(dot(rel, rel));
+  // Reverse scale
+  float offset = length(coord) * u_range.x + u_range.y;

-  if (d < abs_offset (color_offsets[0])) {
-    gskSetOutputColor(color_stops[0] * u_alpha);
+  if (u_repeat) {
+    offset = fract(offset);
+  }
+
+  if (offset < get_offset(0)) {
+    gskSetOutputColor(gsk_scaled_premultiply(get_color(0), u_alpha));
    return;
  }

-  if (d > end) {
-    gskSetOutputColor(color_stops[u_num_color_stops - 1] * u_alpha);
-    return;
-  }
+  int n = u_num_color_stops - 1;
+  for (int i = 0; i < n; i++) {
+    float curr_offset = get_offset(i);
+    float next_offset = get_offset(i + 1);

-  vec4 color = vec4(0, 0, 0, 0);
-  for (int i = 1; i < u_num_color_stops; i++) {
-    float last_offset = abs_offset(color_offsets[i - 1]);
-    float this_offset = abs_offset(color_offsets[i]);
+    if (offset >= curr_offset && offset < next_offset) {
+      float f = (offset - curr_offset) / (next_offset - curr_offset);
+      vec4 curr_color = gsk_premultiply(get_color(i));
+      vec4 next_color = gsk_premultiply(get_color(i + 1));
+      vec4 color = mix(curr_color, next_color, f);

-    // We have color_stops[i - 1] at last_offset and color_stops[i] at this_offset.
-    // We now need to map `d` between those two offsets and simply mix linearly between them
-    if (d >= last_offset && d <= this_offset) {
-      float f = (d - last_offset) / (this_offset - last_offset);
-
-      color = mix(color_stops[i - 1], color_stops[i], f);
-      break;
+      gskSetOutputColor(color * u_alpha);
+      return;
    }
  }

-  gskSetOutputColor(color * u_alpha);
+  gskSetOutputColor(gsk_scaled_premultiply(get_color(n), u_alpha));
 }
@@ -718,7 +718,7 @@ gsk_vulkan_image_upload_regions (GskVulkanImage    *self,
        }
      else
        {
-          for (gsize r = 0; r < regions[i].height; r++)
+          for (gsize r = 0; r < regions[i].height; i++)
            memcpy (m + r * regions[i].width * 4, regions[i].data + r * regions[i].stride, regions[i].width * 4);
        }

@@ -68,8 +68,10 @@ action_handle_method (GtkAtSpiContext        *self,

      g_variant_get (parameters, "(i)", &idx);

+      const Action *action = &actions[idx];
+
      if (idx >= 0 && idx < n_actions)
-        g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", actions[idx].name));
+        g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", action->name));
      else
        g_dbus_method_invocation_return_error (invocation,
                                               G_IO_ERROR,
@@ -127,8 +129,10 @@ action_handle_method (GtkAtSpiContext        *self,

      g_variant_get (parameters, "(i)", &idx);

+      const Action *action = &actions[idx];
+
      if (idx >= 0 && idx < n_actions)
-        g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", actions[idx].keybinding));
+        g_dbus_method_invocation_return_value (invocation, g_variant_new ("(s)", action->keybinding));
      else
        g_dbus_method_invocation_return_error (invocation,
                                               G_IO_ERROR,
@@ -63,17 +63,12 @@ xml += '\n'
 for f in get_files('theme/HighContrast/assets', '.svg'):
  xml += '    <file>theme/HighContrast/assets/{0}</file>\n'.format(f)

-for f in get_files('gesture', '.symbolic.png'):
-  xml += '    <file alias=\'icons/64x64/actions/{0}\'>gesture/{0}</file>\n'.format(f)
-
-xml += '\n'
-
 for f in get_files('ui', '.ui'):
  xml += '    <file preprocess=\'xml-stripblanks\'>ui/{0}</file>\n'.format(f)

 xml += '\n'

-for s in ['16x16', '24x24', '32x32', '48x48', 'scalable']:
+for s in ['16x16', '32x32', '64x64', 'scalable']:
  for c in ['actions', 'categories', 'emblems', 'emotes', 'devices', 'mimetypes', 'places', 'status']:
    icons_dir = 'icons/{0}/{1}'.format(s,c)
    if os.path.exists(os.path.join(srcdir,icons_dir)):
@@ -67,7 +67,6 @@
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"


@@ -25,9 +25,9 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcssnodeprivate.h"

 /**
 * SECTION:gtkboxlayout
@@ -20,7 +20,7 @@

 #include "config.h"

-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkbuiltiniconprivate.h"
 #include "gtkwidgetprivate.h"
@@ -80,10 +80,11 @@ gtk_builtin_icon_measure (GtkWidget      *widget,
                          int            *minimum_baseline,
                          int            *natural_baseline)
 {
-  GtkCssValue *icon_size;
+  GtkCssStyle *style;

-  icon_size = _gtk_style_context_peek_property (gtk_widget_get_style_context (widget), GTK_CSS_PROPERTY_ICON_SIZE);
-  *minimum = *natural = _gtk_css_number_value_get (icon_size, 100);
+  style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));
+
+  *minimum = *natural = _gtk_css_number_value_get (style->icon->icon_size, 100);
 }

 static void
@@ -103,7 +103,6 @@
 #include "gtkprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturedrag.h"
@@ -23,8 +23,8 @@
 #include "gtklayoutchild.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcssnodeprivate.h"

 /**
 * SECTION:gtkcenterlayout
@@ -58,12 +58,13 @@ G_DEFINE_TYPE (GtkCenterLayout, gtk_center_layout, GTK_TYPE_LAYOUT_MANAGER)

 static int
 get_spacing (GtkCenterLayout *self,
-             GtkStyleContext *style_context)
+             GtkCssNode      *node)
 {
+  GtkCssStyle *style = gtk_css_node_get_style (node);
  GtkCssValue *border_spacing;
  int css_spacing;

-  border_spacing = _gtk_style_context_peek_property (style_context, GTK_CSS_PROPERTY_BORDER_SPACING);
+  border_spacing = style->size->border_spacing;
  if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
    css_spacing = _gtk_css_position_value_get_x (border_spacing, 100);
  else
@@ -226,7 +227,7 @@ gtk_center_layout_measure_orientation (GtkCenterLayout *self,
  int spacing;
  int i;

-  spacing = get_spacing (self, _gtk_widget_get_style_context (widget));
+  spacing = get_spacing (self, gtk_widget_get_css_node (widget));

  for (i = 0; i < 3; i ++)
    {
@@ -386,7 +387,7 @@ gtk_center_layout_allocate (GtkLayoutManager *layout_manager,
  int i;
  int spacing;

-  spacing = get_spacing (self, _gtk_widget_get_style_context (widget));
+  spacing = get_spacing (self, gtk_widget_get_css_node (widget));

  if (self->orientation == GTK_ORIENTATION_HORIZONTAL)
    {
@@ -34,7 +34,8 @@
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkshortcuttrigger.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkmodelbuttonprivate.h"

@@ -94,6 +95,7 @@ enum {

 enum {
  TOGGLED,
+  ACTIVATE,
  LAST_SIGNAL
 };

@@ -442,11 +444,26 @@ gtk_check_button_focus (GtkWidget         *widget,
    }
 }

+static void
+gtk_check_button_real_activate (GtkCheckButton *check_button)
+{
+  gtk_check_button_set_active (check_button,
+                               !gtk_check_button_get_active (check_button));
+}
+
 static void
 gtk_check_button_class_init (GtkCheckButtonClass *class)
 {
+  const guint activate_keyvals[] = {
+    GDK_KEY_space,
+    GDK_KEY_KP_Space,
+    GDK_KEY_Return,
+    GDK_KEY_ISO_Enter,
+    GDK_KEY_KP_Enter
+  };
  GObjectClass *object_class = G_OBJECT_CLASS (class);
  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
+  GtkShortcutAction *activate_action;

  object_class->dispose = gtk_check_button_dispose;
  object_class->set_property = gtk_check_button_set_property;
@@ -454,6 +471,8 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)

  widget_class->focus = gtk_check_button_focus;

+  class->activate = gtk_check_button_real_activate;
+
  props[PROP_ACTIVE] =
      g_param_spec_boolean ("active",
                            P_("Active"),
@@ -507,6 +526,37 @@ gtk_check_button_class_init (GtkCheckButtonClass *class)
                  NULL,
                  G_TYPE_NONE, 0);

+  /**
+   * GtkCheckButton::activate:
+   * @widget: the object which received the signal.
+   *
+   * The ::activate signal on GtkCheckButton is an action signal and
+   * emitting it causes the button to animate press then release.
+   * Applications should never connect to this signal, but use the
+   * #GtkCheckButton::toggled signal.
+   */
+  signals[ACTIVATE] =
+      g_signal_new (I_ ("activate"),
+                    G_OBJECT_CLASS_TYPE (object_class),
+                    G_SIGNAL_RUN_FIRST | G_SIGNAL_ACTION,
+                    G_STRUCT_OFFSET (GtkCheckButtonClass, activate),
+                    NULL, NULL,
+                    NULL,
+                    G_TYPE_NONE, 0);
+
+  gtk_widget_class_set_activate_signal (widget_class, signals[ACTIVATE]);
+
+  activate_action = gtk_signal_action_new ("activate");
+  for (guint i = 0; i < G_N_ELEMENTS (activate_keyvals); i++)
+    {
+      GtkShortcut *activate_shortcut = gtk_shortcut_new (gtk_keyval_trigger_new (activate_keyvals[i], 0),
+                                                         g_object_ref (activate_action));
+
+      gtk_widget_class_add_shortcut (widget_class, activate_shortcut);
+      g_object_unref (activate_shortcut);
+    }
+  g_object_unref (activate_action);
+
  gtk_widget_class_set_layout_manager_type (widget_class, GTK_TYPE_BOX_LAYOUT);
  gtk_widget_class_set_css_name (widget_class, I_("checkbutton"));
  gtk_widget_class_set_accessible_role (widget_class, GTK_ACCESSIBLE_ROLE_CHECKBOX);
@@ -56,9 +56,10 @@ struct _GtkCheckButtonClass
  GtkWidgetClass parent_class;

  void (* toggled) (GtkCheckButton *check_button);
+  void (* activate) (GtkCheckButton *check_button);

  /*< private >*/
-  gpointer padding[8];
+  gpointer padding[7];
 };


@@ -34,7 +34,6 @@
 #include "gtkpopovermenu.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtknative.h"
@@ -28,7 +28,7 @@
 #include "gtklabel.h"
 #include "gtkwidgetprivate.h"
 #include "gtkbox.h"
-#include "gtkimage.h"
+#include "gtkbuiltiniconprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkpopovermenu.h"
 #include "gtknative.h"
@@ -266,7 +266,7 @@ gtk_column_view_title_init (GtkColumnViewTitle *self)
  self->title = gtk_label_new (NULL);
  gtk_box_append (GTK_BOX (self->box), self->title);

-  self->sort = gtk_image_new ();
+  self->sort = gtk_builtin_icon_new ("sort-indicator");
  gtk_box_append (GTK_BOX (self->box), self->sort);

  gesture = gtk_gesture_click_new ();
@@ -308,15 +308,15 @@ gtk_column_view_title_update (GtkColumnViewTitle *self)
      active = gtk_column_view_sorter_get_sort_column (view_sorter, &inverted);

      gtk_widget_show (self->sort);
-      if (self->column == active)
-        {
-          if (inverted)
-            gtk_image_set_from_icon_name (GTK_IMAGE (self->sort), "pan-down-symbolic");
-          else
-            gtk_image_set_from_icon_name (GTK_IMAGE (self->sort), "pan-up-symbolic");
-        }
+      gtk_widget_remove_css_class (self->sort, "ascending");
+      gtk_widget_remove_css_class (self->sort, "descending");
+      gtk_widget_remove_css_class (self->sort, "unsorted");
+      if (self->column != active)
+        gtk_widget_add_css_class (self->sort, "unsorted");
+      else if (inverted)
+        gtk_widget_add_css_class (self->sort, "descending");
      else
-        gtk_image_clear (GTK_IMAGE (self->sort));
+        gtk_widget_add_css_class (self->sort, "ascending");
    }
  else
    gtk_widget_hide (self->sort);
@@ -440,6 +440,10 @@ gtk_css_animated_style_set_animated_value (GtkCssAnimatedStyle *animated,
      unshare_other (animated);
      gtk_css_take_value (&style->other->transform, value);
      break;
+    case GTK_CSS_PROPERTY_TRANSFORM_ORIGIN:
+      unshare_other (animated);
+      gtk_css_take_value (&style->other->transform_origin, value);
+      break;
    case GTK_CSS_PROPERTY_MIN_WIDTH:
      unshare_size (animated);
      gtk_css_take_value (&style->size->min_width, value);
@@ -218,7 +218,7 @@ _gtk_css_border_value_parse (GtkCssParser           *parser,
    }

  result->is_computed = TRUE;
-  for (i = 0; i < 4; i++)
+  for (; i < 4; i++)
    if (result->values[i] && !gtk_css_value_is_computed (result->values[i]))
      {
        result->is_computed = FALSE;
@@ -545,57 +545,6 @@ _gtk_css_font_stretch_value_get (const GtkCssValue *value)
  return value->value;
 }

-/* GtkTextDecorationLine */
-
-static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_LINE = {
-  "GtkCssTextDecorationLineValue",
-  gtk_css_value_enum_free,
-  gtk_css_value_enum_compute,
-  gtk_css_value_enum_equal,
-  gtk_css_value_enum_transition,
-  NULL,
-  NULL,
-  gtk_css_value_enum_print
-};
-
-static GtkCssValue text_decoration_line_values[] = {
-  { &GTK_CSS_VALUE_TEXT_DECORATION_LINE, 1, TRUE, GTK_CSS_TEXT_DECORATION_LINE_NONE, "none" },
-  { &GTK_CSS_VALUE_TEXT_DECORATION_LINE, 1, TRUE, GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE, "underline" },
-  { &GTK_CSS_VALUE_TEXT_DECORATION_LINE, 1, TRUE, GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH, "line-through" },
-};
-
-GtkCssValue *
-_gtk_css_text_decoration_line_value_new (GtkTextDecorationLine line)
-{
-  g_return_val_if_fail (line < G_N_ELEMENTS (text_decoration_line_values), NULL);
-
-  return _gtk_css_value_ref (&text_decoration_line_values[line]);
-}
-
-GtkCssValue *
-_gtk_css_text_decoration_line_value_try_parse (GtkCssParser *parser)
-{
-  guint i;
-
-  g_return_val_if_fail (parser != NULL, NULL);
-
-  for (i = 0; i < G_N_ELEMENTS (text_decoration_line_values); i++)
-    {
-      if (gtk_css_parser_try_ident (parser, text_decoration_line_values[i].name))
-        return _gtk_css_value_ref (&text_decoration_line_values[i]);
-    }
-
-  return NULL;
-}
-
-GtkTextDecorationLine
-_gtk_css_text_decoration_line_value_get (const GtkCssValue *value)
-{
-  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_TEXT_DECORATION_LINE, GTK_CSS_TEXT_DECORATION_LINE_NONE);
-
-  return value->value;
-}
-
 /* GtkTextDecorationStyle */

 static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_STYLE = {
@@ -1203,6 +1152,99 @@ gtk_css_value_flags_print (const FlagsValue  *values,
    }
 }

+/* GtkTextDecorationLine */
+
+static FlagsValue text_decoration_line_values[] = {
+  { GTK_CSS_TEXT_DECORATION_LINE_NONE, "none" },
+  { GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE, "underline" },
+  { GTK_CSS_TEXT_DECORATION_LINE_OVERLINE, "overline" },
+  { GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH, "line-through" },
+};
+
+static void
+gtk_css_text_decoration_line_value_print (const GtkCssValue *value,
+                                          GString           *string)
+{
+  gtk_css_value_flags_print (text_decoration_line_values,
+                             G_N_ELEMENTS (text_decoration_line_values),
+                             value, string);
+}
+
+static const GtkCssValueClass GTK_CSS_VALUE_TEXT_DECORATION_LINE = {
+  "GtkCssTextDecorationLine",
+  gtk_css_value_enum_free,
+  gtk_css_value_enum_compute,
+  gtk_css_value_flags_equal,
+  gtk_css_value_enum_transition,
+  NULL,
+  NULL,
+  gtk_css_text_decoration_line_value_print
+};
+
+static gboolean
+text_decoration_line_is_valid (GtkTextDecorationLine line)
+{
+  if ((line & GTK_CSS_TEXT_DECORATION_LINE_NONE) &&
+      (line != GTK_CSS_TEXT_DECORATION_LINE_NONE))
+    return FALSE;
+
+  return TRUE;
+}
+
+GtkCssValue *
+_gtk_css_text_decoration_line_value_new (GtkTextDecorationLine line)
+{
+  GtkCssValue *value;
+
+  if (!text_decoration_line_is_valid (line))
+    return NULL;
+
+  value = _gtk_css_value_new (GtkCssValue, &GTK_CSS_VALUE_TEXT_DECORATION_LINE);
+  value->value = line;
+  value->name = NULL;
+  value->is_computed = TRUE;
+
+  return value;
+}
+
+GtkTextDecorationLine
+_gtk_css_text_decoration_line_try_parse_one (GtkCssParser          *parser,
+                                             GtkTextDecorationLine  base)
+{
+  guint i;
+  GtkTextDecorationLine value = 0;
+
+  g_return_val_if_fail (parser != NULL, 0);
+
+  for (i = 0; i < G_N_ELEMENTS (text_decoration_line_values); i++)
+    {
+      if (gtk_css_parser_try_ident (parser, text_decoration_line_values[i].name))
+        {
+          value = text_decoration_line_values[i].value;
+          break;
+        }
+    }
+
+  if (value == 0)
+    return base; /* not parsing this value */
+
+  if ((base | value) == base)
+    return 0; /* repeated value */
+
+  if (!text_decoration_line_is_valid (base | value))
+    return 0; /* bad combination */
+
+  return base | value;
+}
+
+GtkTextDecorationLine
+_gtk_css_text_decoration_line_value_get (const GtkCssValue *value)
+{
+  g_return_val_if_fail (value->class == &GTK_CSS_VALUE_TEXT_DECORATION_LINE, GTK_CSS_TEXT_DECORATION_LINE_NONE);
+
+  return value->value;
+}
+
 /* GtkCssFontVariantLigature */

 static FlagsValue font_variant_ligature_values[] = {
@@ -54,11 +54,12 @@ GtkCssValue *   _gtk_css_font_stretch_value_new       (PangoStretch       stretc
 GtkCssValue *   _gtk_css_font_stretch_value_try_parse (GtkCssParser      *parser);
 PangoStretch    _gtk_css_font_stretch_value_get       (const GtkCssValue *value);

-GtkCssValue *         _gtk_css_text_decoration_line_value_new       (GtkTextDecorationLine  line);
-GtkCssValue *         _gtk_css_text_decoration_line_value_try_parse (GtkCssParser          *parser);
-GtkTextDecorationLine _gtk_css_text_decoration_line_value_get       (const GtkCssValue     *value);
+GtkCssValue *         _gtk_css_text_decoration_line_value_new     (GtkTextDecorationLine  line);
+GtkTextDecorationLine _gtk_css_text_decoration_line_try_parse_one (GtkCssParser          *parser,
+                                                                   GtkTextDecorationLine  base);
+GtkTextDecorationLine _gtk_css_text_decoration_line_value_get     (const GtkCssValue     *value);

-GtkCssValue *          _gtk_css_text_decoration_style_value_new       (GtkTextDecorationStyle  style);
+GtkCssValue *          _gtk_css_text_decoration_style_value_new   (GtkTextDecorationStyle  style);
 GtkCssValue *          _gtk_css_text_decoration_style_value_try_parse (GtkCssParser           *parser);
 GtkTextDecorationStyle _gtk_css_text_decoration_style_value_get       (const GtkCssValue      *value);

@@ -25,6 +25,9 @@
 #include "gtkcssimagecrossfadeprivate.h"

 #include "gtkcssnumbervalueprivate.h"
+#include "gtkcssimagefallbackprivate.h"
+#include "gtkcsscolorvalueprivate.h"
+

 typedef struct _CrossFadeEntry CrossFadeEntry;

@@ -308,8 +311,19 @@ parse_image (GtkCssParser *parser,
 {
  GtkCssImage **image = option_data;

-  *image = _gtk_css_image_new_parse (parser);
-  if (*image == NULL)
+  if (_gtk_css_image_can_parse (parser))
+    *image = _gtk_css_image_new_parse (parser);
+  else if (gtk_css_color_value_can_parse (parser))
+    {
+      GtkCssValue *color;
+
+      color = _gtk_css_color_value_parse (parser);
+      if (color == NULL)
+        return FALSE;
+
+      *image = _gtk_css_image_fallback_new_for_color (color);
+    }
+  else
    return FALSE;

  return TRUE;
@@ -325,7 +339,7 @@ gtk_css_image_cross_fade_parse_arg (GtkCssParser *parser,
  GtkCssImage *image = NULL;
  GtkCssParseOption options[] =
    {
-      { (void *) gtk_css_number_value_can_parse, parse_progress, &progress },
+      { (void *)gtk_css_number_value_can_parse, parse_progress, &progress },
      { NULL, parse_image, &image },
    };

@@ -148,11 +148,11 @@ gtk_css_image_fallback_compute (GtkCssImage      *image,
      GtkCssValue *computed_color = NULL;

      if (fallback->color)
-          computed_color= _gtk_css_value_compute (fallback->color,
-                                                  property_id,
-                                                  provider,
-                                                  style,
-                                                  parent_style);
+        computed_color = _gtk_css_value_compute (fallback->color,
+                                                 property_id,
+                                                 provider,
+                                                 style,
+                                                 parent_style);

      /* image($color) that didn't change */
      if (computed_color && !fallback->images &&
@@ -331,3 +331,14 @@ _gtk_css_image_fallback_init (GtkCssImageFallback *image_fallback)
 {
  image_fallback->used = -1;
 }
+
+GtkCssImage *
+_gtk_css_image_fallback_new_for_color (GtkCssValue *color)
+{
+  GtkCssImageFallback *image;
+
+  image = g_object_new (GTK_TYPE_CSS_IMAGE_FALLBACK, NULL);
+  image->color = gtk_css_value_ref (color);
+
+  return (GtkCssImage *)image;
+}
@@ -52,7 +52,9 @@ struct _GtkCssImageFallbackClass
  GtkCssImageClass parent_class;
 };

-GType          _gtk_css_image_fallback_get_type             (void) G_GNUC_CONST;
+GType        _gtk_css_image_fallback_get_type      (void) G_GNUC_CONST;
+
+GtkCssImage *_gtk_css_image_fallback_new_for_color (GtkCssValue *color);

 G_END_DECLS

@@ -20,7 +20,7 @@
 #include "gtkcssinheritvalueprivate.h"

 #include "gtkcssinitialvalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssstyleprivate.h"

 struct _GtkCssValue {
  GTK_CSS_VALUE_BASE
@@ -30,7 +30,6 @@
 #include "gtkcssshorthandpropertyprivate.h"
 #include "gtksettingsprivate.h"
 #include "gtkstyleprovider.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkstylepropertyprivate.h"
 #include "gtkstyleproviderprivate.h"
 #include "gtkmarshalers.h"
@@ -1073,8 +1073,11 @@ parse_n_plus_b (GtkCssParser *parser,
      *a = 0;
      return TRUE;
    }
+  
+  gtk_css_parser_error_syntax (parser, "Not a valid an+b type");
+  return FALSE;
 }
-
+                
 static gboolean
 parse_a_n_plus_b (GtkCssParser *parser,
                  int           seen_sign,
@@ -25,7 +25,6 @@
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
 #include "gtksnapshotprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkpango.h"

 #include "gsk/gskcairoblurprivate.h"
@@ -152,11 +151,11 @@ gtk_css_value_shadow_equal (const GtkCssValue *value1,
      const ShadowValue *shadow2 = &value2->shadows[i];

      if (shadow1->inset != shadow2->inset ||
-          !_gtk_css_value_equal (shadow1->hoffset, shadow2->hoffset) ||
-          !_gtk_css_value_equal (shadow1->voffset, shadow2->voffset) ||
-          !_gtk_css_value_equal (shadow1->radius, shadow2->radius) ||
-          !_gtk_css_value_equal (shadow1->spread, shadow2->spread) ||
-          !_gtk_css_value_equal (shadow1->color, shadow2->color))
+          _gtk_css_value_equal (shadow1->hoffset, shadow2->hoffset) ||
+          _gtk_css_value_equal (shadow1->voffset, shadow2->voffset) ||
+          _gtk_css_value_equal (shadow1->radius, shadow2->radius) ||
+          _gtk_css_value_equal (shadow1->spread, shadow2->spread) ||
+          _gtk_css_value_equal (shadow1->color, shadow2->color))
        return FALSE;
    }

@@ -173,6 +172,9 @@ gtk_css_value_shadow_transition (GtkCssValue *start,
  guint i, len;
  ShadowValue *shadows;

+  if (start->n_shadows != end->n_shadows)
+    return NULL;
+
  if (start->n_shadows > end->n_shadows)
    len = start->n_shadows;
  else
@@ -865,16 +865,26 @@ parse_text_decoration (GtkCssShorthandProperty  *shorthand,
                       GtkCssValue             **values,
                       GtkCssParser             *parser)
 {
+  GtkTextDecorationLine line = 0;
+
  do
  {
-    if (values[0] == NULL &&
-        (values[0] = _gtk_css_text_decoration_line_value_try_parse (parser)))
+    GtkTextDecorationLine parsed_line;
+
+    parsed_line = _gtk_css_text_decoration_line_try_parse_one (parser, line);
+
+    if (parsed_line == 0 && line != 0)
      {
-        if (values[0] == NULL)
-          return FALSE;
+        gtk_css_parser_error_value (parser, "Invalid combination of text-decoration-line values");
+        return FALSE;
+      }
+
+    if (parsed_line != line)
+      {
+        line = parsed_line;
      }
    else if (values[1] == NULL &&
-        (values[1] = _gtk_css_text_decoration_style_value_try_parse (parser)))
+             (values[1] = _gtk_css_text_decoration_style_value_try_parse (parser)))
      {
        if (values[1] == NULL)
          return FALSE;
@@ -895,6 +905,16 @@ parse_text_decoration (GtkCssShorthandProperty  *shorthand,
  }
  while (!value_is_done_parsing (parser));

+  if (line != 0)
+    {
+      values[0] = _gtk_css_text_decoration_line_value_new (line);
+      if (values[0] == NULL)
+        {
+          gtk_css_parser_error_value (parser, "Invalid combination of text-decoration-line values");
+          return FALSE;
+        }
+    }
+
  return TRUE;
 }

@@ -163,6 +163,7 @@ static const int other_props[] = {
  GTK_CSS_PROPERTY_ICON_TRANSFORM,
  GTK_CSS_PROPERTY_ICON_FILTER,
  GTK_CSS_PROPERTY_TRANSFORM,
+  GTK_CSS_PROPERTY_TRANSFORM_ORIGIN,
  GTK_CSS_PROPERTY_OPACITY,
  GTK_CSS_PROPERTY_FILTER,
 };
@@ -593,6 +594,9 @@ gtk_css_static_style_set_value (GtkCssStaticStyle *sstyle,
    case GTK_CSS_PROPERTY_TRANSFORM:
      gtk_css_take_value (&style->other->transform, value);
      break;
+    case GTK_CSS_PROPERTY_TRANSFORM_ORIGIN:
+      gtk_css_take_value (&style->other->transform_origin, value);
+      break;
    case GTK_CSS_PROPERTY_MIN_WIDTH:
      gtk_css_take_value (&style->size->min_width, value);
      break;
@@ -880,6 +884,7 @@ gtk_css_other_create_initial_values (void)
  values->icon_transform = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_ICON_TRANSFORM, NULL, NULL, NULL);
  values->icon_filter = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_ICON_FILTER, NULL, NULL, NULL);
  values->transform = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TRANSFORM, NULL, NULL, NULL);
+  values->transform_origin = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_TRANSFORM_ORIGIN, NULL, NULL, NULL);
  values->opacity = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_OPACITY, NULL, NULL, NULL);
  values->filter = _gtk_css_initial_value_new_compute (GTK_CSS_PROPERTY_FILTER, NULL, NULL, NULL);

@@ -235,6 +235,8 @@ gtk_css_style_get_value (GtkCssStyle *style,
      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:
@@ -395,6 +397,12 @@ get_pango_underline_from_style (GtkTextDecorationStyle style)
  g_return_val_if_reached (PANGO_UNDERLINE_SINGLE);
 }

+static PangoOverline
+get_pango_overline_from_style (GtkTextDecorationStyle style)
+{
+  return PANGO_OVERLINE_SINGLE;
+}
+
 static PangoAttrList *
 add_pango_attr (PangoAttrList  *attrs,
                PangoAttribute *attr)
@@ -443,25 +451,29 @@ gtk_css_style_get_pango_attributes (GtkCssStyle *style)
                                                   ? style->font_variant->text_decoration_color
                                                   : style->core->color);

-  switch (decoration_line)
+  if (decoration_line & GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE)
    {
-    case 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))
        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));
-      break;
-    case GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH:
+    }
+  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))
+        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));
+    }
+  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))
        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));
-      break;
-    case GTK_CSS_TEXT_DECORATION_LINE_NONE:
-    default:
-      break;
    }

  /* letter-spacing */
@@ -208,6 +208,7 @@ struct _GtkCssOtherValues {
  GtkCssValue *icon_transform;
  GtkCssValue *icon_filter;
  GtkCssValue *transform;
+  GtkCssValue *transform_origin;
  GtkCssValue *opacity;
  GtkCssValue *filter;
 };
@@ -317,14 +317,38 @@ parse_letter_spacing (GtkCssStyleProperty *property,
  return _gtk_css_number_value_parse (parser, GTK_CSS_PARSE_LENGTH);
 }

+static gboolean
+value_is_done_parsing (GtkCssParser *parser)
+{
+  return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) ||
+         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) ||
+         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SEMICOLON) ||
+         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_CLOSE_CURLY);
+}
+
 static GtkCssValue *
 parse_text_decoration_line (GtkCssStyleProperty *property,
                            GtkCssParser        *parser)
 {
-  GtkCssValue *value = _gtk_css_text_decoration_line_value_try_parse (parser);
+  GtkCssValue *value = NULL;
+  GtkTextDecorationLine line;

+  line = 0;
+  do {
+    GtkTextDecorationLine parsed;
+
+    parsed = _gtk_css_text_decoration_line_try_parse_one (parser, line);
+    if (parsed == 0 || parsed == line)
+      {
+        gtk_css_parser_error_syntax (parser, "Not a valid value");
+        return NULL;
+      }
+    line = parsed;
+  } while (!value_is_done_parsing (parser));
+
+  value = _gtk_css_text_decoration_line_value_new (line);
  if (value == NULL)
-    gtk_css_parser_error_syntax (parser, "unknown text decoration line value");
+    gtk_css_parser_error_syntax (parser, "Invalid combination of values");

  return value;
 }
@@ -353,15 +377,6 @@ parse_font_kerning (GtkCssStyleProperty *property,
  return value;
 }

-static gboolean
-value_is_done_parsing (GtkCssParser *parser)
-{
-  return gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_EOF) ||
-         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_COMMA) ||
-         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_SEMICOLON) ||
-         gtk_css_parser_has_token (parser, GTK_CSS_TOKEN_CLOSE_CURLY);
-}
-
 static GtkCssValue *
 parse_font_variant_ligatures (GtkCssStyleProperty *property,
                              GtkCssParser        *parser)
@@ -790,6 +805,13 @@ background_position_parse (GtkCssStyleProperty *property,
  return _gtk_css_array_value_parse (parser, _gtk_css_position_value_parse);
 }

+static GtkCssValue *
+transform_origin_parse (GtkCssStyleProperty *property,
+                        GtkCssParser        *parser)
+{
+  return _gtk_css_position_value_parse (parser);
+}
+
 /*** REGISTRATION ***/

 G_STATIC_ASSERT (GTK_CSS_PROPERTY_COLOR == 0);
@@ -1248,6 +1270,13 @@ _gtk_css_style_property_init_properties (void)
                                          GTK_CSS_AFFECTS_TRANSFORM,
                                          transform_value_parse,
                                          _gtk_css_transform_value_new_none ());
+  gtk_css_style_property_register        ("transform-origin",
+                                          GTK_CSS_PROPERTY_TRANSFORM_ORIGIN,
+                                          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_style_property_register        ("min-width",
                                          GTK_CSS_PROPERTY_MIN_WIDTH,
                                          GTK_STYLE_PROPERTY_ANIMATED,
@@ -254,6 +254,7 @@ enum { /*< skip >*/
  GTK_CSS_PROPERTY_ICON_FILTER,
  GTK_CSS_PROPERTY_BORDER_SPACING,
  GTK_CSS_PROPERTY_TRANSFORM,
+  GTK_CSS_PROPERTY_TRANSFORM_ORIGIN,
  GTK_CSS_PROPERTY_MIN_WIDTH,
  GTK_CSS_PROPERTY_MIN_HEIGHT,
  GTK_CSS_PROPERTY_TRANSITION_PROPERTY,
@@ -324,9 +325,10 @@ typedef enum /*< skip >*/ {
 } GtkCssFontSize;

 typedef enum /*< skip >*/ {
-  GTK_CSS_TEXT_DECORATION_LINE_NONE,
-  GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE,
-  GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH
+  GTK_CSS_TEXT_DECORATION_LINE_NONE         = 1 << 0,
+  GTK_CSS_TEXT_DECORATION_LINE_UNDERLINE    = 1 << 1,
+  GTK_CSS_TEXT_DECORATION_LINE_OVERLINE     = 1 << 2,
+  GTK_CSS_TEXT_DECORATION_LINE_LINE_THROUGH = 1 << 3
 } GtkTextDecorationLine;

 typedef enum /*< skip >*/ {
@@ -48,32 +48,20 @@
 * SECTION:gtkdialog
 * @Short_description: Create popup windows
 * @Title: GtkDialog
- * @See_also: #GtkWindow, #GtkMessageDialog
+ * @See_also: #GtkBox, #GtkWindow, #GtkButton
 *
- * Dialogs are a convenient way to prompt the user for a small amount
+ * Dialog boxes are a convenient way to prompt the user for a small amount
 * of input, e.g. to display a message, ask a question, or anything else
 * that does not require extensive effort on the user’s part.
 *
- * The main area of a GtkDialog is called the "content area", and is yours
- * to populate with widgets such a #GtkLabel or #GtkEntry, to present
- * your information, questions, or tasks to the user. In addition, dialogs
- * allow you to add "action widgets". Most commonly, action widgets are
- * buttons. Depending on the platform, action widgets may be presented
- * in the header bar at the top of the window, or at the bottom of the window.
- * To add action widgets, use GtkDialog using gtk_dialog_new_with_buttons(),
- * gtk_dialog_add_button(), gtk_dialog_add_buttons(), or
- * gtk_dialog_add_action_widget().
+ * GTK treats a dialog as a window split vertically. The top section is a
+ * #GtkBox, and is where widgets such as a #GtkLabel or a #GtkEntry should
+ * be packed. The bottom area is known as the
+ * “action area”. This is generally used for
+ * packing buttons into the dialog which may perform functions such as
+ * cancel, ok, or apply.
 *
- * Clicking a button that was added as an action widget will emit the
- * #GtkDialog::response signal with a response ID that you specified.
- * GTK will never assign a meaning to positive response IDs; these are
- * entirely user-defined. But for convenience, you can use the response
- * IDs in the #GtkResponseType enumeration (these all have values less
- * than zero). If a dialog receives a delete event, the
- * #GtkDialog::response signal will be emitted with the
- * #GTK_RESPONSE_DELETE_EVENT response ID.
- *
- * Dialogs are created with a call to gtk_dialog_new() or
+ * #GtkDialog boxes are created with a call to gtk_dialog_new() or
 * gtk_dialog_new_with_buttons(). gtk_dialog_new_with_buttons() is
 * recommended; it allows you to set the dialog title, some convenient
 * flags, and add simple buttons.
@@ -84,9 +72,20 @@
 * gtk_dialog_new() into a #GtkWindow. When using gtk_dialog_new_with_buttons()
 * you can also pass the #GTK_DIALOG_MODAL flag to make a dialog modal.
 *
- * For the simple dialog in the following example, a #GtkMessageDialog would
- * save some effort. But you’d need to create the dialog contents manually if
- * you had more than a simple message in the dialog.
+ * If you add buttons to #GtkDialog using gtk_dialog_new_with_buttons(),
+ * gtk_dialog_add_button(), gtk_dialog_add_buttons(), or
+ * gtk_dialog_add_action_widget(), clicking the button will emit a signal
+ * called #GtkDialog::response with a response ID that you specified. GTK
+ * will never assign a meaning to positive response IDs; these are entirely
+ * user-defined. But for convenience, you can use the response IDs in the
+ * #GtkResponseType enumeration (these all have values less than zero). If
+ * a dialog receives a delete event, the #GtkDialog::response signal will
+ * be emitted with a response ID of #GTK_RESPONSE_DELETE_EVENT.
+ *
+ * For the simple dialog in the following example, in reality you’d probably
+ * use #GtkMessageDialog to save yourself some effort. But you’d need to
+ * create the dialog contents manually if you had more than a simple message
+ * in the dialog.
 *
 * An example for simple GtkDialog usage:
 * |[<!-- language="C" -->
@@ -125,7 +124,8 @@
 * # GtkDialog as GtkBuildable
 *
 * The GtkDialog implementation of the #GtkBuildable interface exposes the
- * @content_area as an internal child with the name “content_area”.
+ * @content_area and @action_area as internal children with the names
+ * “content_area” and “action_area”.
 *
 * GtkDialog supports a custom <action-widgets> element, which can contain
 * multiple <action-widget> elements. The “response” attribute specifies a
@@ -1081,16 +1081,35 @@ keynav_failed (GtkWidget        *box,
               GtkEmojiChooser  *chooser)
 {
  EmojiSection *next;
-  GtkWidget *focus; 
+  GtkWidget *focus;
  GtkWidget *child;
  GtkWidget *sibling;
  int i;
  int column;
+  int n_columns = 7;
+  int child_x;

  focus = gtk_root_get_focus (gtk_widget_get_root (box));
  if (focus == NULL)
    return FALSE;

+  /* determine the number of columns */
+  child_x = -1;
+  for (i = 0; i < 20; i++)
+    {
+      GtkAllocation alloc;
+
+      gtk_widget_get_allocation (GTK_WIDGET (gtk_flow_box_get_child_at_index (GTK_FLOW_BOX (box), i)),
+                                 &alloc);
+      if (alloc.x > child_x)
+        child_x = alloc.x;
+      else
+        {
+          n_columns = i;
+          break;
+        }
+    }
+
  child = gtk_widget_get_ancestor (focus, GTK_TYPE_EMOJI_CHOOSER_CHILD);

  i = 0;
@@ -1099,7 +1118,7 @@ keynav_failed (GtkWidget        *box,
       sibling = gtk_widget_get_next_sibling (sibling))
    i++;

-  column = i % 7;
+  column = i % n_columns;

  if (direction == GTK_DIR_DOWN)
    {
@@ -1131,7 +1150,7 @@ keynav_failed (GtkWidget        *box,
           sibling;
           sibling = gtk_widget_get_next_sibling (sibling), i++)
        {
-          if ((i % 7) == column)
+          if ((i % n_columns) == column)
            child = sibling;
        }
      if (child)
@@ -54,7 +54,6 @@
 #include "gtkprogressbar.h"
 #include "gtksettings.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktextprivate.h"
 #include "gtktexthandleprivate.h"
 #include "gtktextutil.h"
@@ -127,7 +127,6 @@
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"

 #include <string.h>
@@ -60,11 +60,6 @@
 * Showing, hiding and running the dialog is handled by the #GtkNativeDialog
 * functions.
 *
- * Note that unlike #GtkFileChooserDialog, #GtkFileChooserNative objects are
- * not toplevel widgets, and GTK does not keep them alive. It is your
- * responsibility to keep a reference until you are done with the
- * object.
-
 * ## Typical usage ## {#gtkfilechoosernative-typical-usage}
 *
 * In the simplest of cases, you can the following code to use
@@ -66,7 +66,6 @@
 #include "gtkshow.h"
 #include "gtkmain.h"
 #include "gtkscrollable.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkpopover.h"
 #include "gtkrevealer.h"
 #include "gtkspinner.h"
@@ -45,7 +45,6 @@
 #include "gtkscrolledwindow.h"
 #include "gtksearchentry.h"
 #include "gtkspinbutton.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktextview.h"
 #include "gtkwidgetprivate.h"
 #include "gtksettings.h"
@@ -31,8 +31,6 @@
 #include "gtkintl.h"
 #include "gtkbuildable.h"
 #include "gtkwidgetprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtklabel.h"

 /**
@@ -29,7 +29,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"


@@ -51,8 +51,8 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksizerequest.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkcssnodeprivate.h"

 /* {{{ GtkGridLayoutChild */
 typedef struct {
@@ -26,7 +26,6 @@
 #include "gtkcssenumvalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcssstyleprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkcsstransientnodeprivate.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkrendericonprivate.h"
@@ -26,7 +26,6 @@

 #include "gtkimageprivate.h"

-#include "gtkcssstylepropertyprivate.h"
 #include "gtkiconhelperprivate.h"
 #include "gtkicontheme.h"
 #include "gtkintl.h"
@@ -27,16 +27,12 @@
 #include "gtklabelprivate.h"

 #include "gtkbuildable.h"
-#include "gtkbuilderprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkeventcontrollerfocus.h"
 #include "gtkgesturedrag.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
-#include "gtkimage.h"
 #include "gtkintl.h"
-#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtknotebook.h"
 #include "gtkpango.h"
@@ -51,7 +47,6 @@
 #include "gtktooltip.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
-#include "gtkwindow.h"
 #include "gtkpopovermenu.h"
 #include "gtknative.h"
 #include "gtkdragsource.h"
@@ -124,13 +124,12 @@
 #include "gtkbinlayout.h"
 #include "gtkbuildable.h"
 #include "gtkbuilderprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkintl.h"
 #include "gtklevelbar.h"
 #include "gtkmarshalers.h"
 #include "gtkorientable.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"

@@ -34,7 +34,6 @@
 #include "gtkscrollable.h"
 #include "gtksingleselection.h"
 #include "gtksnapshot.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"

@@ -1148,7 +1147,7 @@ gtk_list_base_class_init (GtkListBaseClass *klass)
                       P_("The orientation of the orientable"),
                       GTK_TYPE_ORIENTATION,
                       GTK_ORIENTATION_VERTICAL,
-                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY);
+                       G_PARAM_READWRITE | G_PARAM_EXPLICIT_NOTIFY | G_PARAM_EXPLICIT_NOTIFY);

  g_object_class_install_properties (gobject_class, N_PROPS, properties);

@@ -2149,7 +2149,7 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 /**
 * gtk_list_store_insert_with_values:
 * @list_store: A #GtkListStore
- * @iter: (out) (allow-none): An unset #GtkTreeIter to set to the new row, or %NULL
+ * @iter: (out) (optional): An unset #GtkTreeIter to set to the new row
 * @position: position to insert the new row, or -1 to append after existing
 *     rows
 * @...: pairs of column number and value, terminated with -1
@@ -2161,7 +2161,8 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 *
 * Calling
 * `gtk_list_store_insert_with_values (list_store, iter, position...)`
- * has the same effect as calling
+ * has the same effect as calling:
+ *
 * |[<!-- language="C" -->
 * static void
 * insert_value (GtkListStore *list_store,
@@ -2175,12 +2176,15 @@ gtk_list_store_has_default_sort_func (GtkTreeSortable *sortable)
 *                       );
 * }
 * ]|
- * with the difference that the former will only emit a row_inserted signal,
- * while the latter will emit row_inserted, row_changed and, if the list store
- * is sorted, rows_reordered. Since emitting the rows_reordered signal
- * repeatedly can affect the performance of the program,
- * gtk_list_store_insert_with_values() should generally be preferred when
- * inserting rows in a sorted list store.
+ *
+ * with the difference that the former will only emit #GtkTreeModel::row-inserted
+ * once, while the latter will emit #GtkTreeModel::row-inserted,
+ * #GtkTreeModel::row-changed and, if the list store is sorted,
+ * #GtkTreeModel::rows-reordered for every inserted value.
+ *
+ * Since emitting the #GtkTreeModel::rows-reordered signal repeatedly can
+ * affect the performance of the program, gtk_list_store_insert_with_values()
+ * should generally be preferred when inserting rows in a sorted list store.
 */
 void
 gtk_list_store_insert_with_values (GtkListStore *list_store,
@@ -2244,9 +2248,9 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,


 /**
- * gtk_list_store_insert_with_valuesv:
+ * gtk_list_store_insert_with_valuesv: (rename-to gtk_list_store_insert_with_values)
 * @list_store: A #GtkListStore
- * @iter: (out) (allow-none): An unset #GtkTreeIter to set to the new row, or %NULL.
+ * @iter: (out) (optional): An unset #GtkTreeIter to set to the new row
 * @position: position to insert the new row, or -1 for last
 * @columns: (array length=n_values): an array of column numbers
 * @values: (array length=n_values): an array of GValues 
@@ -2254,8 +2258,9 @@ gtk_list_store_insert_with_values (GtkListStore *list_store,
 * 
 * A variant of gtk_list_store_insert_with_values() which
 * takes the columns and values as two arrays, instead of
- * varargs. This function is mainly intended for 
- * language-bindings.
+ * varargs.
+ *
+ * This function is mainly intended for language-bindings.
 */
 void
 gtk_list_store_insert_with_valuesv (GtkListStore *list_store,
@@ -107,12 +107,22 @@
 * |[<!-- language="plain" -->
 * menubutton
 * ╰── button.toggle
- *     ╰── [content]
+ *     ╰── <content>
+ *          ╰── [arrow]
 *]|
 *
 * GtkMenuButton has a single CSS node with name menubutton
 * which contains a toggle button node.
 *
+ * Inside the toggle button content, there is an arrow node for
+ * the indicator, which will carry one of the .none, .up, .down,
+ * .left or .right style classes to indicate the direction that
+ * the menu will appear in. The CSS is expected to provide a suitable
+ * image for each of these cases using the -gtk-icon-source property.
+ *
+ * Optionally, the menubutton node can carry the .circular style class
+ * to request a round appearance.
+ *
 * # Accessibility
 *
 * GtkMenuButton uses the #GTK_ACCESSIBLE_ROLE_BUTTON role.
@@ -121,7 +131,7 @@
 #include "config.h"

 #include "gtkactionable.h"
-#include "gtkimage.h"
+#include "gtkbuiltiniconprivate.h"
 #include "gtkintl.h"
 #include "gtkmain.h"
 #include "gtkmenubutton.h"
@@ -440,35 +450,40 @@ gtk_menu_button_class_init (GtkMenuButtonClass *klass)
 }

 static void
-set_arrow_type (GtkImage     *image,
+set_arrow_type (GtkWidget    *arrow,
                GtkArrowType  arrow_type,
                gboolean      visible)
 {
+  gtk_widget_remove_css_class (arrow, "none");
+  gtk_widget_remove_css_class (arrow, "down");
+  gtk_widget_remove_css_class (arrow, "up");
+  gtk_widget_remove_css_class (arrow, "left");
+  gtk_widget_remove_css_class (arrow, "right");
  switch (arrow_type)
    {
    case GTK_ARROW_NONE:
-      gtk_image_set_from_icon_name (image, "open-menu-symbolic");
+      gtk_widget_add_css_class (arrow, "none");
      break;
    case GTK_ARROW_DOWN:
-      gtk_image_set_from_icon_name (image, "pan-down-symbolic");
+      gtk_widget_add_css_class (arrow, "down");
      break;
    case GTK_ARROW_UP:
-      gtk_image_set_from_icon_name (image, "pan-up-symbolic");
+      gtk_widget_add_css_class (arrow, "up");
      break;
    case GTK_ARROW_LEFT:
-      gtk_image_set_from_icon_name (image, "pan-start-symbolic");
+      gtk_widget_add_css_class (arrow, "left");
      break;
    case GTK_ARROW_RIGHT:
-      gtk_image_set_from_icon_name (image, "pan-end-symbolic");
+      gtk_widget_add_css_class (arrow, "right");
      break;
    default:
      break;
    }

  if (visible)
-    gtk_widget_show (GTK_WIDGET (image));
+    gtk_widget_show (arrow);
  else
-    gtk_widget_hide (GTK_WIDGET (image));
+    gtk_widget_hide (arrow);
 }

 static void
@@ -476,8 +491,8 @@ add_arrow (GtkMenuButton *self)
 {
  GtkWidget *arrow;

-  arrow = gtk_image_new ();
-  set_arrow_type (GTK_IMAGE (arrow), self->arrow_type, TRUE);
+  arrow = gtk_builtin_icon_new ("arrow");
+  set_arrow_type (arrow, self->arrow_type, TRUE);
  gtk_button_set_child (GTK_BUTTON (self->button), arrow);
  self->arrow_widget = arrow;
 }
@@ -668,7 +683,7 @@ gtk_menu_button_set_direction (GtkMenuButton *menu_button,
  if (is_image_button && (menu_button->arrow_widget != gtk_button_get_child (GTK_BUTTON (menu_button->button))))
    return;

-  set_arrow_type (GTK_IMAGE (menu_button->arrow_widget),
+  set_arrow_type (menu_button->arrow_widget,
                  menu_button->arrow_type,
                  is_image_button || (menu_button->arrow_type != GTK_ARROW_NONE));
  update_popover_direction (menu_button);
@@ -848,9 +863,9 @@ gtk_menu_button_set_label (GtkMenuButton *menu_button,
                               gtk_button_get_use_underline (GTK_BUTTON (menu_button->button)));
  gtk_widget_set_hexpand (label_widget, TRUE);
  gtk_widget_set_halign (label_widget, GTK_ALIGN_CENTER);
-  arrow = gtk_image_new ();
+  arrow = gtk_builtin_icon_new ("arrow");
  menu_button->arrow_widget = arrow;
-  set_arrow_type (GTK_IMAGE (arrow), menu_button->arrow_type, menu_button->arrow_type != GTK_ARROW_NONE);
+  set_arrow_type (arrow, menu_button->arrow_type, menu_button->arrow_type != GTK_ARROW_NONE);
  gtk_box_append (GTK_BOX (box), label_widget);
  gtk_box_append (GTK_BOX (box), arrow);
  gtk_button_set_child (GTK_BUTTON (menu_button->button), box);
@@ -454,6 +454,8 @@ gtk_message_dialog_init (GtkMessageDialog *dialog)
  GtkSettings *settings;
  gboolean use_caret;

+  priv->has_primary_markup = FALSE;
+  priv->has_secondary_text = FALSE;
  priv->has_primary_markup = FALSE;
  priv->has_secondary_text = FALSE;
  priv->message_type = GTK_MESSAGE_OTHER;
@@ -49,7 +49,6 @@
 #include "gtkicontheme.h"
 #include "gtkmain.h"
 #include "gtksettings.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkdialogprivate.h"
 #include "gtkgestureclick.h"
 #include "gtkmodelbuttonprivate.h"
@@ -52,11 +52,6 @@
 * various common properties on the dialog, as well as show and hide
 * it and get a #GtkNativeDialog::response signal when the user finished
 * with the dialog.
- *
- * Note that unlike #GtkDialog, #GtkNativeDialog objects are not
- * toplevel widgets, and GTK does not keep them alive. It is your
- * responsibility to keep a reference until you are done with the
- * object.
 */

 typedef struct _GtkNativeDialogPrivate GtkNativeDialogPrivate;
@@ -31,7 +31,6 @@
 #include "gtkboxlayout.h"
 #include "gtkbuildable.h"
 #include "gtkbutton.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkdroptarget.h"
 #include "gtkdragicon.h"
 #include "gtkdropcontrollermotion.h"
@@ -27,7 +27,6 @@
 #include "gtkpaned.h"

 #include "gtkcssboxesprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeventcontrollermotion.h"
 #include "gtkgesturepan.h"
 #include "gtkgesturesingle.h"
@@ -37,7 +36,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkrendericonprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssboxesprivate.h"
@@ -35,7 +35,7 @@
 #include "gtkprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcsspositionvalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"


 /**
@@ -360,7 +360,9 @@ did_flip_vertically (GdkGravity original_gravity,

 static void
 update_popover_layout (GtkPopover     *popover,
-                       GdkPopupLayout *layout)
+                       GdkPopupLayout *layout,
+                       int             width,
+                       int             height)
 {
  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
  GdkRectangle final_rect;
@@ -413,7 +415,9 @@ update_popover_layout (GtkPopover     *popover,
      break;
    }

-  if (priv->final_position != position)
+  if (priv->final_position != position ||
+      priv->final_rect.width != width ||
+      priv->final_rect.height != height)
    {
      gtk_widget_queue_allocate (GTK_WIDGET (popover));
      g_clear_pointer (&priv->arrow_render_node, gsk_render_node_unref);
@@ -545,9 +549,9 @@ create_popup_layout (GtkPopover *popover)
      g_assert_not_reached ();
    }

-  layout = gdk_popup_layout_new (&rect,
-                                 parent_anchor,
-                                 surface_anchor);
+  anchor_hints |= GDK_ANCHOR_RESIZE;
+
+  layout = gdk_popup_layout_new (&rect, parent_anchor, surface_anchor);
  gdk_popup_layout_set_anchor_hints (layout, anchor_hints);

  if (priv->x_offset || priv->y_offset)
@@ -560,17 +564,17 @@ static gboolean
 present_popup (GtkPopover *popover)
 {
  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
-  GtkRequisition req;
+  GtkRequisition nat;
  GdkPopupLayout *layout;

  layout = create_popup_layout (popover);
-  gtk_widget_get_preferred_size (GTK_WIDGET (popover), NULL, &req);
+  gtk_widget_get_preferred_size (GTK_WIDGET (popover), NULL, &nat);
+
  if (gdk_popup_present (GDK_POPUP (priv->surface),
-                         MAX (req.width, 1),
-                         MAX (req.height, 1),
+                         nat.width, nat.height,
                         layout))
    {
-      update_popover_layout (popover, layout);
+      update_popover_layout (popover, layout, nat.width, nat.height);
      return TRUE;
    }

@@ -631,7 +635,7 @@ gtk_popover_native_layout (GtkNative *native,
  GtkPopoverPrivate *priv = gtk_popover_get_instance_private (popover);
  GtkWidget *widget = GTK_WIDGET (popover);

-  update_popover_layout (popover, gdk_popup_layout_ref (priv->layout));
+  update_popover_layout (popover, gdk_popup_layout_ref (priv->layout), width, height);

  if (gtk_widget_needs_allocate (widget))
    {
@@ -27,15 +27,12 @@
 #include "gtkprogressbar.h"

 #include "gtkboxlayout.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkgizmoprivate.h"
 #include "gtkintl.h"
 #include "gtklabel.h"
 #include "gtkorientable.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"

 #include <string.h>
@@ -22,7 +22,6 @@
 #include "gtkcsscornervalueprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkcsstypesprivate.h"
-#include "gtkstylecontextprivate.h"

 #include <string.h>

@@ -38,8 +38,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtkrangeprivate.h"
-#include "gtkstylecontextprivate.h"
-#include "gtkstylepropertyprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"

@@ -590,11 +590,19 @@ capture_widget_key_handled (GtkEventControllerKey *controller,
 * @bar: a #GtkSearchBar
 * @widget: (nullable) (transfer none): a #GtkWidget
 *
- * Sets @widget as the widget that @bar will capture key events from.
+ * Sets @widget as the widget that @bar will capture key events
+ * from.
 *
 * If key events are handled by the search bar, the bar will
 * be shown, and the entry populated with the entered text.
- **/
+ *
+ * Note that despite the name of this function, the events
+ * are only 'captured' in the bubble phase, which means that
+ * editable child widgets of @widget will receive text input
+ * before it gets captured. If that is not desired, you can
+ * capture and forward the events yourself with
+ * gtk_event_controller_key_forward().
+ */
 void
 gtk_search_bar_set_key_capture_widget (GtkSearchBar *bar,
                                       GtkWidget    *widget)
@@ -622,7 +630,7 @@ gtk_search_bar_set_key_capture_widget (GtkSearchBar *bar,

      bar->capture_widget_controller = gtk_event_controller_key_new ();
      gtk_event_controller_set_propagation_phase (bar->capture_widget_controller,
-                                                  GTK_PHASE_CAPTURE);
+                                                  GTK_PHASE_BUBBLE);
      g_signal_connect (bar->capture_widget_controller, "key-pressed",
                        G_CALLBACK (capture_widget_key_handled), bar);
      g_signal_connect (bar->capture_widget_controller, "key-released",
@@ -667,6 +667,14 @@ capture_widget_key_handled (GtkEventControllerKey *controller,
 * If the entry is part of a #GtkSearchBar, it is preferable
 * to call gtk_search_bar_set_key_capture_widget() instead, which
 * will reveal the entry in addition to triggering the search entry.
+ *
+ * Note that despite the name of this function, the events
+ * are only 'captured' in the bubble phase, which means that
+ * editable child widgets of @widget will receive text input
+ * before it gets captured. If that is not desired, you can
+ * capture and forward the events yourself with
+ * gtk_event_controller_key_forward().
+
 **/
 void
 gtk_search_entry_set_key_capture_widget (GtkSearchEntry *entry,
@@ -692,7 +700,7 @@ gtk_search_entry_set_key_capture_widget (GtkSearchEntry *entry,

      entry->capture_widget_controller = gtk_event_controller_key_new ();
      gtk_event_controller_set_propagation_phase (entry->capture_widget_controller,
-                                                  GTK_PHASE_CAPTURE);
+                                                  GTK_PHASE_BUBBLE);
      g_signal_connect (entry->capture_widget_controller, "key-pressed",
                        G_CALLBACK (capture_widget_key_handled), entry);
      g_signal_connect (entry->capture_widget_controller, "key-released",
@@ -139,7 +139,7 @@ gtk_show_uri_full (GtkWindow           *parent,
 * @result: #GAsyncResult that was passed to @callback
 * @error: return location for an error
 *
- * Finishes the gtk_show_uri() call and returns the result
+ * Finished the gtk_show_uri() call and returns the result
 * of the operation.
 *
 * Returns: %TRUE if the URI was shown successfully.
@@ -36,7 +36,6 @@
 #include "gtkbox.h"
 #include "gtkbutton.h"
 #include "gtkbuttonprivate.h"
-#include "gtkcssstylepropertyprivate.h"
 #include "gtkeditable.h"
 #include "gtkcelleditable.h"
 #include "gtkimage.h"
@@ -53,7 +52,6 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtksettings.h"
-#include "gtkstylecontextprivate.h"
 #include "gtktypebuiltins.h"
 #include "gtkwidgetprivate.h"
 #include "gtkboxlayout.h"
@@ -34,7 +34,7 @@
 #include "gtkimage.h"
 #include "gtkintl.h"
 #include "gtkprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssnumbervalueprivate.h"
 #include "gtkrendericonprivate.h"
@@ -70,7 +70,6 @@
 #include "gtkprivate.h"
 #include "gtkprogresstrackerprivate.h"
 #include "gtksettingsprivate.h"
-#include "gtkstylecontextprivate.h"
 #include "gtkwidgetprivate.h"

 typedef struct _GtkSwitchClass   GtkSwitchClass;
@@ -257,8 +257,8 @@ static void              gtk_text_btree_rebalance                (GtkTextBTree
 static GtkTextLine     * get_last_line                           (GtkTextBTree     *tree);
 static void              post_insert_fixup                       (GtkTextBTree     *tree,
                                                                  GtkTextLine      *insert_line,
-                                                                  int               line_count_delta,
-                                                                  int               char_count_delta);
+                                                                  int               char_count_delta,
+                                                                  int               line_count_delta);
 static void              gtk_text_btree_node_adjust_toggle_count (GtkTextBTreeNode *node,
                                                                  GtkTextTagInfo   *info,
                                                                  int               adjust);
@@ -26,8 +26,7 @@
 #include "gtkwidgetprivate.h"
 #include "gtkrendericonprivate.h"
 #include "gtkcssboxesimplprivate.h"
-#include "gtkcssnumbervalueprivate.h"
-#include "gtkstylecontextprivate.h"
+#include "gtkcssnodeprivate.h"
 #include "gtknativeprivate.h"
 #include "gtkintl.h"

@@ -110,17 +109,15 @@ gtk_text_handle_native_get_surface_transform (GtkNative *native,

 static void
 gtk_text_handle_get_padding (GtkTextHandle *handle,
-                             GtkBorder     *border)
+                             GtkBorder     *padding)
 {
  GtkWidget *widget = GTK_WIDGET (handle);
-  GtkStyleContext *context;
+  GtkCssStyle *style = gtk_css_node_get_style (gtk_widget_get_css_node (widget));

-  context = gtk_widget_get_style_context (widget);
-
-  border->left = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_LEFT), 100);
-  border->right = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_RIGHT), 100);
-  border->top = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_PADDING_TOP), 100);
-  border->bottom = _gtk_css_number_value_get (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_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
@@ -34,7 +34,6 @@
 #include "gtkintl.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcssstyleprivate.h"
-#include "gtkstylepropertyprivate.h"
 #include "gtkcsscolorvalueprivate.h"

 #define DRAG_ICON_MAX_WIDTH 250
@@ -165,7 +164,6 @@ set_attributes_from_style (GtkWidget         *widget,
                           GtkTextAttributes *values)
 {
  GtkCssStyle *style;
-  GtkStyleContext *context;
  const GdkRGBA black = { 0, };

  if (!values->appearance.bg_rgba)
@@ -173,8 +171,7 @@ set_attributes_from_style (GtkWidget         *widget,
  if (!values->appearance.fg_rgba)
    values->appearance.fg_rgba = gdk_rgba_copy (&black);

-  context = gtk_widget_get_style_context (widget);
-  style = gtk_style_context_lookup_style (context);
+  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);
@@ -48,7 +48,7 @@
 #include "gtktypebuiltins.h"
 #include "gtktextviewchildprivate.h"
 #include "gtktexthandleprivate.h"
-#include "gtkcssstylepropertyprivate.h"
+#include "gtkstylecontextprivate.h"
 #include "gtkpopover.h"
 #include "gtkmagnifierprivate.h"
 #include "gtkemojichooser.h"
@@ -7491,7 +7491,7 @@ static void
 gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
                                         GtkTextAttributes  *values)
 {
-  GtkStyleContext *context;
+  GtkCssStyle *style;
  const GdkRGBA black = { 0, };
  const GdkRGBA *color;

@@ -7500,17 +7500,17 @@ gtk_text_view_set_attributes_from_style (GtkTextView        *text_view,
  if (!values->appearance.fg_rgba)
    values->appearance.fg_rgba = gdk_rgba_copy (&black);

-  context = gtk_widget_get_style_context (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 (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_BACKGROUND_COLOR));
+  color = gtk_css_color_value_get_rgba (style->background->background_color);
  *values->appearance.bg_rgba = *color;
-  color = gtk_css_color_value_get_rgba (_gtk_style_context_peek_property (context, GTK_CSS_PROPERTY_COLOR));
+  color = gtk_css_color_value_get_rgba (style->core->color);
  *values->appearance.fg_rgba = *color;

  if (values->font)
    pango_font_description_free (values->font);

-  values->font = gtk_css_style_get_pango_font (gtk_style_context_lookup_style (context));
+  values->font = gtk_css_style_get_pango_font (style);
 }

 static void
--- a/Show More
+++ b/Show More