Add API to center listview/columnview items when scrolling

· A new GtkScrollInfoCenter enum with the different center flags to use
   in scroll_to() functions:

     GTK_SCROLL_INFO_CENTER_ROW: This will center the target
       row item along the visible part of list. If target
       row is already visible, will do nothing.

     GTK_SCROLL_INFO_CENTER_ROW_ALWAYS: Like `GTK_SCROLL_INFO_CENTER_ROW`
       but will work even if target row is already visible.

     GTK_SCROLL_INFO_CENTER_COL: When scrolling to a column
       item in a columnview, this will center it across the
       visible part of list. If target column is already
       visible, will do nothing.

     GTK_SCROLL_INFO_CENTER_COL_ALWAYS: Like `GTK_SCROLL_INFO_CENTER_COL`
       but will work even if target column is already visible.

 · A new GtkScrollInfo public field called `center_flags` to
     store how we want to center target row/column as a set of
     the new GtkScrollInfoCenter enum values.

 · Action "list.scroll-to-item" gains a new GtkScrollInfoCenter
   flag parameter named @center_flags, but ensuring that the
   previous action with no parameter keeps working.

Some widgets are also added to gtk4-demo program to easily
test/demo the scrolling_to() functionality, it's in the panel
"Lists -> Characters" and can be directly run with:

  gtk4-demo --run=listview_ucd

.gitlab-ci/run-tests.sh

@@ -23,7 +23,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-broadway
 
     # Store the exit code for the CI run, but always
@@ -46,7 +45,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=${backend}_failing \
                 --no-suite=gsk-compare-broadway
     exit_code=$?
@@ -69,7 +67,6 @@ case "${backend}" in
                 --suite=gtk \
                 --no-suite=failing \
                 --no-suite=flaky \
-                --no-suite=headless \
                 --no-suite=gsk-compare-opengl
 
     kill ${server}

CONTRIBUTING.md

@@ -35,7 +35,8 @@ The issue tracker is meant to be used for actionable issues only.
 
 You should not open a new issue for security related questions.
 
-When in doubt, follow [security](https://security.gnome.org/).
+When in doubt, send an email to the [security](mailto:security@gnome.org)
+mailing list.
 
 ### Bug reports
 
@@ -243,11 +244,13 @@ people committing to GTK to follow a few rules:
    code, you should always ask. If your change is minor and you've been
    working on GTK for a while it probably isn't necessary to ask. But when
    in doubt, ask. Even if your change is correct, somebody may know a
-   better way to do things.
-   The `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org) is also a
-   good place to find GTK developers to discuss changes, but if you live
-   outside of the EU/US time zones, the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)
-   is the most certain and preferred method.
+   better way to do things. If you are making changes to GTK, you should
+   be subscribed to the [gtk-devel](https://mail.gnome.org/mailman/listinfo/gtk-devel-list)
+   mailing list; this is a good place to ask about intended changes.
+   The `#gtk` IRC channel on irc.gnome.org is also a good place to find GTK
+   developers to discuss changes, but if you live outside of the EU/US time
+   zones, an email to the gtk-devel mailing list is the most certain and
+   preferred method.
 
 0. Ask _first_.
 

NEWS

@@ -1,92 +1,6 @@
-Overview of Changes in 4.13.1, 28-09-2023
+Overview of Changes in 4.13.1, xx-xx-xxxx
 =========================================
 
-* GtkTooltip:
- - Don't cross native boundaries when looking for tooltips
-
-* GtkCenterLayout, GtkEntry, GtkSearchEntry:
- - Fix some issues with baseline handling
-
-* GtkColorButton, GtkFontButton:
- - Propagate focus-on-click
-
-* GtkFileChooser:
- - Make "Visit file" scroll to the file
-
-* GtkSwitch:
- - Respect text direction
-
-* GtkWindow:
- - Don't assume titlebars are GtkHeaderBars
-
-* Printing:
- - Fix some problems with the portal implementation
- - Add a new simple print API: GtkPrintDialog
-
-* Paths:
- - GskPathMeasure performance has been improved
- - Add custom contours for circles, rounded rectangles and rectangles
- - Simplify GskPathPoint handling
- - gsk_path_point_get_closest_point now returns the distance as well
- - Make GskPathBuilder simplify curves
-
-* Input:
- - Handle (some) single-key compose sequences
- - Fix active state tracking with sensitivity changes and grabs
-
-* GSK:
- - Make the repeated gradients match between GL and cairo
- - Make rounded rect shrinking match between Vulkan, GL and cairo
- - Fix parsing of text nodes with color glyphs
- - Restrict an optimization to the cases where it is crrect
- - Fix rendering of shadows with opacity
- - The Vulkan renderer now requires Vulkan 1.2
- - GL: Transition gradients unpremultiplied
- - GL: Fix clipping of shadows
- - GL: Some optimizations
- - Broadway: Fix memory leaks in the renderer
-
-* Wayland:
- - Make activation more reliable
-
-* macOS:
- - Clamp damage regions to the surface size
-
-* Tools:
- - gtk4-path-tool gained restrict and reverse commands
- - gtk4-path-tool show and render can show control points
-
-* Demos:
- - Add a demo for hit testing with paths
-
-* Build:
- - Fix build problems with C++ compilers
-
-* Deprecations:
- - gtk_window_present_with_time
-
-* Translation updates
- Brazilian Portuguese
- British English
- Catalan
- Chinese (China)
- Czech
- Danish
- Dutch
- Esperanto
- Galician
- Georgian
- Italian
- Korean
- Latvian
- Lithuanian
- Persian
- Polish
- Punjabi
- Slovenian
- Turkish
-
-
 Overview of Changes in 4.13.0, 25-08-2023
 =========================================
 

demos/gtk-demo/application.c

@@ -223,7 +223,7 @@ delete_messages (gpointer data)
 static void
 pop_message (GtkWidget *status)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   if (messages)
     {
@@ -241,7 +241,7 @@ static void
 push_message (GtkWidget  *status,
               const char *message)
 {
-  GList *messages = (GList *) g_object_steal_data (G_OBJECT (status), "messages");
+  GList *messages = (GList *) g_object_get_data (G_OBJECT (status), "messages");
 
   gtk_label_set_label (GTK_LABEL (status), message);
   messages = g_list_prepend (messages, g_strdup (message));

demos/gtk-demo/fishbowl.c

@@ -74,7 +74,14 @@ create_blurred_button (void)
 static GtkWidget *
 create_font_button (void)
 {
-  return gtk_font_dialog_button_new (gtk_font_dialog_new ());
+  GtkFontDialog *dialog;
+  GtkWidget *button;
+
+  dialog = gtk_font_dialog_new ();
+  button = gtk_font_dialog_button_new (dialog);
+  g_object_unref (dialog);
+
+  return button;
 }
 
 static GtkWidget *

demos/gtk-demo/listview_ucd.c

@@ -1,9 +1,11 @@
-/* Lists/Characters
+/* Lists/Characters (scroll_to)
  *
  * This demo shows a multi-column representation of some parts
  * of the Unicode Character Database, or UCD.
  *
  * The dataset used here has 33 796 items.
+ *
+ * It includes some widgets to demo the scroll_to() API functionality.
  */
 
 #include <gtk/gtk.h>
@@ -18,6 +20,7 @@ struct _UcdItem
   GObject parent_instance;
   gunichar codepoint;
   const char *name;
+  guint colnumber;
 };
 
 struct _UcdItemClass
@@ -39,7 +42,8 @@ ucd_item_class_init (UcdItemClass *class)
 
 static UcdItem *
 ucd_item_new (gunichar    codepoint,
-              const char *name)
+              const char *name,
+              guint       col)
 {
   UcdItem *item;
 
@@ -47,6 +51,7 @@ ucd_item_new (gunichar    codepoint,
 
   item->codepoint = codepoint;
   item->name = name;
+  item->colnumber = col;
 
   return item;
 }
@@ -63,6 +68,12 @@ ucd_item_get_name (UcdItem *item)
   return item->name;
 }
 
+static guint
+ucd_item_get_colnumber (UcdItem *item)
+{
+  return item->colnumber;
+}
+
 static GListModel *
 ucd_model_new (void)
 {
@@ -71,6 +82,7 @@ ucd_model_new (void)
   GVariantIter *iter;
   GListStore *store;
   guint u;
+  guint colnumber;
   char *name;
 
   bytes = g_resources_lookup_data ("/listview_ucd_data/ucdnames.data", 0, NULL);
@@ -79,13 +91,15 @@ ucd_model_new (void)
   iter = g_variant_iter_new (v);
 
   store = g_list_store_new (G_TYPE_OBJECT);
+  colnumber = 1;
   while (g_variant_iter_next (iter, "(u&s)", &u, &name))
     {
       if (u == 0)
         continue;
 
-      UcdItem *item = ucd_item_new (u, name);
+      UcdItem *item = ucd_item_new (u, name, colnumber);
       g_list_store_append (store, item);
+      colnumber++;
       g_object_unref (item);
     }
 
@@ -127,6 +141,24 @@ setup_ellipsizing_label (GtkSignalListItemFactory *factory,
   gtk_list_item_set_child (GTK_LIST_ITEM (listitem), label);
 }
 
+static void
+bind_colnumber (GtkSignalListItemFactory *factory,
+                GObject                  *listitem,
+                GListModel               *ucd_model)
+{
+  GtkWidget *label;
+  GObject *item;
+  uint colnumber;
+  char buffer[16] = { 0, };
+
+  label = gtk_list_item_get_child (GTK_LIST_ITEM (listitem));
+  item = gtk_list_item_get_item (GTK_LIST_ITEM (listitem));
+  colnumber = ucd_item_get_colnumber (UCD_ITEM (item));
+
+  g_snprintf (buffer, 10, "%u", colnumber);
+  gtk_label_set_label (GTK_LABEL (label), buffer);
+}
+
 static void
 bind_codepoint (GtkSignalListItemFactory *factory,
                 GObject                  *listitem)
@@ -278,6 +310,21 @@ create_ucd_view (GtkWidget *label)
   cv = gtk_column_view_new (GTK_SELECTION_MODEL (selection));
   gtk_column_view_set_show_column_separators (GTK_COLUMN_VIEW (cv), TRUE);
 
+
+  // HACK: This is a non-visible empty column we add here because later we use this model
+  // for the GtkDropDown of columns, and we need an empty item to mean "nothing is selected".
+  column = gtk_column_view_column_new (NULL, NULL);
+  gtk_column_view_column_set_visible (column, FALSE);
+  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
+  g_object_unref (column);
+
+  factory = gtk_signal_list_item_factory_new ();
+  g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
+  g_signal_connect (factory, "bind", G_CALLBACK (bind_colnumber), NULL);
+  column = gtk_column_view_column_new ("Row nº", factory);
+  gtk_column_view_append_column (GTK_COLUMN_VIEW (cv), column);
+  g_object_unref (column);
+
   factory = gtk_signal_list_item_factory_new ();
   g_signal_connect (factory, "setup", G_CALLBACK (setup_centered_label), NULL);
   g_signal_connect (factory, "bind", G_CALLBACK (bind_codepoint), NULL);
@@ -336,6 +383,7 @@ create_ucd_view (GtkWidget *label)
 }
 
 static GtkWidget *window;
+static GtkWidget *spin, *check_h, *check_v, *check_ha, *check_va, *list_view, *dropdown_cols;
 
 static void
 remove_provider (gpointer data)
@@ -346,13 +394,97 @@ remove_provider (gpointer data)
   g_object_unref (provider);
 }
 
+static void
+dropdown_cols_changed (GObject    *object,
+                       GParamSpec *pspec,
+                       gpointer    data)
+{
+  guint selected_pos;
+  gboolean any_col_selected;
+
+  selected_pos = gtk_drop_down_get_selected (GTK_DROP_DOWN (object));
+  any_col_selected = (selected_pos && selected_pos != GTK_INVALID_LIST_POSITION);
+
+  if (any_col_selected)
+    {
+      gtk_widget_set_sensitive (check_h, TRUE);
+      gtk_widget_set_sensitive (check_ha, TRUE);
+    }
+  else
+    {
+      gtk_check_button_set_active (GTK_CHECK_BUTTON (check_h), FALSE);
+      gtk_check_button_set_active (GTK_CHECK_BUTTON (check_ha), FALSE);
+      gtk_widget_set_sensitive (check_h, FALSE);
+      gtk_widget_set_sensitive (check_ha, FALSE);
+    }
+}
+
+static void
+scroll_to_cb (GtkWidget *button, gpointer data)
+{
+  GtkColumnViewColumn *center_column;
+  GtkScrollInfo *scroll_info;
+  gboolean col, col_always, row, row_always;
+  guint pos;
+  GtkListScrollFlags flags = GTK_LIST_SCROLL_SELECT;
+
+  row = gtk_check_button_get_active (GTK_CHECK_BUTTON (check_v));
+  row_always = gtk_check_button_get_active (GTK_CHECK_BUTTON (check_va));
+  col = gtk_check_button_get_active (GTK_CHECK_BUTTON (check_h));
+  col_always = gtk_check_button_get_active (GTK_CHECK_BUTTON (check_ha));
+
+  scroll_info = NULL;
+  if (row || row_always || col || col_always)
+    {
+      GtkScrollInfoCenter center_flags = GTK_SCROLL_INFO_CENTER_NONE;
+
+      if (row)
+        center_flags |= GTK_SCROLL_INFO_CENTER_ROW;
+      if (row_always)
+        center_flags |= GTK_SCROLL_INFO_CENTER_ROW_ALWAYS;
+      if (col)
+        center_flags |= GTK_SCROLL_INFO_CENTER_COL;
+      if (col_always)
+        center_flags |= GTK_SCROLL_INFO_CENTER_COL_ALWAYS;
+
+      scroll_info = gtk_scroll_info_new ();
+      gtk_scroll_info_set_center_flags (scroll_info, center_flags);
+    }
+
+  center_column = gtk_drop_down_get_selected_item (GTK_DROP_DOWN (dropdown_cols));
+  if (!gtk_column_view_column_get_visible (center_column))
+    center_column = NULL;
+
+  pos = (guint) gtk_spin_button_get_value_as_int (GTK_SPIN_BUTTON (spin));
+  gtk_column_view_scroll_to (GTK_COLUMN_VIEW (list_view), pos - 1, center_column, flags, scroll_info);
+}
+
+static GtkWidget *
+pack_with_label (const char *str, GtkWidget *widget1, GtkWidget *widget2)
+{
+  GtkWidget *box, *label;
+
+  box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
+  if (str)
+    {
+      label = gtk_label_new (str);
+      gtk_box_append (GTK_BOX (box), label);
+    }
+
+  gtk_box_append (GTK_BOX (box), widget1);
+  if (widget2)
+    gtk_box_append (GTK_BOX (box), widget2);
+
+  return box;
+}
+
 GtkWidget *
 do_listview_ucd (GtkWidget *do_widget)
 {
   if (window == NULL)
     {
       GtkWidget *listview, *sw;
-      GtkWidget *box, *label;
+      GtkWidget *box, *label, *box2, *button;
       GtkCssProvider *provider;
 
       window = gtk_window_new ();
@@ -362,6 +494,36 @@ do_listview_ucd (GtkWidget *do_widget)
                               gtk_widget_get_display (do_widget));
       g_object_add_weak_pointer (G_OBJECT (window), (gpointer *) &window);
 
+      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 10);
+      gtk_widget_set_margin_start (GTK_WIDGET (box2), 20);
+      gtk_widget_set_margin_top (GTK_WIDGET (box2), 20);
+      gtk_widget_set_margin_bottom (GTK_WIDGET (box2), 15);
+
+      spin = gtk_spin_button_new_with_range (1.0, 33796.0, 1.0);
+      gtk_spin_button_set_numeric (GTK_SPIN_BUTTON (spin), TRUE);
+      gtk_spin_button_set_wrap (GTK_SPIN_BUTTON (spin), TRUE);
+      gtk_widget_set_valign (spin, GTK_ALIGN_CENTER);
+
+      check_v = gtk_check_button_new_with_label ("center row");
+      check_va = gtk_check_button_new_with_label ("center row always");
+      check_h = gtk_check_button_new_with_label ("center col");
+      check_ha = gtk_check_button_new_with_label ("center col always");
+      gtk_widget_set_sensitive (check_h, FALSE);
+      gtk_widget_set_sensitive (check_ha, FALSE);
+
+      button = gtk_button_new_with_label ("Scroll to row / col");
+      gtk_widget_set_valign (button, GTK_ALIGN_CENTER);
+      g_signal_connect (button, "clicked", G_CALLBACK (scroll_to_cb), NULL);
+
+      dropdown_cols = gtk_drop_down_new (NULL, NULL);
+      gtk_drop_down_set_show_arrow (GTK_DROP_DOWN (dropdown_cols), FALSE);
+
+      gtk_box_append (GTK_BOX (box2), pack_with_label ("Row nº to scroll to:", spin, NULL));
+      gtk_box_append (GTK_BOX (box2), pack_with_label ("Col to scroll (optional):", dropdown_cols, NULL));
+      gtk_box_append (GTK_BOX (box2), pack_with_label (NULL, pack_with_label (NULL, check_v, check_va),
+                                                             pack_with_label (NULL, check_h, check_ha)));
+      gtk_box_append (GTK_BOX (box2), button);
+
       box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
       label = gtk_label_new ("");
       gtk_label_set_width_chars (GTK_LABEL (label), 2);
@@ -374,10 +536,18 @@ do_listview_ucd (GtkWidget *do_widget)
 
       sw = gtk_scrolled_window_new ();
       gtk_scrolled_window_set_propagate_natural_width (GTK_SCROLLED_WINDOW (sw), TRUE);
+      gtk_scrolled_window_set_propagate_natural_height (GTK_SCROLLED_WINDOW (sw), TRUE);
       listview = create_ucd_view (label);
+      gtk_drop_down_set_model (GTK_DROP_DOWN (dropdown_cols),
+                               gtk_column_view_get_columns (GTK_COLUMN_VIEW (listview)));
+      gtk_drop_down_set_expression (GTK_DROP_DOWN (dropdown_cols),
+                                    gtk_property_expression_new (GTK_TYPE_COLUMN_VIEW_COLUMN,
+                                                                 NULL, "title"));
+      g_signal_connect (dropdown_cols, "notify::selected", G_CALLBACK (dropdown_cols_changed), NULL);
+      list_view = listview;
       gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), listview);
       gtk_box_prepend (GTK_BOX (box), sw);
-      gtk_window_set_child (GTK_WINDOW (window), box);
+      gtk_window_set_child (GTK_WINDOW (window), pack_with_label (NULL, box2, box));
 
       g_object_set_data_full (G_OBJECT (window), "provider", provider, remove_provider);
     }

demos/gtk-demo/path_maze.c

@@ -8,7 +8,6 @@
  * is a rather complex path.
  */
 
-#include "config.h"
 #include <glib/gi18n.h>
 #include <gtk/gtk.h>
 
@@ -132,24 +131,6 @@ gtk_maze_class_init (GtkMazeClass *klass)
   widget_class->snapshot = gtk_maze_snapshot;
 }
 
-static void
-celebrate (gboolean win)
-{
-  char *path;
-  GtkMediaStream *stream;
-
-  if (win)
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "complete.oga", NULL);
-  else
-    path = g_build_filename (GTK_DATADIR, "sounds", "freedesktop", "stereo", "suspend-error.oga", NULL);
-  stream = gtk_media_file_new_for_filename (path);
-  gtk_media_stream_set_volume (stream, 1.0);
-  gtk_media_stream_play (stream);
-
-  g_signal_connect (stream, "notify::ended", G_CALLBACK (g_object_unref), NULL);
-  g_free (path);
-}
-
 static void
 pointer_motion (GtkEventControllerMotion *controller,
                 double                    x,
@@ -172,8 +153,6 @@ pointer_motion (GtkEventControllerMotion *controller,
         return;
     }
 
-  celebrate (FALSE);
-
   self->active = FALSE;
   gtk_widget_queue_draw (GTK_WIDGET (self));
 }

demos/gtk-demo/path_spinner.c

@@ -9,8 +9,6 @@
 
 #include "paintable.h"
 
-#undef SHOW_CONTROLS
-
 #define GTK_TYPE_SPINNER_PAINTABLE (gtk_spinner_paintable_get_type ())
 G_DECLARE_FINAL_TYPE (GtkSpinnerPaintable, gtk_spinner_paintable, GTK, SPINNER_PAINTABLE, GObject)
 
@@ -152,7 +150,6 @@ static gboolean
 add_controls (GskPathOperation        op,
               const graphene_point_t *pts,
               gsize                   n_pts,
-              float                   weight,
               gpointer                data)
 {
   GskPathBuilder *builder = data;
@@ -169,7 +166,7 @@ add_controls (GskPathOperation        op,
       break;
 
     case GSK_PATH_QUAD:
-    case GSK_PATH_CONIC:
+    case GSK_PATH_ARC:
       gsk_path_builder_line_to (builder, pts[1].x, pts[1].y);
       gsk_path_builder_line_to (builder, pts[2].x, pts[2].y);
       break;

demos/gtk-demo/path_walk.ui

@@ -11,8 +11,6 @@
                 <property name="lower">0</property>
                 <property name="upper">5000</property>
                 <property name="value">500</property>
-                <property name="step-increment">1</property>
-                <property name="page-increment">10</property>
               </object>
             </property>
           </object>

demos/gtk-demo/pickers.c

@@ -11,13 +11,11 @@
 #include <gtk/gtk.h>
 
 static GtkWidget *app_picker;
-static GtkWidget *print_button;
 
 static void
 set_file (GFile    *file,
           gpointer  data)
 {
-  GFileInfo *info;
   char *name;
 
   if (!file)
@@ -33,13 +31,6 @@ set_file (GFile    *file,
 
   gtk_widget_set_sensitive (app_picker, TRUE);
   g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
-
-  info = g_file_query_info (file, "standard::content-type", 0, NULL, NULL);
-  if (strcmp (g_file_info_get_content_type (info), "application/pdf") == 0)
-    {
-      gtk_widget_set_sensitive (print_button, TRUE);
-      g_object_set_data_full (G_OBJECT (print_button), "file", g_object_ref (file), g_object_unref);
-    }
 }
 
 static void
@@ -56,10 +47,6 @@ file_opened (GObject *source,
     {
       g_print ("%s\n", error->message);
       g_error_free (error);
-      gtk_widget_set_sensitive (app_picker, FALSE);
-      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
-      gtk_widget_set_sensitive (print_button, FALSE);
-      g_object_set_data (G_OBJECT (print_button), "file", NULL);
     }
 
   set_file (file, data);
@@ -127,53 +114,6 @@ open_app (GtkButton *picker)
   g_object_unref (launcher);
 }
 
-static void
-print_file_done (GObject      *source,
-                 GAsyncResult *result,
-                 gpointer      data)
-{
-  GtkPrintDialog *dialog = GTK_PRINT_DIALOG (source);
-  GError *error = NULL;
-  GCancellable *cancellable;
-  unsigned int id;
-
-  cancellable = g_task_get_cancellable (G_TASK (result));
-  id = GPOINTER_TO_UINT (g_object_get_data (G_OBJECT (cancellable), "timeout"));
-  if (id)
-    g_source_remove (id);
-
-  if (!gtk_print_dialog_print_file_finish (dialog, result, &error))
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-}
-
-static void
-print_file (GtkButton *picker)
-{
-  GtkWindow *parent = GTK_WINDOW (gtk_widget_get_root (GTK_WIDGET (picker)));
-  GtkPrintDialog *dialog;
-  GCancellable *cancellable;
-  GFile *file;
-  unsigned int id;
-
-  file = G_FILE (g_object_get_data (G_OBJECT (picker), "file"));
-  dialog = gtk_print_dialog_new ();
-
-  cancellable = g_cancellable_new ();
-
-  id = g_timeout_add_seconds_full (G_PRIORITY_DEFAULT,
-                                   20,
-                                   abort_mission, g_object_ref (cancellable), g_object_unref);
-  g_object_set_data (G_OBJECT (cancellable), "timeout", GUINT_TO_POINTER (id));
-
-  gtk_print_dialog_print_file (dialog, parent, file, cancellable, print_file_done, NULL);
-
-  g_object_unref (cancellable);
-  g_object_unref (dialog);
-}
-
 static void
 open_uri_done (GObject      *source,
                GAsyncResult *result,
@@ -294,15 +234,9 @@ do_pickers (GtkWidget *do_widget)
     gtk_widget_set_sensitive (app_picker, FALSE);
     g_signal_connect (app_picker, "clicked", G_CALLBACK (open_app), NULL);
     gtk_box_append (GTK_BOX (picker), app_picker);
-
-    print_button = gtk_button_new_from_icon_name ("printer-symbolic");
-    gtk_widget_set_tooltip_text (print_button, "Print file");
-    gtk_widget_set_sensitive (print_button, FALSE);
-    g_signal_connect (print_button, "clicked", G_CALLBACK (print_file), NULL);
-    gtk_box_append (GTK_BOX (picker), print_button);
-
     gtk_grid_attach (GTK_GRID (table), picker, 1, 2, 1, 1);
 
+
     label = gtk_label_new ("URI:");
     gtk_widget_set_halign (label, GTK_ALIGN_START);
     gtk_widget_set_valign (label, GTK_ALIGN_CENTER);

gdk/gdk.c

@@ -263,7 +263,7 @@ gdk_parse_debug_var (const char        *variable,
         if (debug_enabled || keys[i].always_enabled)
           fprintf (stderr, "  %s%*s%s\n", keys[i].key, (int)(max_width - strlen (keys[i].key)), " ", keys[i].help);
       }
-      fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values. Other given values are subtracted");
+      fprintf (stderr, "  %s%*s%s\n", "all", max_width - 3, " ", "Enable all values");
       fprintf (stderr, "  %s%*s%s\n", "help", max_width - 4, " ", "Print this help");
       fprintf (stderr, "\nMultiple values can be given, separated by : or space.\n");
     }

gdk/gdkarrayimpl.c

@@ -82,18 +82,6 @@ gdk_array(init) (GdkArray *self)
 #endif
 }
 
-G_GNUC_UNUSED static inline gsize
-gdk_array(get_capacity) (const GdkArray *self)
-{
-  return self->end_allocation - self->start;
-}
-
-G_GNUC_UNUSED static inline gsize
-gdk_array(get_size) (const GdkArray *self)
-{
-  return self->end - self->start;
-}
-
 static inline void
 gdk_array(free_elements) (_T_ *start,
                           _T_ *end)
@@ -122,38 +110,6 @@ gdk_array(clear) (GdkArray *self)
   gdk_array(init) (self);
 }
 
-/*
- * gdk_array_steal:
- * @self: the array
- *
- * Steals all data in the array and clears the array.
- *
- * If you need to know the size of the data, you should query it
- * beforehand.
- *
- * Returns: The array's data
- **/
-G_GNUC_UNUSED static inline _T_ *
-gdk_array(steal) (GdkArray *self)
-{
-  _T_ *result;
-
-#ifdef GDK_ARRAY_PREALLOC
-  if (self->start == self->preallocated)
-    {
-      gsize size = GDK_ARRAY_REAL_SIZE (gdk_array(get_size) (self));
-      result = g_new (_T_, size);
-      memcpy (result, self->preallocated, sizeof (_T_) * size);
-    }
-  else
-#endif
-    result = self->start;
-
-  gdk_array(init) (self);
-
-  return result;
-}
-
 G_GNUC_UNUSED static inline _T_ *
 gdk_array(get_data) (const GdkArray *self)
 {
@@ -167,6 +123,18 @@ gdk_array(index) (const GdkArray *self,
   return self->start + pos;
 }
 
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_capacity) (const GdkArray *self)
+{
+  return self->end_allocation - self->start;
+}
+
+G_GNUC_UNUSED static inline gsize
+gdk_array(get_size) (const GdkArray *self)
+{
+  return self->end - self->start;
+}
+
 G_GNUC_UNUSED static inline gboolean
 gdk_array(is_empty) (const GdkArray *self)
 {
@@ -183,7 +151,7 @@ gdk_array(reserve) (GdkArray *self,
     return;
 
   size = gdk_array(get_size) (self);
-  new_size = ((gsize) 1) << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
+  new_size = 1 << g_bit_storage (MAX (GDK_ARRAY_REAL_SIZE (n), 16) - 1);
 
 #ifdef GDK_ARRAY_PREALLOC
   if (self->start == self->preallocated)
@@ -318,5 +286,3 @@ gdk_array(get) (const GdkArray *self,
 #undef GDK_ARRAY_TYPE_NAME
 #undef GDK_ARRAY_NO_MEMSET
 #endif
-
-G_END_DECLS

gdk/gdkdisplay.c

@@ -473,7 +473,8 @@ gdk_display_get_event (GdkDisplay *display)
  * @display: a `GdkDisplay`
  * @event: (transfer none): a `GdkEvent`
  *
- * Adds the given event to the event queue for @display.
+ * Appends the given event onto the front of the event
+ * queue for @display.
  *
  * Deprecated: 4.10: This function is only useful in very
  * special situations and should not be used by applications.

gdk/gdkglcontext.c

@@ -1715,56 +1715,6 @@ gdk_gl_context_get_version (GdkGLContext *context,
     *minor = gdk_gl_version_get_minor (&priv->gl_version);
 }
 
-const char *
-gdk_gl_context_get_glsl_version_string (GdkGLContext *self)
-{
-  GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (self);
-
-  if (priv->api == GDK_GL_API_GL)
-    {
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 6)))
-        return "#version 460";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 5)))
-        return "#version 450";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 4)))
-        return "#version 440";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 3)))
-        return "#version 430";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 2)))
-        return "#version 420";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 1)))
-        return "#version 410";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (4, 0)))
-        return "#version 400";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 3)))
-        return "#version 330";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 2)))
-        return "#version 150";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 1)))
-        return "#version 140";
-      else
-        return "#version 130";
-    }
-  else if (priv->api == GDK_GL_API_GLES)
-    {
-      if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 2)))
-        return "#version 320 es";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 1)))
-        return "#version 310 es";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-        return "#version 300 es";
-      else if (gdk_gl_version_greater_equal (&priv->gl_version, &GDK_GL_VERSION_INIT (3, 0)))
-        return "#version 300 es";
-      else
-        return "#version 100";
-    }
-  else
-    {
-      /* must be realized to be called */
-      g_assert_not_reached ();
-    }
-}
-
 /**
  * gdk_gl_context_clear_current:
  *

gdk/gdkglcontextprivate.h

@@ -147,8 +147,6 @@ void                    gdk_gl_context_label_object_printf      (GdkGLContext
                                                                  const char      *format,
                                                                 ...)  G_GNUC_PRINTF (4, 5);
 
-const char *            gdk_gl_context_get_glsl_version_string  (GdkGLContext    *self);
-
 gboolean                gdk_gl_context_has_debug                (GdkGLContext    *self) G_GNUC_PURE;
 
 gboolean                gdk_gl_context_use_es_bgra              (GdkGLContext    *context);

gdk/gdkpaintable.c

@@ -24,16 +24,13 @@
 #include "gdksnapshotprivate.h"
 #include "gdkprivate.h"
 
-#include <graphene.h>
-
 /* HACK: So we don't need to include any (not-yet-created) GSK or GTK headers */
 GdkSnapshot *   gtk_snapshot_new                        (void);
 void            gtk_snapshot_push_debug                 (GdkSnapshot            *snapshot,
                                                          const char             *message,
                                                          ...) G_GNUC_PRINTF (2, 3);
 void            gtk_snapshot_pop                        (GdkSnapshot            *snapshot);
-GdkPaintable *  gtk_snapshot_free_to_paintable          (GdkSnapshot            *snapshot,
-                                                         const graphene_size_t  *size);
+GdkPaintable *  gtk_snapshot_free_to_paintable          (GdkSnapshot            *snapshot);
 
 /**
  * GdkPaintable:
@@ -121,7 +118,7 @@ gdk_paintable_default_get_current_image (GdkPaintable *paintable)
 
   snapshot = gtk_snapshot_new ();
   gdk_paintable_snapshot (paintable, snapshot, width, height);
-  return gtk_snapshot_free_to_paintable (snapshot, NULL);
+  return gtk_snapshot_free_to_paintable (snapshot);
 }
 
 static GdkPaintableFlags

gdk/gdktexture.c

@@ -345,9 +345,7 @@ gdk_texture_init (GdkTexture *self)
  *
  * Creates a new texture object representing the surface.
  *
- * The @surface must be an image surface with format `CAIRO_FORMAT_ARGB32`.
- *
- * The newly created texture will acquire a reference on the @surface.
+ * @surface must be an image surface with format `CAIRO_FORMAT_ARGB32`.
  *
  * Returns: a new `GdkTexture`
  */
@@ -366,7 +364,7 @@ gdk_texture_new_for_surface (cairo_surface_t *surface)
                                       * cairo_image_surface_get_stride (surface),
                                       (GDestroyNotify) cairo_surface_destroy,
                                       cairo_surface_reference (surface));
-
+  
   texture = gdk_memory_texture_new (cairo_image_surface_get_width (surface),
                                     cairo_image_surface_get_height (surface),
                                     GDK_MEMORY_DEFAULT,
@@ -821,7 +819,7 @@ gdk_texture_set_render_data (GdkTexture     *self,
                              GDestroyNotify  notify)
 {
   g_return_val_if_fail (data != NULL, FALSE);
-
+ 
   if (self->render_key != NULL)
     return FALSE;
 

gdk/gdkvulkancontext.c

@@ -1408,11 +1408,8 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
                                                     },
                                                     .enabledExtensionCount = device_extensions->len,
                                                     .ppEnabledExtensionNames = (const char * const *) device_extensions->pdata,
-                                                    .pNext = &(VkPhysicalDeviceVulkan12Features) {
-                                                      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_VULKAN_1_2_FEATURES,
-                                                      .shaderSampledImageArrayNonUniformIndexing = VK_TRUE,
-                                                      .shaderStorageBufferArrayNonUniformIndexing = VK_TRUE,
-                                                      .descriptorIndexing = VK_TRUE,
+                                                    .pNext = &(VkPhysicalDeviceDescriptorIndexingFeatures) {
+                                                      .sType = VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_DESCRIPTOR_INDEXING_FEATURES,
                                                       .descriptorBindingPartiallyBound = VK_TRUE,
                                                       .descriptorBindingVariableDescriptorCount = VK_TRUE,
                                                       .descriptorBindingSampledImageUpdateAfterBind = VK_TRUE,
@@ -1556,7 +1553,7 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                                  .applicationVersion = 0,
                                                  .pEngineName = "GTK",
                                                  .engineVersion = VK_MAKE_VERSION (GDK_MAJOR_VERSION, GDK_MINOR_VERSION, GDK_MICRO_VERSION),
-                                                 .apiVersion = VK_API_VERSION_1_2
+                                                 .apiVersion = VK_API_VERSION_1_0
                                              },
                                              .enabledLayerCount = used_layers->len,
                                              .ppEnabledLayerNames = (const char * const *) used_layers->pdata,

gdk/macos/gdkmacoscairocontext.c

@@ -188,14 +188,6 @@ copy_surface_data (GdkMacosBuffer       *from,
     }
 }
 
-static void
-clamp_region_to_surface (cairo_region_t *region,
-                         GdkSurface     *surface)
-{
-  cairo_rectangle_int_t rectangle = {0, 0, surface->width, surface->height};
-  cairo_region_intersect_rectangle (region, &rectangle);
-}
-
 static void
 _gdk_macos_cairo_context_begin_frame (GdkDrawContext *draw_context,
                                       GdkMemoryDepth  depth,
@@ -213,8 +205,6 @@ _gdk_macos_cairo_context_begin_frame (GdkDrawContext *draw_context,
   surface = GDK_MACOS_SURFACE (gdk_draw_context_get_surface (draw_context));
   buffer = _gdk_macos_surface_get_buffer (surface);
 
-  clamp_region_to_surface (region, GDK_SURFACE (surface));
-
   _gdk_macos_buffer_set_damage (buffer, region);
   _gdk_macos_buffer_set_flipped (buffer, FALSE);
 

gdk/macos/gdkmacosdisplay-private.h

@@ -90,7 +90,7 @@ struct _GdkMacosDisplay
   /* Note if we have a key window that is not a GdkMacosWindow
    * such as a NSPanel used for native dialogs.
    */
-  guint key_window_is_foreign : 1;
+  guint key_window_is_foregin : 1;
 };
 
 struct _GdkMacosDisplayClass

gdk/macos/gdkmacosdisplay.c

@@ -424,7 +424,7 @@ select_key_in_idle_cb (gpointer data)
   self->select_key_in_idle = 0;
 
   /* Don't steal focus from NSPanel, etc */
-  if (self->key_window_is_foreign)
+  if (self->key_window_is_foregin)
     return G_SOURCE_REMOVE;
 
   if (self->keyboard_surface == NULL)
@@ -941,7 +941,7 @@ _gdk_macos_display_get_surfaces (GdkMacosDisplay *self)
       NSArray *array = [NSApp orderedWindows];
       GQueue sorted = G_QUEUE_INIT;
 
-      self->key_window_is_foreign = FALSE;
+      self->key_window_is_foregin = FALSE;
 
       for (id obj in array)
         {
@@ -949,7 +949,7 @@ _gdk_macos_display_get_surfaces (GdkMacosDisplay *self)
           GdkMacosSurface *surface;
 
           if ([nswindow isKeyWindow])
-            self->key_window_is_foreign = !GDK_IS_MACOS_WINDOW (nswindow);
+            self->key_window_is_foregin = !GDK_IS_MACOS_WINDOW (nswindow);
 
           if (!GDK_IS_MACOS_WINDOW (nswindow))
             continue;

gdk/wayland/gdkapplaunchcontext-wayland.c

@@ -46,21 +46,6 @@ static const struct xdg_activation_token_v1_listener token_listener = {
   token_done,
 };
 
-static struct wl_surface *
-peek_launcher_toplevel (GdkSeat *seat)
-{
-  struct wl_surface *wl_surface = NULL;
-  GdkSurface *focus_surface;
-
-  focus_surface = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (seat));
-  while (focus_surface && focus_surface->parent)
-    focus_surface = focus_surface->parent;
-  if (focus_surface)
-    wl_surface = gdk_wayland_surface_get_wl_surface (focus_surface);
-
-  return wl_surface;
-}
-
 static char *
 gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context,
                                                       GAppInfo          *info,
@@ -77,6 +62,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
       struct wl_event_queue *event_queue;
       struct wl_surface *wl_surface = NULL;
       GdkWaylandSeat *seat;
+      GdkSurface *focus_surface;
       AppLaunchData app_launch_data = { 0 };
 
       event_queue = wl_display_create_queue (display->wl_display);
@@ -92,7 +78,9 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
                                           _gdk_wayland_seat_get_last_implicit_grab_serial (seat, NULL),
                                           gdk_wayland_seat_get_wl_seat (GDK_SEAT (seat)));
 
-      wl_surface = peek_launcher_toplevel (GDK_SEAT (seat));
+      focus_surface = gdk_wayland_device_get_focus (gdk_seat_get_keyboard (GDK_SEAT (seat)));
+      if (focus_surface)
+        wl_surface = gdk_wayland_surface_get_wl_surface (focus_surface);
       if (wl_surface)
         xdg_activation_token_v1_set_surface (token, wl_surface);
 

gdk/wayland/gdkdisplay-wayland.c

@@ -96,12 +96,6 @@
 #define XDG_ACTIVATION_VERSION   1
 #define OUTPUT_VERSION           3
 
-#ifdef HAVE_TOPLEVEL_STATE_SUSPENDED
-#define XDG_WM_BASE_VERSION      6
-#else
-#define XDG_WM_BASE_VERSION      5
-#endif
-
 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
 
 G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY)
@@ -644,8 +638,7 @@ _gdk_wayland_display_open (const char *display_name)
         wl_registry_bind (display_wayland->wl_registry,
                           display_wayland->xdg_wm_base_id,
                           &xdg_wm_base_interface,
-                          MIN (display_wayland->xdg_wm_base_version,
-                               XDG_WM_BASE_VERSION));
+                          MIN (display_wayland->xdg_wm_base_version, 4));
       xdg_wm_base_add_listener (display_wayland->xdg_wm_base,
                                 &xdg_wm_base_listener,
                                 display_wayland);

gdk/wayland/gdktoplevel-wayland.c

@@ -672,18 +672,10 @@ xdg_toplevel_configure_bounds (void                *data,
   toplevel->pending.has_bounds = TRUE;
 }
 
-static void
-xdg_toplevel_wm_capabilities (void                *data,
-                              struct xdg_toplevel *xdg_toplevel,
-                              struct wl_array     *capabilities)
-{
-}
-
 static const struct xdg_toplevel_listener xdg_toplevel_listener = {
   xdg_toplevel_configure,
   xdg_toplevel_close,
   xdg_toplevel_configure_bounds,
-  xdg_toplevel_wm_capabilities,
 };
 
 static void

gdk/win32/gdkdisplay-win32.c

@@ -286,16 +286,15 @@ _gdk_win32_display_init_monitors (GdkWin32Display *win32_display)
       GdkMonitor *ex_monitor;
 
       w32_ex_monitor = GDK_WIN32_MONITOR (g_list_model_get_item (win32_display->monitors, i));
+      g_object_unref (w32_ex_monitor);
       ex_monitor = GDK_MONITOR (w32_ex_monitor);
 
-      if (w32_ex_monitor->remove)
-        {
-          w32_ex_monitor->hmonitor = NULL;
-          g_list_store_remove (G_LIST_STORE (win32_display->monitors), i);
-          gdk_monitor_invalidate (ex_monitor);
-        }
+      if (!w32_ex_monitor->remove)
+        continue;
 
-      g_object_unref (w32_ex_monitor);
+      w32_ex_monitor->hmonitor = NULL;
+      g_list_store_remove (G_LIST_STORE (win32_display->monitors), i);
+      gdk_monitor_invalidate (ex_monitor);
     }
 
   for (i = 0; i < new_monitors->len; i++)

gsk/broadway/gskbroadwayrenderer.c

@@ -453,7 +453,7 @@ get_colorized_texture (GdkTexture *texture,
                        const graphene_matrix_t *color_matrix,
                        const graphene_vec4_t *color_offset)
 {
-  cairo_surface_t *surface;
+  cairo_surface_t *surface = gdk_texture_download_surface (texture);
   cairo_surface_t *image_surface;
   graphene_vec4_t pixel;
   guint32* pixel_data;
@@ -475,7 +475,6 @@ get_colorized_texture (GdkTexture *texture,
         return g_object_ref (colorized->texture);
     }
 
-  surface = gdk_texture_download_surface (texture);
   image_surface = cairo_surface_map_to_image (surface, NULL);
   data = cairo_image_surface_get_data (image_surface);
   width = cairo_image_surface_get_width (image_surface);
@@ -537,8 +536,6 @@ get_colorized_texture (GdkTexture *texture,
                               colorized_list, (GDestroyNotify)colorized_texture_free_list);
     }
 
-  cairo_surface_destroy (surface);
-
   return colorized_texture;
 }
 
@@ -614,7 +611,7 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
             }
 
           texture = gdk_texture_new_for_surface (image_surface);
-          g_ptr_array_add (self->node_textures, texture); /* Transfers ownership to node_textures */
+          g_ptr_array_add (self->node_textures, g_object_ref (texture)); /* Transfers ownership to node_textures */
           texture_id = gdk_broadway_display_ensure_texture (display, texture);
 
           add_rect (nodes, &node->bounds, offset_x, offset_y);
@@ -905,8 +902,6 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
       add_float (nodes, width);
       add_float (nodes, height);
       add_uint32 (nodes, texture_id);
-
-      cairo_surface_destroy (surface);
     }
 }
 

gsk/gl/gskglrenderjob.c

@@ -65,14 +65,6 @@ typedef struct _GskGLRenderClip
   guint          is_fully_contained : 1;
 } GskGLRenderClip;
 
-#define GDK_ARRAY_NAME clips
-#define GDK_ARRAY_TYPE_NAME Clips
-#define GDK_ARRAY_ELEMENT_TYPE GskGLRenderClip
-#define GDK_ARRAY_BY_VALUE 1
-#define GDK_ARRAY_PREALLOC 16
-#define GDK_ARRAY_NO_MEMSET
-#include "gdk/gdkarrayimpl.c"
-
 typedef struct _GskGLRenderModelview
 {
   GskTransform *transform;
@@ -85,14 +77,6 @@ typedef struct _GskGLRenderModelview
   graphene_matrix_t matrix;
 } GskGLRenderModelview;
 
-#define GDK_ARRAY_NAME modelviews
-#define GDK_ARRAY_TYPE_NAME Modelviews
-#define GDK_ARRAY_ELEMENT_TYPE GskGLRenderModelview
-#define GDK_ARRAY_BY_VALUE 1
-#define GDK_ARRAY_PREALLOC 16
-#define GDK_ARRAY_NO_MEMSET
-#include "gdk/gdkarrayimpl.c"
-
 struct _GskGLRenderJob
 {
   /* The context containing the framebuffer we are drawing to. Generally this
@@ -133,12 +117,12 @@ struct _GskGLRenderJob
   /* An array of GskGLRenderModelview updated as nodes are processed. The
    * current modelview is the last element.
    */
-  Modelviews modelview;
+  GArray *modelview;
 
   /* An array of GskGLRenderClip updated as nodes are processed. The
    * current clip is the last element.
    */
-  Clips clip;
+  GArray *clip;
 
   /* Our current alpha state as we process nodes */
   float alpha;
@@ -158,8 +142,6 @@ struct _GskGLRenderJob
   const GskGLRenderModelview *current_modelview;
   GskGLProgram *current_program;
 
-  guint source_is_glyph_atlas : 1;
-
   /* If we should be rendering red zones over fallback nodes */
   guint debug_fallback : 1;
 
@@ -209,22 +191,6 @@ static gboolean gsk_gl_render_job_visit_node_with_offscreen (GskGLRenderJob
                                                              const GskRenderNode  *node,
                                                              GskGLRenderOffscreen *offscreen);
 
-static inline GskGLRenderClip *
-clips_grow_one (Clips *clips)
-{
-  guint len = clips_get_size (clips);
-  clips_set_size (clips, len + 1);
-  return clips_get (clips, len);
-}
-
-static inline GskGLRenderModelview *
-modelviews_grow_one (Modelviews *modelviews)
-{
-  guint len = modelviews_get_size (modelviews);
-  modelviews_set_size (modelviews, len + 1);
-  return modelviews_get (modelviews, len);
-}
-
 static inline int
 get_target_format (GskGLRenderJob      *job,
                    const GskRenderNode *node)
@@ -270,7 +236,7 @@ gsk_rounded_rect_shrink_to_minimum (GskRoundedRect *self)
 static inline gboolean G_GNUC_PURE
 node_supports_2d_transform (const GskRenderNode *node)
 {
-  switch (GSK_RENDER_NODE_TYPE (node))
+  switch (gsk_render_node_get_node_type (node))
     {
     case GSK_COLOR_NODE:
     case GSK_OPACITY_NODE:
@@ -332,7 +298,7 @@ node_supports_transform (const GskRenderNode *node)
    * opacity or color matrix.
    */
 
-  switch (GSK_RENDER_NODE_TYPE (node))
+  switch (gsk_render_node_get_node_type (node))
     {
     case GSK_COLOR_NODE:
     case GSK_OPACITY_NODE:
@@ -498,10 +464,15 @@ gsk_gl_render_job_set_modelview (GskGLRenderJob *job,
   GskGLRenderModelview *modelview;
 
   g_assert (job != NULL);
+  g_assert (job->modelview != NULL);
 
   job->driver->stamps[UNIFORM_SHARED_MODELVIEW]++;
 
-  modelview = modelviews_grow_one (&job->modelview);
+  g_array_set_size (job->modelview, job->modelview->len + 1);
+
+  modelview = &g_array_index (job->modelview,
+                              GskGLRenderModelview,
+                              job->modelview->len - 1);
 
   modelview->transform = transform;
 
@@ -526,17 +497,26 @@ gsk_gl_render_job_push_modelview (GskGLRenderJob *job,
   GskGLRenderModelview *modelview;
 
   g_assert (job != NULL);
+  g_assert (job->modelview != NULL);
   g_assert (transform != NULL);
 
   job->driver->stamps[UNIFORM_SHARED_MODELVIEW]++;
 
-  modelview = modelviews_grow_one (&job->modelview);
+  g_array_set_size (job->modelview, job->modelview->len + 1);
 
-  if G_LIKELY (modelviews_get_size (&job->modelview) > 1)
+  modelview = &g_array_index (job->modelview,
+                              GskGLRenderModelview,
+                              job->modelview->len - 1);
+
+  if G_LIKELY (job->modelview->len > 1)
     {
-      GskGLRenderModelview *last = job->modelview.end - 2;
+      GskGLRenderModelview *last;
       GskTransform *t = NULL;
 
+      last = &g_array_index (job->modelview,
+                             GskGLRenderModelview,
+                             job->modelview->len - 2);
+
       /* Multiply given matrix with our previous modelview */
       t = gsk_transform_translate (gsk_transform_ref (last->transform),
                                    &(graphene_point_t) {
@@ -570,7 +550,8 @@ gsk_gl_render_job_pop_modelview (GskGLRenderJob *job)
   const GskGLRenderModelview *head;
 
   g_assert (job != NULL);
-  g_assert (modelviews_get_size (&job->modelview) > 0);
+  g_assert (job->modelview);
+  g_assert (job->modelview->len > 0);
 
   job->driver->stamps[UNIFORM_SHARED_MODELVIEW]++;
 
@@ -581,11 +562,11 @@ gsk_gl_render_job_pop_modelview (GskGLRenderJob *job)
 
   gsk_transform_unref (head->transform);
 
-  job->modelview.end--;
+  job->modelview->len--;
 
-  if (modelviews_get_size (&job->modelview) >= 1)
+  if (job->modelview->len >= 1)
     {
-      head = job->modelview.end - 1;
+      head = &g_array_index (job->modelview, GskGLRenderModelview, job->modelview->len - 1);
 
       job->scale_x = head->scale_x;
       job->scale_y = head->scale_y;
@@ -605,12 +586,14 @@ gsk_gl_render_job_push_clip (GskGLRenderJob       *job,
   GskGLRenderClip *clip;
 
   g_assert (job != NULL);
+  g_assert (job->clip != NULL);
   g_assert (rect != NULL);
 
   job->driver->stamps[UNIFORM_SHARED_CLIP_RECT]++;
 
-  clip = clips_grow_one (&job->clip);
+  g_array_set_size (job->clip, job->clip->len + 1);
 
+  clip = &g_array_index (job->clip, GskGLRenderClip, job->clip->len - 1);
   memcpy (&clip->rect, rect, sizeof *rect);
   clip->is_rectilinear = gsk_rounded_rect_is_rectilinear (rect);
   clip->is_fully_contained = FALSE;
@@ -625,13 +608,16 @@ gsk_gl_render_job_push_contained_clip (GskGLRenderJob *job)
   GskGLRenderClip *old_clip;
 
   g_assert (job != NULL);
-  g_assert (clips_get_size (&job->clip) > 0);
+  g_assert (job->clip != NULL);
+  g_assert (job->clip->len > 0);
 
   job->driver->stamps[UNIFORM_SHARED_CLIP_RECT]++;
 
-  clip = clips_grow_one (&job->clip);
-  old_clip = clips_get (&job->clip, clips_get_size (&job->clip) - 2);
+  old_clip = &g_array_index (job->clip, GskGLRenderClip, job->clip->len - 1);
 
+  g_array_set_size (job->clip, job->clip->len + 1);
+
+  clip = &g_array_index (job->clip, GskGLRenderClip, job->clip->len - 1);
   memcpy (&clip->rect.bounds, &old_clip->rect.bounds, sizeof (graphene_rect_t));
   memset (clip->rect.corner, 0, sizeof clip->rect.corner);
   clip->is_rectilinear = TRUE;
@@ -644,11 +630,12 @@ static void
 gsk_gl_render_job_pop_clip (GskGLRenderJob *job)
 {
   g_assert (job != NULL);
-  g_assert (clips_get_size (&job->clip) > 0);
+  g_assert (job->clip != NULL);
+  g_assert (job->clip->len > 0);
 
   job->driver->stamps[UNIFORM_SHARED_CLIP_RECT]++;
   job->current_clip--;
-  job->clip.end--;
+  job->clip->len--;
 }
 
 static inline void
@@ -730,7 +717,7 @@ gsk_gl_render_job_transform_bounds (GskGLRenderJob        *job,
   GskTransformCategory category;
 
   g_assert (job != NULL);
-  g_assert (modelviews_get_size (&job->modelview) > 0);
+  g_assert (job->modelview->len > 0);
   g_assert (rect != NULL);
   g_assert (out_rect != NULL);
 
@@ -1225,12 +1212,12 @@ gsk_gl_render_job_visit_as_fallback (GskGLRenderJob      *job,
     {
       cairo_move_to (cr, 0, 0);
       cairo_rectangle (cr, 0, 0, node->bounds.size.width, node->bounds.size.height);
-      if (GSK_RENDER_NODE_TYPE (node) == GSK_CAIRO_NODE)
+      if (gsk_render_node_get_node_type (node) == GSK_CAIRO_NODE)
         cairo_set_source_rgba (cr, 0.3, 0, 1, 0.25);
       else
         cairo_set_source_rgba (cr, 1, 0, 0, 0.25);
       cairo_fill_preserve (cr);
-      if (GSK_RENDER_NODE_TYPE (node) == GSK_CAIRO_NODE)
+      if (gsk_render_node_get_node_type (node) == GSK_CAIRO_NODE)
         cairo_set_source_rgba (cr, 0.3, 0, 1, 1);
       else
         cairo_set_source_rgba (cr, 1, 0, 0, 1);
@@ -1273,7 +1260,6 @@ done:
                                       GL_TEXTURE_2D,
                                       GL_TEXTURE0,
                                       texture_id);
-  job->source_is_glyph_atlas = FALSE;
   gsk_gl_render_job_draw_offscreen_rect (job, &node->bounds);
   gsk_gl_render_job_end_draw (job);
 
@@ -1339,7 +1325,6 @@ blur_offscreen (GskGLRenderJob       *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           offscreen->texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform1f (job->current_program,
                                     UNIFORM_BLUR_RADIUS, 0,
                                     blur_radius_x);
@@ -1369,7 +1354,6 @@ blur_offscreen (GskGLRenderJob       *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           pass1->texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform1f (job->current_program,
                                     UNIFORM_BLUR_RADIUS, 0,
                                     blur_radius_y);
@@ -1477,8 +1461,7 @@ gsk_gl_render_job_visit_color_node (GskGLRenderJob      *job,
   batch = gsk_gl_command_queue_get_batch (job->command_queue);
 
   /* Limit the size, or we end up with a coordinate overflow somewhere. */
-  if (job->source_is_glyph_atlas &&
-      node->bounds.size.width < 300 &&
+  if (node->bounds.size.width < 300 &&
       node->bounds.size.height < 300 &&
       batch->any.kind == GSK_GL_COMMAND_KIND_DRAW &&
       batch->any.program == program->id)
@@ -1523,7 +1506,7 @@ gsk_gl_render_job_visit_linear_gradient_node (GskGLRenderJob      *job,
   const graphene_point_t *start = gsk_linear_gradient_node_get_start (node);
   const graphene_point_t *end = gsk_linear_gradient_node_get_end (node);
   int n_color_stops = gsk_linear_gradient_node_get_n_color_stops (node);
-  gboolean repeat = GSK_RENDER_NODE_TYPE (node) == GSK_REPEATING_LINEAR_GRADIENT_NODE;
+  gboolean repeat = gsk_render_node_get_node_type (node) == GSK_REPEATING_LINEAR_GRADIENT_NODE;
   float x1 = job->offset_x + start->x;
   float x2 = job->offset_x + end->x;
   float y1 = job->offset_y + start->y;
@@ -1596,7 +1579,7 @@ gsk_gl_render_job_visit_radial_gradient_node (GskGLRenderJob      *job,
   float end = gsk_radial_gradient_node_get_end (node);
   float hradius = gsk_radial_gradient_node_get_hradius (node);
   float vradius = gsk_radial_gradient_node_get_vradius (node);
-  gboolean repeat = GSK_RENDER_NODE_TYPE (node) == GSK_REPEATING_RADIAL_GRADIENT_NODE;
+  gboolean repeat = gsk_render_node_get_node_type (node) == GSK_REPEATING_RADIAL_GRADIENT_NODE;
   float scale = 1.0f / (end - start);
   float bias = -start * scale;
 
@@ -1685,7 +1668,6 @@ gsk_gl_render_job_visit_clipped_child (GskGLRenderJob        *job,
                                               GL_TEXTURE_2D,
                                               GL_TEXTURE0,
                                               offscreen.texture_id);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_render_job_draw_offscreen_rect (job, clip);
           gsk_gl_render_job_end_draw (job);
         }
@@ -1741,7 +1723,7 @@ gsk_gl_render_job_visit_rounded_clip_node (GskGLRenderJob      *job,
    * which both have rounded corners.
    */
 
-  if (clips_get_size (&job->clip) <= 1)
+  if (job->clip->len <= 1)
     need_offscreen = FALSE;
   else if (gsk_rounded_rect_contains_rect (&job->current_clip->rect, &transformed_clip.bounds))
     need_offscreen = FALSE;
@@ -1776,7 +1758,6 @@ gsk_gl_render_job_visit_rounded_clip_node (GskGLRenderJob      *job,
                                               GL_TEXTURE_2D,
                                               GL_TEXTURE0,
                                               offscreen.texture_id);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_render_job_draw_offscreen (job, &node->bounds, &offscreen);
           gsk_gl_render_job_end_draw (job);
         }
@@ -2142,7 +2123,6 @@ gsk_gl_render_job_visit_transform_node (GskGLRenderJob      *job,
                                                                   offscreen.texture_id,
                                                                   linear_filter ? GL_LINEAR : GL_NEAREST,
                                                                   linear_filter ? GL_LINEAR : GL_NEAREST);
-                  job->source_is_glyph_atlas = FALSE;
                   gsk_gl_render_job_draw_offscreen (job, &child->bounds, &offscreen);
                   gsk_gl_render_job_end_draw (job);
                 }
@@ -2352,7 +2332,6 @@ gsk_gl_render_job_visit_blurred_inset_shadow_node (GskGLRenderJob      *job,
                                             GL_TEXTURE_2D,
                                             GL_TEXTURE0,
                                             blurred_texture_id);
-        job->source_is_glyph_atlas = FALSE;
         gsk_gl_render_job_draw_offscreen (job, &node->bounds, &offscreen);
         gsk_gl_render_job_end_draw (job);
       }
@@ -2618,7 +2597,6 @@ gsk_gl_render_job_visit_blurred_outset_shadow_node (GskGLRenderJob      *job,
                                               GL_TEXTURE_2D,
                                               GL_TEXTURE0,
                                               blurred_texture_id);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_program_set_uniform_rounded_rect (job->current_program,
                                                    UNIFORM_OUTSET_SHADOW_OUTLINE_RECT, 0,
                                                    &transformed_outline);
@@ -2644,7 +2622,6 @@ gsk_gl_render_job_visit_blurred_outset_shadow_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           blurred_texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform_rounded_rect (job->current_program,
                                                UNIFORM_OUTSET_SHADOW_OUTLINE_RECT, 0,
                                                &transformed_outline);
@@ -2810,8 +2787,8 @@ static inline gboolean G_GNUC_PURE
 equal_texture_nodes (const GskRenderNode *node1,
                      const GskRenderNode *node2)
 {
-  if (GSK_RENDER_NODE_TYPE (node1) != GSK_TEXTURE_NODE ||
-      GSK_RENDER_NODE_TYPE (node2) != GSK_TEXTURE_NODE)
+  if (gsk_render_node_get_node_type (node1) != GSK_TEXTURE_NODE ||
+      gsk_render_node_get_node_type (node2) != GSK_TEXTURE_NODE)
     return FALSE;
 
   if (gsk_texture_node_get_texture (node1) !=
@@ -2882,7 +2859,6 @@ gsk_gl_render_job_visit_cross_fade_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE1,
                                           offscreen_end.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform1f (job->current_program,
                                     UNIFORM_CROSS_FADE_PROGRESS, 0,
                                     progress);
@@ -2929,7 +2905,6 @@ gsk_gl_render_job_visit_opacity_node (GskGLRenderJob      *job,
                                                   GL_TEXTURE_2D,
                                                   GL_TEXTURE0,
                                                   offscreen.texture_id);
-              job->source_is_glyph_atlas = FALSE;
               gsk_gl_render_job_draw_offscreen (job, &node->bounds, &offscreen);
               gsk_gl_render_job_end_draw (job);
             }
@@ -3071,7 +3046,6 @@ gsk_gl_render_job_visit_text_node (GskGLRenderJob      *job,
                                                   GL_TEXTURE_2D,
                                                   GL_TEXTURE0,
                                                   texture_id);
-              job->source_is_glyph_atlas = TRUE;
               last_texture = texture_id;
             }
 
@@ -3114,7 +3088,7 @@ gsk_gl_render_job_visit_shadow_node (GskGLRenderJob      *job,
 
   /* Shadow nodes recolor every pixel of the source texture, but leave the alpha in tact.
    * If the child is a color matrix node that doesn't touch the alpha, we can throw that away. */
-  if (GSK_RENDER_NODE_TYPE (shadow_child) == GSK_COLOR_MATRIX_NODE &&
+  if (gsk_render_node_get_node_type (shadow_child) == GSK_COLOR_MATRIX_NODE &&
       !color_matrix_modifies_alpha (shadow_child))
     shadow_child = gsk_color_matrix_node_get_child (shadow_child);
 
@@ -3134,7 +3108,7 @@ gsk_gl_render_job_visit_shadow_node (GskGLRenderJob      *job,
         continue;
 
       if (shadow->radius == 0 &&
-          GSK_RENDER_NODE_TYPE (shadow_child) == GSK_TEXT_NODE)
+          gsk_render_node_get_node_type (shadow_child) == GSK_TEXT_NODE)
         {
           if (dx != 0 || dy != 0)
             {
@@ -3168,6 +3142,10 @@ gsk_gl_render_job_visit_shadow_node (GskGLRenderJob      *job,
 
           offscreen.was_offscreen = TRUE;
         }
+      else if (dx == 0 && dy == 0)
+        {
+          continue; /* Invisible anyway */
+        }
       else
         {
           offscreen.bounds = &shadow_child->bounds;
@@ -3188,7 +3166,6 @@ gsk_gl_render_job_visit_shadow_node (GskGLRenderJob      *job,
                                               GL_TEXTURE_2D,
                                               GL_TEXTURE0,
                                               offscreen.texture_id);
-          job->source_is_glyph_atlas = FALSE;
           rgba_to_half (&shadow->color, color);
           gsk_gl_render_job_draw_offscreen_with_color (job, &bounds, &offscreen, color);
           gsk_gl_render_job_end_draw (job);
@@ -3245,7 +3222,6 @@ gsk_gl_render_job_visit_blur_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           offscreen.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_render_job_draw_coords (job,
                                      min_x, min_y, max_x, max_y,
                                      0, 1, 1, 0,
@@ -3296,7 +3272,6 @@ gsk_gl_render_job_visit_blend_node (GskGLRenderJob      *job,
                                               GL_TEXTURE_2D,
                                               GL_TEXTURE0,
                                               bottom_offscreen.texture_id);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_render_job_draw_offscreen (job, &node->bounds, &bottom_offscreen);
           gsk_gl_render_job_end_draw (job);
         }
@@ -3319,7 +3294,6 @@ gsk_gl_render_job_visit_blend_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE1,
                                           top_offscreen.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform1i (job->current_program,
                                     UNIFORM_BLEND_MODE, 0,
                                     gsk_blend_node_get_blend_mode (node));
@@ -3382,7 +3356,6 @@ gsk_gl_render_job_visit_mask_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE1,
                                           mask_offscreen.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform1i (job->current_program,
                                     UNIFORM_MASK_MODE, 0,
                                     gsk_mask_node_get_mask_mode (node));
@@ -3419,7 +3392,6 @@ gsk_gl_render_job_visit_color_matrix_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           offscreen.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform_matrix (job->current_program,
                                          UNIFORM_COLOR_MATRIX_COLOR_MATRIX, 0,
                                          gsk_color_matrix_node_get_color_matrix (node));
@@ -3502,7 +3474,6 @@ gsk_gl_render_job_visit_gl_shader_node (GskGLRenderJob      *job,
                                                 GL_TEXTURE_2D,
                                                 GL_TEXTURE0 + i,
                                                 offscreens[i].texture_id);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_program_set_uniform2f (program,
                                         UNIFORM_CUSTOM_SIZE, 0,
                                         node->bounds.size.width,
@@ -3637,7 +3608,6 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
                                                         offscreen.has_mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR,
                                                         GL_LINEAR,
                                                         offscreen.sync);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_render_job_draw_offscreen (job, bounds, &offscreen);
           gsk_gl_render_job_end_draw (job);
         }
@@ -3675,7 +3645,6 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
                                                               slice->texture_id,
                                                               use_mipmap ? GL_LINEAR_MIPMAP_LINEAR : GL_LINEAR,
                                                               GL_LINEAR);
-              job->source_is_glyph_atlas = FALSE;
 
               gsk_gl_render_job_draw_coords (job,
                                              x1, y1, x2, y2,
@@ -3794,7 +3763,6 @@ gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
                                                         min_filter,
                                                         mag_filter,
                                                         sync);
-          job->source_is_glyph_atlas = FALSE;
           gsk_gl_render_job_draw_coords (job,
                                          0, 0, clip_rect.size.width, clip_rect.size.height,
                                          u0, v0, u1, v1,
@@ -3836,7 +3804,6 @@ gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
                                                               slice->texture_id,
                                                               min_filter,
                                                               mag_filter);
-              job->source_is_glyph_atlas = FALSE;
               gsk_gl_render_job_draw_coords (job,
                                              slice_bounds.origin.x,
                                              slice_bounds.origin.y,
@@ -3869,7 +3836,6 @@ render_texture:
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_render_job_draw_coords (job,
                                      job->offset_x + clip_rect.origin.x,
                                      job->offset_y + clip_rect.origin.y,
@@ -3922,7 +3888,6 @@ gsk_gl_render_job_visit_repeat_node (GskGLRenderJob      *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           offscreen.texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_program_set_uniform4f (job->current_program,
                                     UNIFORM_REPEAT_CHILD_BOUNDS, 0,
                                     (node->bounds.origin.x - child_bounds->origin.x) / child_bounds->size.width,
@@ -3957,7 +3922,7 @@ gsk_gl_render_job_visit_node (GskGLRenderJob      *job,
   if (!gsk_gl_render_job_update_clip (job, &node->bounds, &has_clip))
     return;
 
-  switch (GSK_RENDER_NODE_TYPE (node))
+  switch (gsk_render_node_get_node_type (node))
     {
     case GSK_BLEND_NODE:
       gsk_gl_render_job_visit_blend_node (job, node);
@@ -4010,12 +3975,12 @@ gsk_gl_render_job_visit_node (GskGLRenderJob      *job,
 
             if (i + 1 < n_children &&
                 job->current_clip->is_fully_contained &&
-                GSK_RENDER_NODE_TYPE (child) == GSK_ROUNDED_CLIP_NODE)
+                gsk_render_node_get_node_type (child) == GSK_ROUNDED_CLIP_NODE)
               {
                 const GskRenderNode *grandchild = gsk_rounded_clip_node_get_child (child);
                 const GskRenderNode *child2 = children[i + 1];
-                if (GSK_RENDER_NODE_TYPE (grandchild) == GSK_COLOR_NODE &&
-                    GSK_RENDER_NODE_TYPE (child2) == GSK_BORDER_NODE &&
+                if (gsk_render_node_get_node_type (grandchild) == GSK_COLOR_NODE &&
+                    gsk_render_node_get_node_type (child2) == GSK_BORDER_NODE &&
                     gsk_border_node_get_uniform_color (child2) &&
                     rounded_rect_equal (gsk_rounded_clip_node_get_clip (child),
                                         gsk_border_node_get_outline (child2)))
@@ -4169,7 +4134,7 @@ gsk_gl_render_job_visit_node_with_offscreen (GskGLRenderJob       *job,
       return FALSE;
     }
 
-  if (GSK_RENDER_NODE_TYPE (node) == GSK_TEXTURE_NODE &&
+  if (gsk_render_node_get_node_type (node) == GSK_TEXTURE_NODE &&
       !offscreen->force_offscreen)
     {
       GdkTexture *texture = gsk_texture_node_get_texture (node);
@@ -4417,7 +4382,6 @@ gsk_gl_render_job_render_flipped (GskGLRenderJob *job,
                                           GL_TEXTURE_2D,
                                           GL_TEXTURE0,
                                           texture_id);
-      job->source_is_glyph_atlas = FALSE;
       gsk_gl_render_job_draw_rect (job, &job->viewport);
       gsk_gl_render_job_end_draw (job);
     }
@@ -4542,8 +4506,8 @@ gsk_gl_render_job_new (GskGLDriver           *driver,
   job = g_new0 (GskGLRenderJob, 1);
   job->driver = g_object_ref (driver);
   job->command_queue = job->driver->command_queue;
-  clips_init (&job->clip);
-  modelviews_init (&job->modelview);
+  job->clip = g_array_sized_new (FALSE, FALSE, sizeof (GskGLRenderClip), 16);
+  job->modelview = g_array_sized_new (FALSE, FALSE, sizeof (GskGLRenderModelview), 16);
   job->framebuffer = framebuffer;
   job->clear_framebuffer = !!clear_framebuffer;
   job->default_framebuffer = default_framebuffer;
@@ -4593,16 +4557,16 @@ gsk_gl_render_job_free (GskGLRenderJob *job)
   job->current_modelview = NULL;
   job->current_clip = NULL;
 
-  while (job->modelview.end > job->modelview.start)
+  while (job->modelview->len > 0)
     {
-      GskGLRenderModelview *modelview = job->modelview.end-1;
+      GskGLRenderModelview *modelview = &g_array_index (job->modelview, GskGLRenderModelview, job->modelview->len-1);
       g_clear_pointer (&modelview->transform, gsk_transform_unref);
-      job->modelview.end--;
+      job->modelview->len--;
     }
 
   g_clear_object (&job->driver);
   g_clear_pointer (&job->region, cairo_region_destroy);
-  modelviews_clear (&job->modelview);
-  clips_clear (&job->clip);
+  g_clear_pointer (&job->modelview, g_array_unref);
+  g_clear_pointer (&job->clip, g_array_unref);
   g_free (job);
 }

gsk/gl/resources/conic_gradient.glsl

@@ -75,10 +75,10 @@ void main() {
 
     if (offset < next_offset) {
       float f = (offset - curr_offset) / (next_offset - curr_offset);
-      vec4 curr_color = get_color(i);
-      vec4 next_color = get_color(i + 1);
+      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);
-      gskSetScaledOutputColor(gsk_premultiply(color), u_alpha);
+      gskSetScaledOutputColor(color, u_alpha);
       return;
     }
   }

gsk/gl/resources/linear_gradient.glsl

@@ -97,10 +97,10 @@ void main() {
 
     if (offset < next_offset) {
       float f = (offset - curr_offset) / (next_offset - curr_offset);
-      vec4 curr_color = get_color(i);
-      vec4 next_color = get_color(i + 1);
+      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);
-      gskSetScaledOutputColor(gsk_premultiply (color), u_alpha);
+      gskSetScaledOutputColor(color, u_alpha);
       return;
     }
   }

gsk/gl/resources/preamble.vs.glsl

@@ -28,8 +28,6 @@ gsk_rounded_rect_shrink (GskRoundedRect r, vec4 amount)
   if (r.corner_points1.zw == r.bounds.zy) new_corner_points1.zw = new_bounds.zy;
   if (r.corner_points2.xy == r.bounds.zw) new_corner_points2.xy = new_bounds.zw;
   if (r.corner_points2.zw == r.bounds.xw) new_corner_points2.zw = new_bounds.xw;
-  new_corner_points1 = clamp (new_corner_points1, new_bounds.xyxy, new_bounds.zwzw);
-  new_corner_points2 = clamp (new_corner_points2, new_bounds.xyxy, new_bounds.zwzw);
 
   return GskRoundedRect (new_bounds, new_corner_points1, new_corner_points2);
 }