gtk/columnview: Invert resizing drag direction in RTL

Reverse the side of column resizing drag handle in RTL and change the base for drag coordinates and the column resizing caluculations. Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6049
gtk/columnview: Invert horizontal translation in RTL
2024-04-13 22:24:51 +03:00 · 2024-04-13 21:50:19 +03:00 · 2024-04-13 21:50:19 +03:00 · 2024-04-13 21:50:19 +03:00
404 changed files with 4575 additions and 10648 deletions
@@ -445,8 +445,9 @@ reference:
            --force-fallback-for=gdk-pixbuf,pango
            -Dintrospection=enabled
            -Ddocumentation=true
+            -Dgtk_doc=true
            -Dgdk-pixbuf:gtk_doc=true
-            -Dpango:documentation=true
+            -Dpango:gtk_doc=true
            -Dbuild-demos=false
            -Dbuild-examples=false
            -Dbuild-tests=false
@@ -24,7 +24,7 @@ flatpak build ${builddir} meson \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
                -Dbuild-demos=true \
-                -Dprofile=devel \
+                -Ddemo-profile=devel \
                _flatpak_build

 flatpak build --env=CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA ${builddir} ninja -C _flatpak_build install
@@ -35,7 +35,7 @@ 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 the process for [GNOME security issues](https://security.gnome.org/).
+When in doubt, follow [security](https://security.gnome.org/).

 ### Bug reports

@@ -144,28 +144,33 @@ $ git clone https://gitlab.gnome.org/yourusername/gtk.git
 $ cd gtk
 ```

+**Note**: if you plan to push changes to back to the main repository and
+have a GNOME account, you can skip the fork, and use the following instead:
+
+```sh
+$ git clone git@gitlab.gnome.org:GNOME/gtk.git
+$ cd gtk
+```
+
 To compile the Git version of GTK on your system, you will need to
 configure your build using Meson:

 ```sh
-$ meson setup _builddir .
-$ meson compile -C _builddir
+$ meson _builddir .
+$ cd _builddir
+$ ninja
 ```

 Typically, you should work on your own branch:

 ```sh
-$ git switch -C your-branch
+$ git checkout -b your-branch
 ```

 Once you've finished working on the bug fix or feature, push the branch
 to the Git repository and open a new merge request, to let the GTK
 maintainers review your contribution.

-**Important**: Do **not** attach a diff or a patch file to a GitLab issue.
-Patches cannot be reviewed, and do not not go through the CI pipeline. If
-you wish to submit your changes to GTK, always use a merge request.
-
 ### Code reviews

 Each contribution is reviewed by the core developers of the GTK project.
@@ -257,4 +262,4 @@ people committing to GTK to follow a few rules:

 If you have been contributing to GTK for a while and you don't have commit
 access to the repository, you may ask to obtain it following the [GNOME account
-process](https://handbook.gnome.org/infrastructure/developer-access.html).
+process](https://wiki.gnome.org/AccountsTeam/NewAccounts).
@@ -1,159 +1,6 @@
-Overview of Changes in 4.15.1, xx-xx-xxxx
+Overview of Changes in 4.15.0, xx-xx-xxxx
 =========================================

-* GtkGraphicsOffload:
- - Don't crash without a child
-
-* CSS:
- - Support the :root selector
-
-* Icontheme:
- - Make symbolic svg loading more efficient
- - Handle color-free symbolics more efficiently
-
-* Accessibility:
- - Make the gtk-demo sidebar search more accessible
- - Stop emitting focus events
-
-* GDK:
- - Support XDG_ACTIVATION_TOKEN
- - dmabuf: Be more defensive when importing unknown formats to GL
- - dmabuf: Use narrow range for YUV
-
-* GSK:
- - Improve logging for GDK_DEBUG=offload
- - Improve logging for GSK_DEBUG=renderer
- - gpu: Warn about inefficient texture import
- - gpu: Handle  tiny offscreens correctly
- - vulkan: Add profiler marks in various places
- - vulkan: Fix a problem with imported dmabufs showing up black
-
-* Wayland:
- - Use wl_compositor version 6
-
-* X11:
- - Implement a missing method
-
-* Build:
- - Fix many ubsan warnings
-
-* Debugging:
- - Show more texture details in the recorder
-
-* macOS:
- - Fix problems with events handed back to the OS
- - Respect GDK_DEBUG=default-settings
-
-* Translation updates:
- Korean
- Turkish
-
-
-Overview of Changes in 4.15.0, 21-04-2024
-=========================================
-
-This release changes the default GSK renderer to be Vulkan, on
-Wayland. Other platforms still use ngl.
-
-The intent of this change is to get wider testing and verify that
-Vulkan drivers are good enough for us to rely on. If significant
-problems show up, we will revert this change for 4.16.
-
-You can still override the renderer choice using the GSK_RENDERER
-environment variable.
-
---
-
-This release also changes font rendering settings by introducing
-a new high-level gtk-font-rendering settings which gives GTK more
-freedom to decide on font rendering.
-
-You can still use the low-level font-related settings by changing
-the new property to 'manual'.
-
---
-
-* GtkColumnView:
- - Fix infinite loops in dispose
- - Fix problems with weak ref cycles in GtkExpression
-
-* GtkListView:
-* GtkShortcutManager:
- - Track the propagation phase of added controllers
-
-* GtkGLArea:
- - Produce dmabuf textures, so graphics offload is possible
-
-* GtkTextView:
- - Support text shadows
-
-* GtkGraphicsOffload:
- - Add a black-background property
-
-* Settings:
- - Add a new gtk-font-rendering setting
-
-* Accessibility:
- - Add support for GetRangeExtents to GtkAccessibleText
- - Add support for GetOffsetAtPoint to GtkAccessibleText
- - Implement GtkAccessibleRange for scrollbars
-
-* GDK:
- - Add a callback-based cursor API
-
-* GSK:
-  Use the Vulkan renderer by default
- - Avoid an infinite recursion with offscreens in some cases
- - Optimize graphics offload to make it more likely that compositors
-   can use direct scanout
-
-* X11:
- - Fix some confusing debug messages
- - Drop a no-longer-relevant optimization that was interfering with
-   getting the current window manager capabilities
-
-* macOS:
- - Implement the color picker for macOS 10.15+
-
-* Debugging:
- - Snow monitor resolution in the inspector
-
-* Demos:
- - Use graphics offload in the shadertoy demo
- - Show more reliable fps numbers in the fishbowl demo
-
-* Tools:
- - Support generating pdf in gtk4-rendernode-tool
-
-* Build:
- - Require pango 1.52
- - Require cairo 1.18
- - Add a missing dependency that was causing build failures
- - Drop deprecated build options:
-   gtk_doc -> documentation
-   update_screenshots -> screenshots
-   demo-profile -> profile
-   demos -> build-demos
-
-* Deprecations:
- - gdk_widget_set/get_font_options
- - gdk_wayland/x11_display_set_cursor_theme
-
-* Translation updates:
- Basque
- Brazilian Portuguese
- British English
- Chinese (China)
- Hebrew
- Kabyle
- Persian
- Polish
- Russian
- Slovenian
- Swedish
- Turkish
-
-
 Overview of Changes in 4.14.2, 03-04-2024
 =========================================

@@ -186,7 +186,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -115,7 +115,7 @@
            "config-opts" : [
                "--libdir=/app/lib",
                "-Dbuildtype=debugoptimized",
-                "-Dprofile=devel"
+                "-Ddemo-profile=devel"
            ],
            "sources" : [
                {
@@ -363,9 +363,7 @@ insert_markup_idle (gpointer data)

      if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
        {
-          guint id;
-          id = g_idle_add (insert_markup_idle, data);
-          g_source_set_name_by_id (id, "[gtk-demo] insert_markup_idle");
+          g_idle_add (insert_markup_idle, data);
          return G_SOURCE_REMOVE;
        }

@@ -400,9 +398,7 @@ parse_markup_idle (gpointer data)
  do {
    if (g_get_monotonic_time () - begin > G_TIME_SPAN_MILLISECOND)
      {
-        guint id;
-        id = g_idle_add (parse_markup_idle, data);
-        g_source_set_name_by_id (id, "[gtk-demo] parse_markup_idle");
+        g_idle_add (parse_markup_idle, data);
        return G_SOURCE_REMOVE;
      }

@@ -40,7 +40,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
 {
  wchar_t *langname_w = NULL;
  wchar_t locale_abbrev_w[9];
-  gchar *langname, *locale_abbrev, *locale;
+  gchar *langname, *locale_abbrev, *locale, *p;
  gint i;
  const LCTYPE iso639_lctypes[] = { LOCALE_SISO639LANGNAME, LOCALE_SISO639LANGNAME2 };
  GHashTable *ht_scripts_langs = (GHashTable *) param;
@@ -59,6 +59,7 @@ get_win32_all_locales_scripts (LPWSTR locale_w, DWORD flags, LPARAM param)
  GetLocaleInfoEx (locale_w, LOCALE_SLOCALIZEDDISPLAYNAME, langname_w, langname_size);
  langname = g_utf16_to_utf8 (langname_w, -1, NULL, NULL, NULL);
  locale = g_utf16_to_utf8 (locale_w, -1, NULL, NULL, NULL);
+  p = strchr (locale, '-');
  lang = pango_language_from_string (locale);
  if (g_hash_table_lookup (ht_scripts_langs, lang) == NULL)
    g_hash_table_insert (ht_scripts_langs, lang, langname);
@@ -20,7 +20,6 @@
 #include "config.h"
 #include <gtk/gtk.h>
 #include <glib/gstdio.h>
-#include <glib/gi18n.h>

 #include "demos.h"
 #include "fontify.h"
@@ -924,34 +923,6 @@ clear_search (GtkSearchBar *bar)
    }
 }

-static void
-search_results_update (GObject    *filter_model,
-                       GParamSpec *pspec,
-                       GtkEntry   *entry)
-{
-  gsize n_items = g_list_model_get_n_items (G_LIST_MODEL (filter_model));
-
-  if (strlen (gtk_editable_get_text (GTK_EDITABLE (entry))) > 0)
-    {
-      char *text;
-
-      if (n_items > 0)
-        text = g_strdup_printf (ngettext ("%ld search result", "%ld search results", n_items), n_items);
-      else
-        text = g_strdup (_("No search results"));
-
-      gtk_accessible_update_property (GTK_ACCESSIBLE (entry),
-                                      GTK_ACCESSIBLE_PROPERTY_DESCRIPTION, text,
-                                      -1);
-
-      g_free (text);
-    }
-  else
-    {
-      gtk_accessible_reset_property (GTK_ACCESSIBLE (entry), GTK_ACCESSIBLE_PROPERTY_DESCRIPTION);
-    }
-}
-
 static void
 activate (GApplication *app)
 {
@@ -999,7 +970,6 @@ activate (GApplication *app)

  search_entry = GTK_WIDGET (gtk_builder_get_object (builder, "search-entry"));
  g_signal_connect (search_entry, "search-changed", G_CALLBACK (demo_search_changed_cb), filter);
-  g_signal_connect (filter_model, "notify::n-items", G_CALLBACK (search_results_update), search_entry);

  selection = gtk_single_selection_new (G_LIST_MODEL (filter_model));
  g_signal_connect (selection, "notify::selected-item", G_CALLBACK (selection_cb), NULL);
@@ -330,7 +330,6 @@ stroke bounds of the path.
 | offset       | `<point>`           | 0 0                 | non-default |
 | hint-style   | `<hint style>`      | slight              | non-default |
 | antialias    | `<antialias>`       | gray                | non-default |
-| hint-metrics | `<hint metrics>`    | off                 | non-default |

 Creates a node like `gsk_text_node_new()` with the given properties.

@@ -347,7 +346,6 @@ font, an error node will be returned.

 Possible values for hint-style are none, slight or full.
 Possible value for antialias are none or gray.
-Possible value for hint-metrics are on or off.

 ### texture

@@ -5,11 +5,8 @@ Title: Cairo interaction
 [Cairo](http://cairographics.org) is a graphics library that supports vector
 graphics and image compositing that can be used with GTK.

-GDK does not wrap the Cairo API and it is not possible to use cairo directly
-to draw on a [class@Gdk.Surface]. You can either use a
-[GtkDrawingArea](../gtk4/class.DrawingArea.html) widget or
-[gtk_snapshot_append_cairo](../gtk4/func.Snapshot.append_cairo.html)
-for drawing with cairo in a GTK4 application.
+GDK does not wrap the Cairo API; instead it allows to create Cairo
+drawing contexts which can be used to draw on [class@Gdk.Surface]s.

 Additional functions allow use [struct@Gdk.Rectangle]s with Cairo
 and to use [struct@Gdk.RGBA], `GdkPixbuf`, and [class@Gdk.Surface]
@@ -74,7 +74,6 @@ in a selector, widget names must be prefixed with a &num; character.
 | E:not(selector) | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#negation) | |
 | E:dir(ltr), E:dir(rtl) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#the-dir-pseudo) | |
 | E:drop(active) | [CSS Selector Level 4](https://drafts.csswg.org/selectors/#drag-pseudos) | |
-| E:root | [CSS Selector Level 3](https://www.w3.org/TR/selectors-3/#root-pseudo) | |
 | E F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#descendent-combinators) | |
 | E > F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#child-combinators) | |
 | E ~ F | [CSS Selector Level 3](https://www.w3.org/TR/css3-selectors/#general-sibling-combinators) | |
@@ -56,30 +56,6 @@ follows:
 1 value:
 : all

-## Custom Properties
-
-GTK supports custom properties as defined in the
-[CSS Custom Properties for Cascading Variables](https://www.w3.org/TR/css-variables-1)
-spec.
-
-Custom properties are defined as follows:
-
-```css
--prop: red;
-```
-
-and used via the `var` keyword:
-
-```css
-color: var(--prop);
-```
-
-Custom properties can have a fallback for when the referred property is invalid:
-
-```css
-color: var(--prop, green);
-```
-
 ## Colors

 GTK extends the CSS syntax with several additional ways to specify colors.
@@ -8,10 +8,6 @@ gtk4-broadwayd
 The Broadway display server
 ---------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-broadwayd** [OPTIONS...] <DISPLAY>
@@ -8,10 +8,6 @@ gtk4-builder-tool
 GtkBuilder File Utility
 -----------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-builder-tool** <COMMAND> [OPTIONS...] <FILE>
@@ -8,9 +8,6 @@ gtk4-demo-application
 Demonstrate GtkApplication
 --------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands

 SYNOPSIS
 --------
@@ -8,10 +8,6 @@ gtk4-demo
 Demonstrate GTK widgets
 -----------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-encode-symbolic-svg
 Symbolic icon conversion utility
 --------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-icon-browser
 List themed icons
 -----------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-launch
 Launch an application
 ---------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-node-editor
 Editor render nodes
 -----------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-path-tool
 GskPath Utility
 -----------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-path-tool** <COMMAND> [OPTIONS...] <PATH>
@@ -8,10 +8,6 @@ gtk4-query-settings
 Print name and value of GTK settings
 ------------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-rendernode-tool
 GskRenderNode Utility
 -----------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------
 |   **gtk4-rendernode-tool** <COMMAND> [OPTIONS...] <FILE>
@@ -49,14 +45,13 @@ without any titlebar.
 Rendering
 ^^^^^^^^^

-The ``render`` command saves a rendering of the rendernode as a png, tiff or svg
-image or as pdf document. The name of the file to write can be specified as a second
-FILE argument.
+The ``render`` command saves a rendering of the rendernode as a png or tiff image.
+The name of the file to write can be specified as a second FILE argument.

 ``--renderer=RENDERER``

  Use the given renderer. Use ``--renderer=help`` to get a information
-  about possible values for the ``RENDERER``.
+  about poassible values for the ``RENDERER``.

 Benchmark
 ^^^^^^^^^
@@ -98,4 +93,4 @@ exit code is 1. If the images are identical, it is 0.

 ``--quiet``

-  Don't write results to stdout.
+  Don't write results to stdout.`
@@ -8,10 +8,6 @@ gtk4-update-icon-cache
 Icon theme caching utility
 --------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -8,10 +8,6 @@ gtk4-widget-factory
 Showcase GTK widgets and styles
 -------------------------------

-:Version: GTK
-:Manual section: 1
-:Manual group: GTK commands
-
 SYNOPSIS
 --------

@@ -80,7 +80,7 @@ if get_option('man-pages') and rst2man.found()
    [ 'gtk4-path-tool', '1', ],
  ]

-  if get_option('build-demos')
+  if get_option('demos')
    rst_files += [
      [ 'gtk4-demo', '1', ],
      [ 'gtk4-demo-application', '1', ],
@@ -217,10 +217,6 @@ A number of options affect behavior instead of logging:
 `no-portals`
 : Disable use of [portals](https://docs.flatpak.org/en/latest/portals.html)

-`force-offload`
-: Force graphics offload for all textures, even when slower. This allows
-  to debug offloading in the absence of dmabufs.
-
 `gl-disable`
 : Disable OpenGL support

@@ -155,7 +155,6 @@ Each property name is part of the `GtkAccessibleProperty` enumeration.
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_MIN | “aria-valuemin” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_NOW | “aria-valuenow” | double |
 | %GTK_ACCESSIBLE_PROPERTY_VALUE_TEXT | “aria-valuetext” | translatable string |
-| %GTK_ACCESSIBLE_PROPERTY_HELP_TEXT | N/A | translatable string |

 #### List of accessible relations

@@ -217,10 +216,6 @@ are accessible as part of the development process. The GTK Inspector shows
 the accessible attributes of each widget, and also provides an overlay that
 can highlight accessibility issues.

-If you support some non-standard keyboard interactions for a widget, you
-**should** set an appropriate `GTK_ACCESSIBLE_PROPERTY_HELP_TEXT` to help
-discoverability of the behavior.
-
 It is possible to set accessible attributes in UI files as well:
 ```xml
 <object class="GtkButton" id="button1">
@@ -122,7 +122,6 @@ static const GdkDebugKey gdk_debug_keys[] = {

  { "portals",         GDK_DEBUG_PORTALS, "Force use of portals" },
  { "no-portals",      GDK_DEBUG_NO_PORTALS, "Disable use of portals" },
-  { "force-offload",   GDK_DEBUG_FORCE_OFFLOAD, "Force graphics offload for all textures" },
  { "gl-disable",      GDK_DEBUG_GL_DISABLE, "Disable OpenGL support" },
  { "gl-no-fractional", GDK_DEBUG_GL_NO_FRACTIONAL, "Disable fractional scaling for OpenGL" },
  { "gl-debug",        GDK_DEBUG_GL_DEBUG, "Insert debugging information in OpenGL" },
@@ -143,50 +142,31 @@ static const GdkDebugKey gdk_debug_keys[] = {

 #ifdef G_HAS_CONSTRUCTORS
 #ifdef G_DEFINE_CONSTRUCTOR_NEEDS_PRAGMA
-#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_and_unset_environment)
+#pragma G_DEFINE_CONSTRUCTOR_PRAGMA_ARGS(stash_desktop_startup_notification_id)
 #endif
-G_DEFINE_CONSTRUCTOR(stash_and_unset_environment)
+G_DEFINE_CONSTRUCTOR(stash_desktop_startup_notification_id)
 #endif

 static char *startup_notification_id = NULL;
-static char *xdg_activation_token = NULL;

 static void
-stash_and_unset_environment (void)
+stash_desktop_startup_notification_id (void)
 {
-  /* Copies environment variables and unsets them so they won't be inherited by
-   * child processes and confuse things.
-   *
-   * Changing environment variables can be racy so we try to do this as early as
-   * possible in the program flow and before any printing that might involve
-   * environment variables.
-   */
-  struct {
-    const char *key;
-    char **dst;
-  } vars[] = {
-    { "DESKTOP_STARTUP_ID", &startup_notification_id },
-    { "XDG_ACTIVATION_TOKEN", &xdg_activation_token },
-  };
-  size_t i;
+  const char *desktop_startup_id;

-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
-    *vars[i].dst = g_strdup (g_getenv (vars[i].key));
-
-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
-    g_unsetenv (vars[i].key);
-
-  for (i = 0; i < G_N_ELEMENTS (vars); i++)
+  desktop_startup_id = g_getenv ("DESKTOP_STARTUP_ID");
+  if (desktop_startup_id && *desktop_startup_id != '\0')
    {
-      if (*vars[i].dst == NULL)
-        continue;
-
-      if (!g_utf8_validate (*vars[i].dst, -1, NULL))
-        {
-          g_warning ("%s contains invalid UTF-8", vars[i].key);
-          g_clear_pointer (vars[i].dst, g_free);
-        }
+      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);
    }
+
+  /* Clear the environment variable so it won't be inherited by
+   * child processes and confuse things.
+   */
+  g_unsetenv ("DESKTOP_STARTUP_ID");
 }

 static gpointer
@@ -311,7 +291,7 @@ gdk_pre_parse (void)
    gdk_gl_backend_use (GDK_GL_WGL);

 #ifndef G_HAS_CONSTRUCTORS
-  stash_and_unset_environment ();
+  stash_desktop_startup_notification_id ();
 #endif
 }

@@ -345,20 +325,15 @@ gdk_display_open_default (void)
 /*< private >
 * gdk_get_startup_notification_id:
 *
- * Returns the original value of the XDG_ACTIVATION_TOKEN environment
- * variable if it was defined and valid, otherwise it returns the original
- * value of the DESKTOP_STARTUP_ID environment variable if it was defined
- * and valid, or %NULL if neither of them were defined and valid.
+ * Returns the original value of the DESKTOP_STARTUP_ID environment
+ * variable if it was defined and valid, or %NULL otherwise.
 *
 * Returns: (nullable) (transfer none): the original value of the
- *   XDG_ACTIVATION_TOKEN or DESKTOP_STARTUP_ID environment variable
+ *   DESKTOP_STARTUP_ID environment variable
 */
 const char *
 gdk_get_startup_notification_id (void)
 {
-  if (xdg_activation_token)
-    return xdg_activation_token;
-
  return startup_notification_id;
 }

@@ -44,7 +44,7 @@ typedef enum {
  GDK_DEBUG_NO_PORTALS      = 1 << 15,
  GDK_DEBUG_GL_DISABLE      = 1 << 16,
  GDK_DEBUG_GL_NO_FRACTIONAL= 1 << 17,
-  GDK_DEBUG_FORCE_OFFLOAD   = 1 << 18,
+
  GDK_DEBUG_GL_DISABLE_GL   = 1 << 19,
  GDK_DEBUG_GL_DISABLE_GLES = 1 << 20,
  GDK_DEBUG_GL_PREFER_GL    = 1 << 21,
@@ -144,8 +144,8 @@ struct _YUVCoefficients
 };

 /* multiplied by 65536 */
-static const YUVCoefficients itu601_narrow = { 104597, -25675, -53279, 132201 };
-//static const YUVCoefficients itu601_wide = { 74711, -25864, -38050, 133176 };
+//static const YUVCoefficients itu601_narrow = { 104597, -25675, -53279, 132201 };
+static const YUVCoefficients itu601_wide = { 74711, -25864, -38050, 133176 };

 static inline void
 get_uv_values (const YUVCoefficients *coeffs,
@@ -229,7 +229,7 @@ download_nv12 (guchar          *dst_data,
          int r, g, b;
          gsize xs, ys;

-          get_uv_values (&itu601_narrow, uv_data[x / X_SUB * 2 + U], uv_data[x / X_SUB * 2 + V], &r, &g, &b);
+          get_uv_values (&itu601_wide, uv_data[x / X_SUB * 2 + U], uv_data[x / X_SUB * 2 + V], &r, &g, &b);

          for (ys = 0; ys < Y_SUB && y + ys < height; ys++)
            for (xs = 0; xs < X_SUB && x + xs < width; xs++)
@@ -309,7 +309,7 @@ download_yuv_3 (guchar          *dst_data,
          int r, g, b;
          gsize xs, ys;

-          get_uv_values (&itu601_narrow, u_data[x / X_SUB], v_data[x / X_SUB], &r, &g, &b);
+          get_uv_values (&itu601_wide, u_data[x / X_SUB], v_data[x / X_SUB], &r, &g, &b);

          for (ys = 0; ys < Y_SUB && y + ys < height; ys++)
            for (xs = 0; xs < X_SUB && x + xs < width; xs++)
@@ -365,7 +365,7 @@ download_yuyv (guchar          *dst_data,
        {
          int r, g, b;

-          get_uv_values (&itu601_narrow, src_data[2 * x + U], src_data[2 * x + V], &r, &g, &b);
+          get_uv_values (&itu601_wide, src_data[2 * x + U], src_data[2 * x + V], &r, &g, &b);
          set_rgb_values (&dst_data[3 * x], src_data[2 * x + Y1], r, g, b);
          if (x + 1 < width)
            set_rgb_values (&dst_data[3 * (x + 1)], src_data[2 * x + Y2], r, g, b);
@@ -163,8 +163,6 @@ gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
    return NULL;

  previous = gdk_gl_context_get_current ();
-  if (previous)
-    g_object_ref (previous);
  formats = gdk_dmabuf_formats_builder_new ();
  external = gdk_dmabuf_formats_builder_new ();

@@ -196,10 +194,7 @@ gdk_dmabuf_get_egl_downloader (GdkDisplay              *display,
    }

  if (previous)
-    {
-      gdk_gl_context_make_current (previous);
-      g_object_unref (previous);
-    }
+    gdk_gl_context_make_current (previous);

  return GDK_DMABUF_DOWNLOADER (renderer);
 }
@@ -244,7 +239,7 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
  attribs[i++] = EGL_YUV_COLOR_SPACE_HINT_EXT;
  attribs[i++] = EGL_ITU_REC601_EXT;
  attribs[i++] = EGL_SAMPLE_RANGE_HINT_EXT;
-  attribs[i++] = EGL_YUV_NARROW_RANGE_EXT;
+  attribs[i++] = EGL_YUV_FULL_RANGE_EXT;

 #define ADD_PLANE(plane) \
  { \
@@ -270,7 +265,6 @@ gdk_dmabuf_egl_create_image (GdkDisplay      *display,
  if (dmabuf->n_planes > 3) ADD_PLANE (3);

  attribs[i++] = EGL_NONE;
-  g_assert (i < G_N_ELEMENTS (attribs));

  image = eglCreateImageKHR (egl_display,
                             EGL_NO_CONTEXT,
@@ -192,6 +192,13 @@ compute_smooth_frame_time (GdkFrameClock *clock,
   *        and new_frame_time >= old_frame_time. */
  frames_passed = (new_frame_time - smoothed_frame_time_base + frame_interval / 2) / frame_interval;

+  if (frames_passed > 1)
+    gdk_profiler_add_markf ((smoothed_frame_time_base - (frame_interval * (frames_passed-1))) * 1000L,
+                            frame_interval * (frames_passed-1) * 1000L,
+                            "Dropped Frames",
+                            "%u frames may have been dropped",
+                            frames_passed-1);
+
  /* We use an approximately whole number of frames in the future from
   * last smoothed frame time. This way we avoid minor jitter in the
   * frame times making the animation speed uneven, but still animate
@@ -1956,6 +1956,8 @@ gdk_gl_context_get_glsl_version_string (GdkGLContext *self)
        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";
    }
@@ -2196,78 +2198,12 @@ gdk_gl_context_import_dmabuf (GdkGLContext    *self,

  gdk_display_init_dmabuf (display);

-  if (gdk_dmabuf_formats_contains (display->egl_dmabuf_formats, dmabuf->fourcc, dmabuf->modifier))
+  if (!gdk_dmabuf_formats_contains (display->egl_external_formats, dmabuf->fourcc, dmabuf->modifier))
    {
-      /* This is the path for modern drivers that support modifiers */
-
-      if (!gdk_dmabuf_formats_contains (display->egl_external_formats, dmabuf->fourcc, dmabuf->modifier))
-        {
-          texture_id = gdk_gl_context_import_dmabuf_for_target (self,
-                                                                width, height,
-                                                                dmabuf,
-                                                                GL_TEXTURE_2D);
-          if (texture_id == 0)
-            {
-              GDK_DISPLAY_DEBUG (display, DMABUF,
-                                 "Import of %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf failed",
-                                 width, height,
-                                 (char *) &dmabuf->fourcc, dmabuf->modifier);
-              return 0;
-            }
-
-          GDK_DISPLAY_DEBUG (display, DMABUF,
-                             "Imported %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf as GL_TEXTURE_2D texture",
-                             width, height,
-                             (char *) &dmabuf->fourcc, dmabuf->modifier);
-          *external = FALSE;
-          return texture_id;
-        }
-
-      if (!gdk_gl_context_get_use_es (self))
-        {
-          GDK_DISPLAY_DEBUG (display, DMABUF,
-                             "Can't import external_only %.4s:%#" G_GINT64_MODIFIER "x outside of GLES",
-                             (char *) &dmabuf->fourcc, dmabuf->modifier);
-          return 0;
-        }
-
      texture_id = gdk_gl_context_import_dmabuf_for_target (self,
                                                            width, height,
                                                            dmabuf,
-                                                            GL_TEXTURE_EXTERNAL_OES);
-      if (texture_id == 0)
-        {
-          GDK_DISPLAY_DEBUG (display, DMABUF,
-                             "Import of external_only %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf failed",
-                             width, height,
-                             (char *) &dmabuf->fourcc, dmabuf->modifier);
-          return 0;
-        }
-
-      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Imported %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf as GL_TEXTURE_EXTERNAL_OES texture",
-                         width, height,
-                         (char *) &dmabuf->fourcc, dmabuf->modifier);
-      *external = TRUE;
-      return texture_id;
-    }
-  else
-    {
-      /* This is the opportunistic path.
-       * We hit it both for drivers that do not support modifiers as well as for dmabufs
-       * that the driver did not explicitly advertise. */
-      int target;
-
-      if (gdk_gl_context_get_use_es (self))
-        target = GL_TEXTURE_EXTERNAL_OES;
-      else
-        target = GL_TEXTURE_2D;
-
-      texture_id = gdk_gl_context_import_dmabuf_for_target (self,
-                                                            width, height,
-                                                            dmabuf,
-                                                            target);
-
+                                                            GL_TEXTURE_2D);
      if (texture_id == 0)
        {
          GDK_DISPLAY_DEBUG (display, DMABUF,
@@ -2278,13 +2214,40 @@ gdk_gl_context_import_dmabuf (GdkGLContext    *self,
        }

      GDK_DISPLAY_DEBUG (display, DMABUF,
-                         "Imported %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf as %s texture",
+                         "Imported %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf as GL_TEXTURE_2D texture",
                         width, height,
-                         (char *) &dmabuf->fourcc, dmabuf->modifier,
-                         target == GL_TEXTURE_EXTERNAL_OES ? "GL_TEXTURE_EXTERNAL_OES" : "GL_TEXTURE_2D");
-      *external = target == GL_TEXTURE_EXTERNAL_OES;
+                         (char *) &dmabuf->fourcc, dmabuf->modifier);
+      *external = FALSE;
      return texture_id;
    }
+
+  if (!gdk_gl_context_get_use_es (self))
+    {
+      GDK_DISPLAY_DEBUG (display, DMABUF,
+                         "Can't import external_only %.4s:%#" G_GINT64_MODIFIER "x outside of GLES",
+                         (char *) &dmabuf->fourcc, dmabuf->modifier);
+      return 0;
+    }
+
+  texture_id = gdk_gl_context_import_dmabuf_for_target (self,
+                                                        width, height,
+                                                        dmabuf,
+                                                        GL_TEXTURE_EXTERNAL_OES);
+  if (texture_id == 0)
+    {
+      GDK_DISPLAY_DEBUG (display, DMABUF,
+                         "Import of external_only %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf failed",
+                         width, height,
+                         (char *) &dmabuf->fourcc, dmabuf->modifier);
+      return 0;
+    }
+
+  GDK_DISPLAY_DEBUG (display, DMABUF,
+                     "Imported %dx%d %.4s:%#" G_GINT64_MODIFIER "x dmabuf as GL_TEXTURE_EXTERNAL_OES texture",
+                     width, height,
+                     (char *) &dmabuf->fourcc, dmabuf->modifier);
+  *external = TRUE;
+  return texture_id;
 }

 gboolean
@@ -98,9 +98,9 @@ gdk_rgba_free (GdkRGBA *rgba)
 * Returns: %TRUE if the @rgba is clear
 */
 gboolean
-(gdk_rgba_is_clear) (const GdkRGBA *rgba)
+gdk_rgba_is_clear (const GdkRGBA *rgba)
 {
-  return _gdk_rgba_is_clear (rgba);
+  return rgba->alpha < ((float) 0x00ff / (float) 0xffff);
 }

 /**
@@ -115,9 +115,9 @@ gboolean
 * Returns: %TRUE if the @rgba is opaque
 */
 gboolean
-(gdk_rgba_is_opaque) (const GdkRGBA *rgba)
+gdk_rgba_is_opaque (const GdkRGBA *rgba)
 {
-  return _gdk_rgba_is_opaque (rgba);
+  return rgba->alpha > ((float)0xff00 / (float)0xffff);
 }

 #define SKIP_WHITESPACES(s) while (*(s) == ' ') (s)++;
@@ -368,10 +368,21 @@ gdk_rgba_hash (gconstpointer p)
 * Returns: %TRUE if the two colors compare equal
 */
 gboolean
-(gdk_rgba_equal) (gconstpointer p1,
-                  gconstpointer p2)
+gdk_rgba_equal (gconstpointer p1,
+                gconstpointer p2)
 {
-  return _gdk_rgba_equal (p1, p2);
+  const GdkRGBA *rgba1, *rgba2;
+
+  rgba1 = p1;
+  rgba2 = p2;
+
+  if (rgba1->red == rgba2->red &&
+      rgba1->green == rgba2->green &&
+      rgba1->blue == rgba2->blue &&
+      rgba1->alpha == rgba2->alpha)
+    return TRUE;
+
+  return FALSE;
 }

 /**
@@ -43,34 +43,5 @@
 gboolean               gdk_rgba_parser_parse                    (GtkCssParser           *parser,
                                                                 GdkRGBA                *rgba);

-#define gdk_rgba_is_clear(rgba) _gdk_rgba_is_clear (rgba)
-#define gdk_rgba_is_opaque(rgba) _gdk_rgba_is_opaque (rgba)
-#define gdk_rgba_equal(p1, p2) _gdk_rgba_equal (p1, p2)
-
-static inline gboolean
-_gdk_rgba_is_clear (const GdkRGBA *rgba)
-{
-  return rgba->alpha < ((float) 0x00ff / (float) 0xffff);
-}
-
-static inline gboolean
-_gdk_rgba_is_opaque (const GdkRGBA *rgba)
-{
-  return rgba->alpha > ((float)0xff00 / (float)0xffff);
-}
-
-static inline gboolean
-_gdk_rgba_equal (gconstpointer p1,
-                 gconstpointer p2)
-{
-  const GdkRGBA *rgba1 = p1;
-  const GdkRGBA *rgba2 = p2;
-
-  return rgba1->red == rgba2->red &&
-         rgba1->green == rgba2->green &&
-         rgba1->blue == rgba2->blue &&
-         rgba1->alpha == rgba2->alpha;
-}
-
 G_END_DECLS

@@ -48,14 +48,6 @@ gdk_subsurface_class_init (GdkSubsurfaceClass *class)
  object_class->finalize = gdk_subsurface_finalize;
 }

-/*< private >
- * gdk_subsurface_get_parent:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns the parent surface of @subsurface.
- *
- * Returns: the parent surface
- */
 GdkSurface *
 gdk_subsurface_get_parent (GdkSubsurface *subsurface)
 {
@@ -116,41 +108,16 @@ insert_subsurface (GdkSubsurface *subsurface,
    }
 }

-/*< private >
- * gdk_subsurface_attach:
- * @subsurface: the `GdkSubsurface`
- * @texture: the texture to attach. This typically has to be a `GdkDmabufTexture`
- * @source: the source rectangle (i.e. the subset of the texture) to display
- * @dest: the dest rectangle, in application pixels, relative to the parent surface.
- *   It must be integral in application and device pixels, or attaching will fail
- * @transform: the transform to apply to the texture contents before displaying
- * @background: (nullable): the background rectangle, in application pixels relative
- *   to the parent surface. This tells GDK to put a black background of this
- *   size below the subsurface. It must be integral in application and device pixels,
- *   or attaching will fail
- * @above: whether the subsurface should be above its sibling
- * @sibling: (nullable): the sibling subsurface to stack relative to, or `NULL` to
- *   stack relative to the parent surface
- *
- * Attaches content to a subsurface.
- *
- * This function takes all the necessary arguments to determine the subsurface
- * configuration, including its position, size, content, background and stacking.
- *
- * Returns: `TRUE` if the attaching succeeded
- */
 gboolean
 gdk_subsurface_attach (GdkSubsurface         *subsurface,
                       GdkTexture            *texture,
                       const graphene_rect_t *source,
                       const graphene_rect_t *dest,
                       GdkTextureTransform    transform,
-                       const graphene_rect_t *background,
                       gboolean               above,
                       GdkSubsurface         *sibling)
 {
  GdkSurface *parent = subsurface->parent;
-  gboolean result;

  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
  g_return_val_if_fail (GDK_IS_TEXTURE (texture), FALSE);
@@ -164,15 +131,6 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
  g_return_val_if_fail (sibling == NULL || GDK_IS_SUBSURFACE (sibling), FALSE);
  g_return_val_if_fail (sibling == NULL || sibling->parent == subsurface->parent, FALSE);

-  result = GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface,
-                                                          texture,
-                                                          source,
-                                                          dest,
-                                                          transform,
-                                                          background,
-                                                          above,
-                                                          sibling);
-
  remove_subsurface (subsurface);

  if (sibling)
@@ -198,17 +156,9 @@ gdk_subsurface_attach (GdkSubsurface         *subsurface,
        }
    }

-  return result;
+  return GDK_SUBSURFACE_GET_CLASS (subsurface)->attach (subsurface, texture, source, dest, transform, above, sibling);
 }

-/*< private >
- * gdk_subsurface_detach:
- * @subsurface: a `GdkSubsurface`
- *
- * Hides the subsurface.
- *
- * To show it again, you need to call gdk_subsurface_attach().
- */
 void
 gdk_subsurface_detach (GdkSubsurface *subsurface)
 {
@@ -219,14 +169,6 @@ gdk_subsurface_detach (GdkSubsurface *subsurface)
  GDK_SUBSURFACE_GET_CLASS (subsurface)->detach (subsurface);
 }

-/*< private >
- * gdk_subsurface_get_texture:
- * @subsurface: a `GdkSubsurface`
- *
- * Gets the texture that is currently displayed by the subsurface.
- *
- * Returns: (nullable): the texture that is displayed
- */
 GdkTexture *
 gdk_subsurface_get_texture (GdkSubsurface *subsurface)
 {
@@ -235,91 +177,34 @@ gdk_subsurface_get_texture (GdkSubsurface *subsurface)
  return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_texture (subsurface);
 }

-/*< private >
- * gdk_subsurface_get_source_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Returns the source rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- */
 void
-gdk_subsurface_get_source_rect (GdkSubsurface   *subsurface,
-                                graphene_rect_t *rect)
+gdk_subsurface_get_source (GdkSubsurface   *subsurface,
+                           graphene_rect_t *source)
 {
  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (rect != NULL);
+  g_return_if_fail (source != NULL);

-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source_rect (subsurface, rect);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_source (subsurface, source);
 }

-/*< private >
- * gdk_subsurface_get_texture_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Returns the texture rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- */
 void
-gdk_subsurface_get_texture_rect (GdkSubsurface   *subsurface,
-                                 graphene_rect_t *rect)
+gdk_subsurface_get_dest (GdkSubsurface   *subsurface,
+                         graphene_rect_t *dest)
 {
  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (rect != NULL);
+  g_return_if_fail (dest != NULL);

-  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_texture_rect (subsurface, rect);
+  GDK_SUBSURFACE_GET_CLASS (subsurface)->get_dest (subsurface, dest);
 }

-/*< private >
- * gdk_subsurface_is_above_parent:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns whether the subsurface is above the parent surface
- * or below. Note that a subsurface can be above its parent
- * surface, and still be covered by sibling subsurfaces.
- *
- * Returns: `TRUE` if @subsurface is above its parent
- */
 gboolean
 gdk_subsurface_is_above_parent (GdkSubsurface *subsurface)
 {
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
+  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), TRUE);

  return subsurface->above_parent;
 }

-/*< private>
- * gdk_subsurface_get_sibling:
- * @subsurface: the `GdkSubsurface`
- * @above: whether to get the subsurface above
- *
- * Returns the subsurface above (or below) @subsurface in
- * the stacking order.
- *
- * Returns: the sibling, or `NULL` if there is none.
- */
-GdkSubsurface *
-gdk_subsurface_get_sibling (GdkSubsurface *subsurface,
-                            gboolean       above)
-{
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), NULL);
-
-  if (above)
-    return subsurface->sibling_above;
-  else
-    return subsurface->sibling_below;
-}
-
-/*< private >
- * gdk_subsurface_get_transform:
- * @subsurface: a `GdkSubsurface`
- *
- * Returns the transform that was specified in the most recent call to
- * gdk_subsurface_attach() call for @subsurface.
- *
- * Returns: the transform
- */
 GdkTextureTransform
 gdk_subsurface_get_transform (GdkSubsurface *subsurface)
 {
@@ -328,45 +213,3 @@ gdk_subsurface_get_transform (GdkSubsurface *subsurface)
  return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_transform (subsurface);
 }

-/*< private >
- * gdk_subsurface_get_background_rect:
- * @subsurface: a `GdkSubsurface`
- * @rect: (out caller-allocates): return location for the rectangle
- *
- * Obtains the background rect that was specified in the most recent
- * gdk_subsurface_attach() call for @subsurface.
- *
- * Returns: `TRUE` if @subsurface has a background
- */
-gboolean
-gdk_subsurface_get_background_rect (GdkSubsurface   *subsurface,
-                                    graphene_rect_t *rect)
-{
-  g_return_val_if_fail (GDK_IS_SUBSURFACE (subsurface), FALSE);
-  g_return_val_if_fail (rect != NULL, FALSE);
-
-  return GDK_SUBSURFACE_GET_CLASS (subsurface)->get_background_rect (subsurface, rect);
-}
-
-/*< private >
- * gdk_subsurface_get_bounds:
- * @subsurface: a `GdkSubsurface`
- * @bounds: (out caller-allocates): return location for the bounds
- *
- * Returns the bounds of the subsurface.
- *
- * The bounds are the union of the texture and background rects.
- */
-void
-gdk_subsurface_get_bounds (GdkSubsurface   *subsurface,
-                           graphene_rect_t *bounds)
-{
-  graphene_rect_t background;
-
-  g_return_if_fail (GDK_IS_SUBSURFACE (subsurface));
-  g_return_if_fail (bounds != NULL);
-
-  gdk_subsurface_get_texture_rect (subsurface, bounds);
-  if (gdk_subsurface_get_background_rect (subsurface, &background))
-    graphene_rect_union (bounds, &background, bounds);
-}
@@ -62,53 +62,44 @@ struct _GdkSubsurfaceClass
 {
  GObjectClass parent_class;

-  gboolean     (* attach)              (GdkSubsurface         *subsurface,
-                                        GdkTexture            *texture,
-                                        const graphene_rect_t *source,
-                                        const graphene_rect_t *dest,
-                                        GdkTextureTransform    transform,
-                                        const graphene_rect_t *bg,
-                                        gboolean               above,
-                                        GdkSubsurface         *sibling);
-  void         (* detach)              (GdkSubsurface         *subsurface);
-  GdkTexture * (* get_texture)         (GdkSubsurface         *subsurface);
-  void         (* get_source_rect)     (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
-  void         (* get_texture_rect)    (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
+  gboolean     (* attach)          (GdkSubsurface         *subsurface,
+                                    GdkTexture            *texture,
+                                    const graphene_rect_t *source,
+                                    const graphene_rect_t *dest,
+                                    GdkTextureTransform    transform,
+                                    gboolean               above,
+                                    GdkSubsurface         *sibling);
+  void         (* detach)          (GdkSubsurface         *subsurface);
+  GdkTexture * (* get_texture)     (GdkSubsurface         *subsurface);
+  void         (* get_source)      (GdkSubsurface         *subsurface,
+                                    graphene_rect_t       *source);
+  void         (* get_dest)        (GdkSubsurface         *subsurface,
+                                    graphene_rect_t       *dest);
  GdkTextureTransform
-               (* get_transform)       (GdkSubsurface         *subsurface);
-  gboolean     (* get_background_rect) (GdkSubsurface         *subsurface,
-                                        graphene_rect_t       *rect);
+               (* get_transform)   (GdkSubsurface         *subsurface);
 };

-GType           gdk_subsurface_get_type            (void) G_GNUC_CONST;
+GType           gdk_subsurface_get_type        (void) G_GNUC_CONST;

-GdkSurface *    gdk_subsurface_get_parent          (GdkSubsurface         *subsurface);
+GdkSurface *    gdk_subsurface_get_parent      (GdkSubsurface         *subsurface);

-gboolean        gdk_subsurface_attach              (GdkSubsurface         *subsurface,
-                                                    GdkTexture            *texture,
-                                                    const graphene_rect_t *source,
-                                                    const graphene_rect_t *dest,
-                                                    GdkTextureTransform    transform,
-                                                    const graphene_rect_t *background,
-                                                    gboolean               above,
-                                                    GdkSubsurface         *sibling);
-void            gdk_subsurface_detach              (GdkSubsurface         *subsurface);
-GdkTexture *    gdk_subsurface_get_texture         (GdkSubsurface         *subsurface);
-void            gdk_subsurface_get_source_rect     (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-void            gdk_subsurface_get_texture_rect    (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-gboolean        gdk_subsurface_is_above_parent     (GdkSubsurface         *subsurface);
-GdkSubsurface * gdk_subsurface_get_sibling         (GdkSubsurface         *subsurface,
-                                                    gboolean               above);
+gboolean        gdk_subsurface_attach          (GdkSubsurface         *subsurface,
+                                                GdkTexture            *texture,
+                                                const graphene_rect_t *source,
+                                                const graphene_rect_t *dest,
+                                                GdkTextureTransform    transform,
+                                                gboolean               above,
+                                                GdkSubsurface         *sibling);
+void            gdk_subsurface_detach          (GdkSubsurface         *subsurface);
+GdkTexture *    gdk_subsurface_get_texture     (GdkSubsurface         *subsurface);
+void            gdk_subsurface_get_source      (GdkSubsurface         *subsurface,
+                                                graphene_rect_t       *source);
+void            gdk_subsurface_get_dest        (GdkSubsurface         *subsurface,
+                                               graphene_rect_t       *dest);
+gboolean        gdk_subsurface_is_above_parent (GdkSubsurface         *subsurface);
 GdkTextureTransform
-                gdk_subsurface_get_transform       (GdkSubsurface         *subsurface);
-gboolean        gdk_subsurface_get_background_rect (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *rect);
-void            gdk_subsurface_get_bounds          (GdkSubsurface         *subsurface,
-                                                    graphene_rect_t       *bounds);
+                gdk_subsurface_get_transform   (GdkSubsurface         *subsurface);
+

 G_END_DECLS

@@ -563,7 +563,7 @@ gdk_texture_new_from_bytes_internal (GBytes  *bytes,
 {
  if (gdk_is_png (bytes))
    {
-      return gdk_load_png (bytes, NULL, error);
+      return gdk_load_png (bytes, error);
    }
  else if (gdk_is_jpeg (bytes))
    {
@@ -29,7 +29,6 @@
 #include "gdkdmabuffourccprivate.h"
 #include "gdkdmabuftextureprivate.h"
 #include "gdkdisplayprivate.h"
-#include "gdkprofilerprivate.h"
 #include <glib/gi18n-lib.h>
 #include <math.h>

@@ -58,9 +57,6 @@ static const GdkDebugKey gsk_vulkan_feature_keys[] = {
 *
 * Support for `GdkVulkanContext` is platform-specific and context creation
 * can fail, returning %NULL context.
- *
- * Deprecated: 4.14: GTK does not expose any Vulkan internals. This
- *   struct is a leftover that was accidentally exposed.
 */

 typedef struct _GdkVulkanContextPrivate GdkVulkanContextPrivate;
@@ -632,7 +628,6 @@ gdk_vulkan_context_begin_frame (GdkDrawContext *draw_context,
 {
  GdkVulkanContext *context = GDK_VULKAN_CONTEXT (draw_context);
  GdkVulkanContextPrivate *priv = gdk_vulkan_context_get_instance_private (context);
-  VkResult acquire_result;
  guint i;

  if (depth != priv->current_format)
@@ -654,29 +649,12 @@ gdk_vulkan_context_begin_frame (GdkDrawContext *draw_context,
      cairo_region_union (priv->regions[i], region);
    }

-acquire_next_image:
-  acquire_result = GDK_VK_CHECK (vkAcquireNextImageKHR, gdk_vulkan_context_get_device (context),
-                                                        priv->swapchain,
-                                                        UINT64_MAX,
-                                                        priv->draw_semaphore,
-                                                        VK_NULL_HANDLE,
-                                                        &priv->draw_index);
-  if ((acquire_result == VK_ERROR_OUT_OF_DATE_KHR) ||
-      (acquire_result == VK_SUBOPTIMAL_KHR))
-    {
-      GError *error = NULL;
-
-      GDK_DEBUG (VULKAN, "Recreating the swapchain");
-
-      if (!gdk_vulkan_context_check_swapchain (context, &error))
-        {
-          g_warning ("%s", error->message);
-          g_error_free (error);
-          return;
-        }
-
-       goto acquire_next_image;
-     }
+  GDK_VK_CHECK (vkAcquireNextImageKHR, gdk_vulkan_context_get_device (context),
+                                       priv->swapchain,
+                                       UINT64_MAX,
+                                       priv->draw_semaphore,
+                                       VK_NULL_HANDLE,
+                                       &priv->draw_index);

  cairo_region_union (region, priv->regions[priv->draw_index]);
 }
@@ -1129,7 +1107,6 @@ gdk_display_load_pipeline_cache (GdkDisplay *display)
 static gboolean
 gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
 {
-  G_GNUC_UNUSED gint64 begin_time = GDK_PROFILER_CURRENT_TIME;
  GError *error = NULL;
  VkDevice device;
  VkPipelineCache cache;
@@ -1144,13 +1121,14 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
  GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, NULL);
  if (size == 0)
    return TRUE;
-
+  
  if (size == display->vk_pipeline_cache_size)
    {
      GDK_DEBUG (VULKAN, "pipeline cache size (%zu bytes) unchanged, skipping save", size);
      return TRUE;
    }

+
  data = g_malloc (size);
  if (GDK_VK_CHECK (vkGetPipelineCacheData, device, cache, &size, data) != VK_SUCCESS)
    {
@@ -1170,7 +1148,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)

  file = gdk_vulkan_get_pipeline_cache_file (display);

-  GDK_DEBUG (VULKAN, "Saving pipeline cache of size %lu to %s", size, g_file_peek_path (file));
+  GDK_DEBUG (VULKAN, "Saving pipeline cache to %s", g_file_peek_path (file));

  if (!g_file_replace_contents (file,
                                data,
@@ -1185,7 +1163,7 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
      if (g_error_matches (error, G_IO_ERROR, G_IO_ERROR_WRONG_ETAG))
        {
          VkPipelineCache new_cache;
-
+          
          GDK_DEBUG (VULKAN, "Pipeline cache file modified, merging into current");
          new_cache = gdk_display_load_pipeline_cache (display);
          if (new_cache)
@@ -1212,15 +1190,10 @@ gdk_vulkan_save_pipeline_cache (GdkDisplay *display)
      return FALSE;
    }

-  gdk_profiler_end_markf (begin_time,
-                          "Save Vulkan pipeline cache", "%s size %lu",
-                          g_file_peek_path (file), size);
-
  g_object_unref (file);
  g_free (data);
  g_free (display->vk_pipeline_cache_etag);
  display->vk_pipeline_cache_etag = etag;
-  display->vk_pipeline_cache_size = size;

  return TRUE;
 }
@@ -1260,11 +1233,6 @@ gdk_display_create_pipeline_cache (GdkDisplay *display)
                                           },
                                           NULL,
                                           &display->vk_pipeline_cache);
-      GDK_DEBUG (VULKAN, "Creating empty pipeline cache");
-    }
-  else
-    {
-      GDK_DEBUG (VULKAN, "Loading pipeline cache (%lu bytes)", display->vk_pipeline_cache_size);
    }
 }

@@ -1374,7 +1342,6 @@ static gboolean
 gdk_display_create_vulkan_device (GdkDisplay  *display,
                                  GError     **error)
 {
-  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
  uint32_t i, j, k;
  const char *override;
  gboolean list_devices;
@@ -1583,8 +1550,6 @@ gdk_display_create_vulkan_device (GdkDisplay  *display,
                                       "Hum, what? This should not happen.")));
                }

-              gdk_profiler_end_mark (start_time, "Create Vulkan device", NULL);
-
              return TRUE;
            }
        }
@@ -1623,7 +1588,6 @@ static gboolean
 gdk_display_create_vulkan_instance (GdkDisplay  *display,
                                    GError     **error)
 {
-  G_GNUC_UNUSED gint64 start_time = GDK_PROFILER_CURRENT_TIME;
  uint32_t i;
  GPtrArray *used_extensions;
  GPtrArray *used_layers;
@@ -1785,8 +1749,6 @@ gdk_display_create_vulkan_instance (GdkDisplay  *display,

  display->vk_shader_modules = g_hash_table_new (g_str_hash, g_str_equal);

-  gdk_profiler_end_mark (start_time, "Create Vulkan instance", NULL);
-
  return TRUE;
 }

@@ -127,18 +127,15 @@ png_simple_warning_callback (png_structp     png,
 }

 /* }}} */
-/* {{{ Public API */
+/* {{{ Public API */ 

 GdkTexture *
-gdk_load_png (GBytes      *bytes,
-              GHashTable  *options,
-              GError     **error)
+gdk_load_png (GBytes  *bytes,
+              GError **error)
 {
  png_io io;
  png_struct *png = NULL;
  png_info *info;
-  png_textp text;
-  int num_texts;
  guint width, height;
  gsize i, stride;
  int depth, color_type;
@@ -300,17 +297,6 @@ gdk_load_png (GBytes      *bytes,
  texture = gdk_memory_texture_new (width, height, format, out_bytes, stride);
  g_bytes_unref (out_bytes);

-  if (options && png_get_text (png, info, &text, &num_texts))
-    {
-      for (i = 0; i < num_texts; i++)
-        {
-          if (text->compression != -1)
-            continue;
-
-          g_hash_table_insert (options, g_strdup (text->key), g_strdup (text->text));
-        }
-    }
-
  g_free (row_pointers);
  png_destroy_read_struct (&png, &info, NULL);

@@ -23,7 +23,6 @@
 #define PNG_SIGNATURE "\x89PNG"

 GdkTexture *gdk_load_png        (GBytes         *bytes,
-                                 GHashTable     *options,
                                 GError        **error);

 GBytes     *gdk_save_png        (GdkTexture     *texture);
@@ -161,8 +161,7 @@ void             _gdk_macos_display_send_event                     (GdkMacosDisp
 void             _gdk_macos_display_warp_pointer                   (GdkMacosDisplay *self,
                                                                    int              x,
                                                                    int              y);
-NSEvent         *_gdk_macos_display_get_matching_nsevent           (GdkEvent        *event);
-NSEvent         *_gdk_macos_display_get_exact_nsevent              (GdkEvent        *event);
+NSEvent         *_gdk_macos_display_get_nsevent                    (GdkEvent        *event);
 NSEvent         *_gdk_macos_display_get_last_nsevent               (void);
 GdkDrag         *_gdk_macos_display_find_drag                      (GdkMacosDisplay *self,
                                                                    NSInteger        sequence_number);
@@ -77,9 +77,6 @@ gdk_macos_display_get_setting (GdkDisplay  *display,
                               const char *setting,
                               GValue      *value)
 {
-  if (gdk_display_get_debug_flags (display) & GDK_DEBUG_DEFAULT_SETTINGS)
-    return FALSE;
-
  return _gdk_macos_display_get_setting (GDK_MACOS_DISPLAY (display), setting, value);
 }

@@ -994,41 +991,17 @@ _gdk_macos_display_warp_pointer (GdkMacosDisplay *self,
  CGWarpMouseCursorPosition ((CGPoint) { x, y });
 }

-/* Find the matching `NSEvent` for an `GdkEvent`. This function
- * return the `NSEvent`, also for rewritten `GdkEvent`'s.
- */
 NSEvent *
-_gdk_macos_display_get_matching_nsevent (GdkEvent *event)
+_gdk_macos_display_get_nsevent (GdkEvent *event)
 {
-  for (GList *iter = event_map.head; iter; iter = iter->next)
+  for (const GList *iter = event_map.head; iter; iter = iter->next)
    {
-      GdkToNSEventMap *map = iter->data;
+      const GdkToNSEventMap *map = iter->data;

      if (map->gdk_event->event_type == event->event_type &&
          map->gdk_event->device == event->device &&
          map->gdk_event->time == event->time)
-        {
-          return map->nsevent;
-        }
-    }
-
-  return NULL;
-}
-
-/* Find the matching `NSEvent` for the original `GdkEvent`.
- * If an event was rewritten, it returns `NULL`.
- */
-NSEvent *
-_gdk_macos_display_get_exact_nsevent (GdkEvent *event)
-{
-  for (GList *iter = event_map.head; iter; iter = iter->next)
-    {
-      GdkToNSEventMap *map = iter->data;
-
-      if (map->gdk_event == event)
-        {
-          return map->nsevent;
-        }
+        return map->nsevent;
    }

  return NULL;
@@ -738,7 +738,7 @@ gdk_macos_event_source_dispatch (GSource     *source,

      if (!handled)
        {
-          NSEvent *nsevent = _gdk_macos_display_get_exact_nsevent (event);
+          NSEvent *nsevent = _gdk_macos_display_get_nsevent (event);
          if (nsevent != NULL)
            [NSApp sendEvent: nsevent];
        }
@@ -105,9 +105,6 @@
 #endif

 static void _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland);
-static void _gdk_wayland_display_set_cursor_theme  (GdkDisplay        *display,
-                                                    const char        *name,
-                                                    int                size);

 G_DEFINE_TYPE (GdkWaylandDisplay, gdk_wayland_display, GDK_TYPE_DISPLAY)

@@ -287,6 +284,93 @@ static const struct wl_shm_listener wl_shm_listener = {
  wl_shm_format
 };

+static void
+linux_dmabuf_done (void *data,
+                   struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1)
+{
+  GDK_DEBUG (MISC, "dmabuf feedback done");
+}
+
+static void
+linux_dmabuf_format_table (void *data,
+                           struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                           int32_t fd,
+                           uint32_t size)
+{
+  GdkWaylandDisplay *display_wayland = data;
+
+  display_wayland->linux_dmabuf_n_formats = size / 16;
+  display_wayland->linux_dmabuf_formats = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
+
+  GDK_DEBUG (MISC, "got dmabuf format table (%lu entries)", display_wayland->linux_dmabuf_n_formats);
+}
+
+static void
+linux_dmabuf_main_device (void *data,
+                          struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                          struct wl_array *device)
+{
+  dev_t dev G_GNUC_UNUSED = *(dev_t *)device->data;
+
+  GDK_DEBUG (MISC, "got dmabuf main device: %u %u", major (dev), minor (dev));
+}
+
+static void
+linux_dmabuf_tranche_done (void *data,
+                           struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1)
+{
+  GDK_DEBUG (MISC, "dmabuf feedback tranche done");
+}
+
+static void
+linux_dmabuf_tranche_target_device (void *data,
+                                    struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                                    struct wl_array *device)
+{
+  dev_t dev G_GNUC_UNUSED = *(dev_t *)device->data;
+
+  GDK_DEBUG (MISC, "got dmabuf tranche target device: %u %u", major (dev), minor (dev));
+}
+
+static void
+linux_dmabuf_tranche_formats (void *data,
+                              struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                              struct wl_array *indices)
+{
+  GdkWaylandDisplay *display_wayland = data;
+
+  GDK_DEBUG (MISC, "got dmabuf tranche formats (%lu entries):", indices->size / sizeof (guint16));
+  guint16 *pos;
+
+  wl_array_for_each (pos, indices)
+    {
+      LinuxDmabufFormat *fmt G_GNUC_UNUSED = &display_wayland->linux_dmabuf_formats[*pos];
+      uint32_t f G_GNUC_UNUSED = fmt->fourcc;
+      uint64_t m G_GNUC_UNUSED = fmt->modifier;
+      GDK_DEBUG (MISC, "  %.4s:%#" G_GINT64_MODIFIER "x", (char *) &f, m);
+    }
+}
+
+static void
+linux_dmabuf_tranche_flags (void *data,
+                            struct zwp_linux_dmabuf_feedback_v1 *zwp_linux_dmabuf_feedback_v1,
+                            uint32_t flags)
+{
+  GDK_DEBUG (MISC,
+             "got dmabuf tranche flags: %s",
+             flags & ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT ? "scanout" : "");
+}
+
+static const struct zwp_linux_dmabuf_feedback_v1_listener linux_dmabuf_feedback_listener = {
+  linux_dmabuf_done,
+  linux_dmabuf_format_table,
+  linux_dmabuf_main_device,
+  linux_dmabuf_tranche_done,
+  linux_dmabuf_tranche_target_device,
+  linux_dmabuf_tranche_formats,
+  linux_dmabuf_tranche_flags,
+};
+
 static void
 server_decoration_manager_default_mode (void                                          *data,
                                        struct org_kde_kwin_server_decoration_manager *manager,
@@ -353,7 +437,7 @@ gdk_registry_handle_global (void               *data,
    {
      display_wayland->compositor =
        wl_registry_bind (display_wayland->wl_registry, id,
-                          &wl_compositor_interface, MIN (version, 6));
+                          &wl_compositor_interface, MIN (version, 5));
    }
  else if (strcmp (interface, "wl_shm") == 0)
    {
@@ -363,14 +447,12 @@ gdk_registry_handle_global (void               *data,
    }
  else if (strcmp (interface, "zwp_linux_dmabuf_v1") == 0 && version >= 4)
    {
-      struct zwp_linux_dmabuf_feedback_v1 *feedback;
-
      display_wayland->linux_dmabuf =
        wl_registry_bind (display_wayland->wl_registry, id, &zwp_linux_dmabuf_v1_interface, version);
-      feedback = zwp_linux_dmabuf_v1_get_default_feedback (display_wayland->linux_dmabuf);
-      display_wayland->dmabuf_formats_info = dmabuf_formats_info_new (GDK_DISPLAY (display_wayland),
-                                                                      "default",
-                                                                      feedback);
+      display_wayland->linux_dmabuf_feedback =
+        zwp_linux_dmabuf_v1_get_default_feedback (display_wayland->linux_dmabuf);
+     zwp_linux_dmabuf_feedback_v1_add_listener (display_wayland->linux_dmabuf_feedback,
+                                                &linux_dmabuf_feedback_listener, display_wayland);
      _gdk_wayland_display_async_roundtrip (display_wayland);
    }
  else if (strcmp (interface, "xdg_wm_base") == 0)
@@ -524,13 +606,7 @@ gdk_registry_handle_global (void               *data,
                          &wp_presentation_interface,
                          MIN (version, 1));
    }
-  else if (strcmp (interface, wp_single_pixel_buffer_manager_v1_interface.name) == 0)
-    {
-      display_wayland->single_pixel_buffer =
-        wl_registry_bind (display_wayland->wl_registry, id,
-                          &wp_single_pixel_buffer_manager_v1_interface,
-                          MIN (version, 1));
-    }
+

  g_hash_table_insert (display_wayland->known_globals,
                       GUINT_TO_POINTER (id), g_strdup (interface));
@@ -741,9 +817,10 @@ gdk_wayland_display_dispose (GObject *object)
  g_clear_pointer (&display_wayland->fractional_scale, wp_fractional_scale_manager_v1_destroy);
  g_clear_pointer (&display_wayland->viewporter, wp_viewporter_destroy);
  g_clear_pointer (&display_wayland->presentation, wp_presentation_destroy);
-  g_clear_pointer (&display_wayland->single_pixel_buffer, wp_single_pixel_buffer_manager_v1_destroy);
  g_clear_pointer (&display_wayland->linux_dmabuf, zwp_linux_dmabuf_v1_destroy);
-  g_clear_pointer (&display_wayland->dmabuf_formats_info, dmabuf_formats_info_free);
+  g_clear_pointer (&display_wayland->linux_dmabuf_feedback, zwp_linux_dmabuf_feedback_v1_destroy);
+  if (display_wayland->linux_dmabuf_formats)
+    munmap (display_wayland->linux_dmabuf_formats, display_wayland->linux_dmabuf_n_formats * 16);

  g_clear_pointer (&display_wayland->shm, wl_shm_destroy);
  g_clear_pointer (&display_wayland->wl_registry, wl_registry_destroy);
@@ -1045,7 +1122,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
  display_class->get_monitors = gdk_wayland_display_get_monitors;
  display_class->get_monitor_at_surface = gdk_wayland_display_get_monitor_at_surface;
  display_class->get_setting = gdk_wayland_display_get_setting;
-  display_class->set_cursor_theme = _gdk_wayland_display_set_cursor_theme;
+  display_class->set_cursor_theme = gdk_wayland_display_set_cursor_theme;
 }

 static void
@@ -1118,22 +1195,11 @@ get_cursor_theme (GdkWaylandDisplay *display_wayland,
 * @size: the size to use for cursors
 *
 * Sets the cursor theme for the given @display.
- *
- * Deprecated: 4.16: Use the cursor-related properties of
- *   [GtkSettings](../gtk4/class.Settings.html) to set the cursor theme
 */
 void
 gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
                                      const char *name,
                                      int         size)
-{
-  _gdk_wayland_display_set_cursor_theme (display, name, size);
-}
-
-static void
-_gdk_wayland_display_set_cursor_theme (GdkDisplay *display,
-                                       const char *name,
-                                       int         size)
 {
  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY(display);
  struct wl_cursor_theme *theme;
@@ -1202,7 +1268,7 @@ _gdk_wayland_display_load_cursor_theme (GdkWaylandDisplay *display_wayland)
  else
    name = "default";

-  _gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
+  gdk_wayland_display_set_cursor_theme (GDK_DISPLAY (display_wayland), name, size);
  g_value_unset (&v);

  gdk_profiler_end_mark (before, "Wayland cursor theme load", NULL);
@@ -1738,7 +1804,6 @@ static TranslationEntry translations[] = {
  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
  { FALSE, "org.gnome.desktop.interface", "font-hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
  { FALSE, "org.gnome.desktop.interface", "font-rgba-order", "gtk-xft-rgba", G_TYPE_NONE, { .i = 0 } },
-  { FALSE, "org.gnome.desktop.interface", "font-rendering", "gtk-font-rendering", G_TYPE_ENUM, { .i = 0 } },
  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "antialiasing", "gtk-xft-antialias", G_TYPE_NONE, { .i = 1 } },
  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hinting", G_TYPE_NONE, { .i = 1 } },
  { FALSE, "org.gnome.settings-daemon.plugins.xsettings", "hinting", "gtk-xft-hintstyle", G_TYPE_NONE, { .i = 1 } },
@@ -1830,7 +1895,6 @@ apply_portal_setting (TranslationEntry *entry,
      entry->fallback.s = g_intern_string (g_variant_get_string (value, NULL));
      break;
    case G_TYPE_INT:
-    case G_TYPE_ENUM:
      entry->fallback.i = g_variant_get_int32 (value);
      break;
    case G_TYPE_BOOLEAN:
@@ -2080,9 +2144,6 @@ set_value_from_entry (GdkDisplay       *display,
        case G_TYPE_BOOLEAN:
          g_value_set_boolean (value, entry->fallback.b);
          break;
-        case G_TYPE_ENUM:
-          g_value_set_enum (value, entry->fallback.i);
-          break;
        case G_TYPE_NONE:
          if (g_str_equal (entry->setting, "gtk-fontconfig-timestamp"))
            g_value_set_uint (value, (guint)entry->fallback.i);
@@ -2133,11 +2194,6 @@ set_value_from_entry (GdkDisplay       *display,
                                  ? g_settings_get_boolean (settings, entry->key)
                                  : entry->fallback.b);
      break;
-    case G_TYPE_ENUM:
-      g_value_set_enum (value, settings && entry->valid
-                               ? g_settings_get_enum (settings, entry->key)
-                               : entry->fallback.i);
-      break;
    case G_TYPE_NONE:
      if (g_str_equal (entry->setting, "gtk-fontconfig-timestamp"))
        g_value_set_uint (value, (guint)entry->fallback.i);
@@ -40,7 +40,6 @@
 #include <gdk/wayland/fractional-scale-v1-client-protocol.h>
 #include <gdk/wayland/viewporter-client-protocol.h>
 #include <gdk/wayland/presentation-time-client-protocol.h>
-#include <gdk/wayland/single-pixel-buffer-v1-client-protocol.h>

 #include <glib.h>
 #include <gdk/gdkkeys.h>
@@ -49,7 +48,6 @@

 #include "gdkdisplayprivate.h"
 #include "gdkwaylanddevice.h"
-#include "gdkdmabuf-wayland-private.h"
 #include "cursor/wayland-cursor.h"

 #include <epoxy/egl.h>
@@ -74,6 +72,13 @@ typedef enum _GdkWaylandShellVariant
  GDK_WAYLAND_SHELL_VARIANT_ZXDG_SHELL_V6
 } GdkWaylandShellVariant;

+typedef struct
+{
+  uint32_t fourcc;
+  uint32_t padding;
+  uint64_t modifier;
+} LinuxDmabufFormat;
+
 struct _GdkWaylandDisplay
 {
  GdkDisplay parent_instance;
@@ -99,7 +104,9 @@ struct _GdkWaylandDisplay
  struct wl_compositor *compositor;
  struct wl_shm *shm;
  struct zwp_linux_dmabuf_v1 *linux_dmabuf;
-  DmabufFormatsInfo *dmabuf_formats_info;
+  struct zwp_linux_dmabuf_feedback_v1 *linux_dmabuf_feedback;
+  gsize linux_dmabuf_n_formats;
+  LinuxDmabufFormat *linux_dmabuf_formats;
  struct xdg_wm_base *xdg_wm_base;
  struct zxdg_shell_v6 *zxdg_shell_v6;
  struct gtk_shell1 *gtk_shell;
@@ -120,7 +127,6 @@ struct _GdkWaylandDisplay
  struct wp_fractional_scale_manager_v1 *fractional_scale;
  struct wp_viewporter *viewporter;
  struct wp_presentation *presentation;
-  struct wp_single_pixel_buffer_manager_v1 *single_pixel_buffer;

  GList *async_roundtrips;

@@ -1,77 +0,0 @@
-/*
- * gdkdmabuf-wayland.h
- *
- * Copyright 2023 Red Hat, Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Library General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Library General Public License for more details.
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "config.h"
-
-#include <stdint.h>
-#include <wayland-client.h>
-#include <wayland-egl.h>
-
-#include <glib.h>
-#include <gdk/gdkkeys.h>
-#include <gdk/gdksurface.h>
-
-G_BEGIN_DECLS
-
-typedef struct
-{
-  uint32_t fourcc;
-  uint32_t padding;
-  uint64_t modifier;
-} DmabufFormat;
-
-typedef struct
-{
-  dev_t target_device;
-  guint32 flags;
-  gsize n_formats;
-  DmabufFormat *formats;
-} DmabufTranche;
-
-typedef struct
-{
-  dev_t main_device;
-  GPtrArray *tranches;
-} DmabufFormats;
-
-typedef struct DmabufFormatsInfo DmabufFormatsInfo;
-
-struct DmabufFormatsInfo
-{
-  GdkDisplay *display;
-  char *name;
-  struct zwp_linux_dmabuf_feedback_v1 *feedback;
-
-  gsize n_dmabuf_formats;
-  DmabufFormat *dmabuf_format_table;
-
-  DmabufFormats *dmabuf_formats;
-  DmabufFormats *pending_dmabuf_formats;
-  DmabufTranche *pending_tranche;
-};
-
-DmabufFormatsInfo * dmabuf_formats_info_new  (GdkDisplay                          *display,
-                                              const char                          *name,
-                                              struct zwp_linux_dmabuf_feedback_v1 *feedback);
-
-void                dmabuf_formats_info_free (DmabufFormatsInfo                   *info);
-
-G_END_DECLS
@@ -1,241 +0,0 @@
-#include "config.h"
-
-#include "gdkdmabuf-wayland-private.h"
-
-#include "gdkdebugprivate.h"
-#include "gdkdmabufformatsprivate.h"
-#include "gdkdmabufformatsbuilderprivate.h"
-#include "gdkdmabufformatsprivate.h"
-
-#include <fcntl.h>
-#include <sys/mman.h>
-#include <sys/sysmacros.h>
-
-#include "linux-dmabuf-unstable-v1-client-protocol.h"
-
-
-static DmabufTranche *
-dmabuf_tranche_new (void)
-{
-  return g_new0 (DmabufTranche, 1);
-}
-
-static void
-dmabuf_tranche_free (DmabufTranche *tranche)
-{
-  g_free (tranche->formats);
-  g_free (tranche);
-}
-
-static DmabufFormats *
-dmabuf_formats_new (void)
-{
-  DmabufFormats *formats;
-
-  formats = g_new0 (DmabufFormats, 1);
-  formats->tranches = g_ptr_array_new_with_free_func ((GDestroyNotify) dmabuf_tranche_free);
-
-  return formats;
-}
-
-static void
-dmabuf_formats_free (DmabufFormats *formats)
-{
-  g_ptr_array_unref (formats->tranches);
-  g_free (formats);
-}
-
-static void
-update_dmabuf_formats (DmabufFormatsInfo *info)
-{
-  DmabufFormats *formats = info->dmabuf_formats;
-
-  GDK_DISPLAY_DEBUG (info->display, MISC,
-                     "dmabuf format table (%lu entries)", info->n_dmabuf_formats);
-  GDK_DISPLAY_DEBUG (info->display, MISC,
-                     "dmabuf main device: %u %u",
-                     major (formats->main_device),
-                     minor (formats->main_device));
-
-  for (gsize i = 0; i < formats->tranches->len; i++)
-    {
-      DmabufTranche *tranche = g_ptr_array_index (formats->tranches, i);
-
-      GDK_DISPLAY_DEBUG (info->display, MISC,
-                         "dmabuf tranche target device: %u %u",
-                         major (tranche->target_device),
-                         minor (tranche->target_device));
-
-      GDK_DISPLAY_DEBUG (info->display, MISC,
-                         "dmabuf%s tranche (%lu entries):",
-                         tranche->flags & ZWP_LINUX_DMABUF_FEEDBACK_V1_TRANCHE_FLAGS_SCANOUT ? " scanout" : "",
-                         tranche->n_formats);
-
-      for (gsize j = 0; j < tranche->n_formats; j++)
-        {
-          GDK_DISPLAY_DEBUG (info->display, MISC,
-                             "  %.4s:%#" G_GINT64_MODIFIER "x",
-                             (char *) &(tranche->formats[j].fourcc),
-                             tranche->formats[j].modifier);
-        }
-    }
-}
-
-static void
-linux_dmabuf_done (void *data,
-                   struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info = data;
-
-  g_clear_pointer (&info->dmabuf_formats, dmabuf_formats_free);
-
-  info->dmabuf_formats = info->pending_dmabuf_formats;
-  info->pending_dmabuf_formats = NULL;
-
-  update_dmabuf_formats (info);
-}
-
-static void
-linux_dmabuf_format_table (void *data,
-                           struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                           int32_t fd,
-                           uint32_t size)
-{
-  DmabufFormatsInfo *info = data;
-
-  if (info->dmabuf_formats)
-    munmap (info->dmabuf_formats, sizeof (DmabufFormat) * info->n_dmabuf_formats);
-
-  info->n_dmabuf_formats = size / 16;
-  info->dmabuf_format_table = mmap (NULL, size, PROT_READ, MAP_PRIVATE, fd, 0);
-}
-
-static void
-linux_dmabuf_main_device (void *data,
-                          struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                          struct wl_array *device)
-{
-  DmabufFormatsInfo *info = data;
-  dev_t dev;
-
-  memcpy (&dev, device->data, sizeof (dev_t));
-
-  g_assert (info->pending_dmabuf_formats == NULL);
-
-  info->pending_dmabuf_formats = dmabuf_formats_new ();
-  info->pending_dmabuf_formats->main_device = dev;
-}
-
-static void
-linux_dmabuf_tranche_done (void *data,
-                           struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info = data;
-
-  g_ptr_array_add (info->pending_dmabuf_formats->tranches,
-                   info->pending_tranche);
-
-  info->pending_tranche = NULL;
-}
-
-static void
-linux_dmabuf_tranche_target_device (void *data,
-                                    struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                                    struct wl_array *device)
-{
-  DmabufFormatsInfo *info = data;
-  dev_t dev;
-  DmabufTranche *tranche;
-
-  memcpy (&dev, device->data, sizeof (dev_t));
-
-  g_assert (info->pending_tranche == NULL);
-
-  tranche = dmabuf_tranche_new ();
-  tranche->target_device = dev;
-
-  info->pending_tranche = tranche;
-}
-
-static void
-linux_dmabuf_tranche_formats (void *data,
-                              struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                              struct wl_array *indices)
-{
-  DmabufFormatsInfo *info = data;
-  DmabufTranche *tranche;
-  int i;
-  guint16 *pos;
-
-  g_assert (info->pending_tranche != NULL);
-  tranche = info->pending_tranche;
-
-  tranche->n_formats = indices->size / sizeof (guint16);
-  tranche->formats = g_new (DmabufFormat, tranche->n_formats);
-
-  i = 0;
-  wl_array_for_each (pos, indices)
-    {
-      tranche->formats[i++] = info->dmabuf_format_table[*pos];
-    }
-}
-
-static void
-linux_dmabuf_tranche_flags (void *data,
-                            struct zwp_linux_dmabuf_feedback_v1 *feedback,
-                            uint32_t flags)
-{
-  DmabufFormatsInfo *info = data;
-  DmabufTranche *tranche;
-
-  g_assert (info->pending_tranche != NULL);
-  tranche = info->pending_tranche;
-  tranche->flags = flags;
-}
-
-static const struct zwp_linux_dmabuf_feedback_v1_listener feedback_listener = {
-  linux_dmabuf_done,
-  linux_dmabuf_format_table,
-  linux_dmabuf_main_device,
-  linux_dmabuf_tranche_done,
-  linux_dmabuf_tranche_target_device,
-  linux_dmabuf_tranche_formats,
-  linux_dmabuf_tranche_flags,
-};
-
-DmabufFormatsInfo *
-dmabuf_formats_info_new (GdkDisplay                          *display,
-                         const char                          *name,
-                         struct zwp_linux_dmabuf_feedback_v1 *feedback)
-{
-  DmabufFormatsInfo *info;
-
-  info = g_new0 (DmabufFormatsInfo, 1);
-
-  info->display = display;
-  info->name = g_strdup (name);
-  info->feedback = feedback;
-
-  if (info->feedback)
-    zwp_linux_dmabuf_feedback_v1_add_listener (info->feedback,
-                                               &feedback_listener, info);
-
-  return info;
-}
-
-void
-dmabuf_formats_info_free (DmabufFormatsInfo *info)
-{
-  g_free (info->name);
-  g_clear_pointer (&info->feedback, zwp_linux_dmabuf_feedback_v1_destroy);
-  if (info->dmabuf_format_table)
-    {
-      munmap (info->dmabuf_format_table, info->n_dmabuf_formats * 16);
-      info->dmabuf_format_table = NULL;
-    }
-  g_clear_pointer (&info->dmabuf_formats, dmabuf_formats_free);
-  g_clear_pointer (&info->pending_dmabuf_formats, dmabuf_formats_free);
-  g_clear_pointer (&info->pending_tranche, dmabuf_tranche_free);
-
-  g_free (info);
-}
@@ -781,8 +781,8 @@ pointer_handle_motion (void              *data,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      gdk_debug_message ("motion %f %f, seat %p state %d",
-                         x, y, seat, gdk_event_get_modifier_state (event));
+      g_message ("motion %f %f, seat %p state %d",
+                 x, y, seat, gdk_event_get_modifier_state (event));
    }

  if (wl_seat_get_version (seat->wl_seat) < WL_POINTER_HAS_FRAME)
@@ -1664,7 +1664,7 @@ touch_handle_down (void              *data,
    {
      double xx, yy;
      gdk_event_get_position (event, &xx, &yy);
-      gdk_debug_message ("touch begin %f %f", xx, yy);
+      g_message ("touch begin %f %f", xx, yy);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1699,7 +1699,7 @@ touch_handle_up (void            *data,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      gdk_debug_message ("touch end %f %f", x, y);
+      g_message ("touch end %f %f", x, y);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1747,7 +1747,7 @@ touch_handle_motion (void            *data,
    {
      double xx, yy;
      gdk_event_get_position (event, &xx, &yy);
-      gdk_debug_message ("touch update %f %f", xx, yy);
+      g_message ("touch update %f %f", xx, yy);
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1841,9 +1841,9 @@ emit_gesture_swipe_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      gdk_debug_message ("swipe event %d, coords: %f %f, seat %p state %d",
-                         gdk_event_get_event_type (event), x, y, seat,
-                         gdk_event_get_modifier_state (event));
+      g_message ("swipe event %d, coords: %f %f, seat %p state %d",
+                 gdk_event_get_event_type (event), x, y, seat,
+                 gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -1936,10 +1936,10 @@ emit_gesture_pinch_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      gdk_debug_message ("pinch event %d, coords: %f %f, seat %p state %d",
-                         gdk_event_get_event_type (event),
-                         x, y, seat,
-                         gdk_event_get_modifier_state (event));
+      g_message ("pinch event %d, coords: %f %f, seat %p state %d",
+                       gdk_event_get_event_type (event),
+                       x, y, seat,
+                       gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -2030,10 +2030,10 @@ emit_gesture_hold_event (GdkWaylandSeat          *seat,
    {
      double x, y;
      gdk_event_get_position (event, &x, &y);
-      gdk_debug_message ("hold event %d, coords: %f %f, seat %p state %d",
-                         gdk_event_get_event_type (event),
-                         x, y, seat,
-                         gdk_event_get_modifier_state (event));
+      g_message ("hold event %d, coords: %f %f, seat %p state %d",
+                 gdk_event_get_event_type (event),
+                 x, y, seat,
+                 gdk_event_get_modifier_state (event));
    }

  _gdk_wayland_display_deliver_event (seat->display, event);
@@ -29,12 +29,6 @@ struct _GdkWaylandSubsurface
  struct wl_region *opaque_region;

  struct wl_callback *frame_callback;
-
-  struct wl_surface *bg_surface;
-  struct wl_subsurface *bg_subsurface;
-  struct wp_viewport *bg_viewport;
-  cairo_rectangle_int_t bg_rect;
-  gboolean bg_attached;
 };

 struct _GdkWaylandSubsurfaceClass
@@ -25,8 +25,6 @@
 #include "gdkdmabuftextureprivate.h"
 #include "gdksurface-wayland-private.h"
 #include "gdksubsurfaceprivate.h"
-#include "gdkdebugprivate.h"
-#include "gsk/gskrectprivate.h"

 #include "linux-dmabuf-unstable-v1-client-protocol.h"

@@ -48,55 +46,11 @@ gdk_wayland_subsurface_finalize (GObject *object)
  g_clear_pointer (&self->viewport, wp_viewport_destroy);
  g_clear_pointer (&self->subsurface, wl_subsurface_destroy);
  g_clear_pointer (&self->surface, wl_surface_destroy);
-  g_clear_pointer (&self->bg_viewport, wp_viewport_destroy);
-  g_clear_pointer (&self->bg_subsurface, wl_subsurface_destroy);
-  g_clear_pointer (&self->bg_surface, wl_surface_destroy);
+  g_clear_pointer (&self->subsurface, wl_subsurface_destroy);

  G_OBJECT_CLASS (gdk_wayland_subsurface_parent_class)->finalize (object);
 }

-static void
-shm_buffer_release (void             *data,
-                    struct wl_buffer *buffer)
-{
-  cairo_surface_t *surface = data;
-
-  /* Note: the wl_buffer is destroyed as cairo user data */
-  cairo_surface_destroy (surface);
-}
-
-static const struct wl_buffer_listener shm_buffer_listener = {
-  shm_buffer_release,
-};
-
-static struct wl_buffer *
-get_shm_wl_buffer (GdkWaylandSubsurface *self,
-                   GdkTexture           *texture)
-{
-  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
-  int width, height;
-  cairo_surface_t *surface;
-  GdkTextureDownloader *downloader;
-  struct wl_buffer *buffer;
-
-  width = gdk_texture_get_width (texture);
-  height = gdk_texture_get_height (texture);
-  surface = gdk_wayland_display_create_shm_surface (display, width, height, &GDK_FRACTIONAL_SCALE_INIT_INT (1));
-
-  downloader = gdk_texture_downloader_new (texture);
-
-  gdk_texture_downloader_download_into (downloader,
-                                        cairo_image_surface_get_data (surface),
-                                        cairo_image_surface_get_stride (surface));
-
-  gdk_texture_downloader_free (downloader);
-
-  buffer = _gdk_wayland_shm_surface_get_wl_buffer (surface);
-  wl_buffer_add_listener (buffer, &shm_buffer_listener, surface);
-
-  return buffer;
-}
-
 static void
 dmabuf_buffer_release (void             *data,
                       struct wl_buffer *buffer)
@@ -143,8 +97,8 @@ static const struct zwp_linux_buffer_params_v1_listener params_listener = {
 };

 static struct wl_buffer *
-get_dmabuf_wl_buffer (GdkWaylandSubsurface *self,
-                      GdkTexture           *texture)
+get_wl_buffer (GdkWaylandSubsurface *self,
+               GdkTexture           *texture)
 {
  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
  const GdkDmabuf *dmabuf;
@@ -195,52 +149,6 @@ get_dmabuf_wl_buffer (GdkWaylandSubsurface *self,
  return buffer;
 }

-static struct wl_buffer *
-get_wl_buffer (GdkWaylandSubsurface *self,
-               GdkTexture           *texture)
-{
-  GdkDisplay *display = gdk_surface_get_display (GDK_SUBSURFACE (self)->parent);
-  struct wl_buffer *buffer = NULL;
-
-  if (GDK_IS_DMABUF_TEXTURE (texture))
-    buffer = get_dmabuf_wl_buffer (self, texture);
-
-  if (GDK_DISPLAY_DEBUG_CHECK (display, FORCE_OFFLOAD))
-    {
-      if (!buffer)
-         buffer = get_shm_wl_buffer (self, texture);
-    }
-
-  return buffer;
-}
-
-static void
-sp_buffer_release (void             *data,
-                   struct wl_buffer *buffer)
-{
-  wl_buffer_destroy (buffer);
-}
-
-static const struct wl_buffer_listener sp_buffer_listener = {
-  sp_buffer_release,
-};
-
-static struct wl_buffer *
-get_sp_buffer (GdkWaylandSubsurface *self)
-{
-  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (GDK_SUBSURFACE (self)->parent));
-  struct wl_buffer *buffer = NULL;
-
-  if (display->single_pixel_buffer)
-    buffer = wp_single_pixel_buffer_manager_v1_create_u32_rgba_buffer (display->single_pixel_buffer,
-                                                                       0, 0, 0, 0xffffffffU);
-
-  if (buffer)
-    wl_buffer_add_listener (buffer, &sp_buffer_listener, self);
-
-  return buffer;
-}
-
 static inline enum wl_output_transform
 gdk_texture_transform_to_wl (GdkTextureTransform transform)
 {
@@ -253,80 +161,24 @@ wl_output_transform_to_gdk (enum wl_output_transform transform)
  return (GdkTextureTransform) transform;
 }

-static void
-ensure_bg_surface (GdkWaylandSubsurface *self)
-{
-  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (GDK_SUBSURFACE (self)->parent);
-  GdkDisplay *display = gdk_surface_get_display (GDK_SUBSURFACE (self)->parent);
-  GdkWaylandDisplay *disp = GDK_WAYLAND_DISPLAY (display);
-  struct wl_region *region;
-
-  if (self->bg_surface)
-    return;
-
-  self->bg_surface = wl_compositor_create_surface (disp->compositor);
-  self->bg_subsurface = wl_subcompositor_get_subsurface (disp->subcompositor,
-                                                         self->bg_surface,
-                                                         impl->display_server.wl_surface);
-  self->bg_viewport = wp_viewporter_get_viewport (disp->viewporter, self->bg_surface);
-
-  /* We are opaque */
-  wl_surface_set_opaque_region (self->bg_surface, self->opaque_region);
-
-  /* No input, please */
-  region = wl_compositor_create_region (disp->compositor);
-  wl_surface_set_input_region (self->bg_surface, region);
-  wl_region_destroy (region);
-}
-
-static inline gboolean
-scaled_rect_is_integral (const graphene_rect_t *rect,
-                         float                  scale,
-                         graphene_rect_t       *device_rect)
-{
-  cairo_rectangle_int_t device_int;
-
-  gsk_rect_scale (rect, scale, scale, device_rect);
-
-  device_int.x = device_rect->origin.x;
-  device_int.y = device_rect->origin.y;
-  device_int.width = device_rect->size.width;
-  device_int.height = device_rect->size.height;
-
-  return device_int.x == device_rect->origin.x &&
-         device_int.y == device_rect->origin.y &&
-         device_int.width == device_rect->size.width &&
-         device_int.height == device_rect->size.height;
-}
-
 static gboolean
 gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                               GdkTexture            *texture,
                               const graphene_rect_t *source,
                               const graphene_rect_t *dest,
                               GdkTextureTransform    transform,
-                               const graphene_rect_t *background,
                               gboolean               above,
                               GdkSubsurface         *sibling)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);
  GdkWaylandSurface *parent = GDK_WAYLAND_SURFACE (sub->parent);
-  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (sub->parent));
  struct wl_buffer *buffer = NULL;
  gboolean result = FALSE;
  GdkWaylandSubsurface *sib = sibling ? GDK_WAYLAND_SUBSURFACE (sibling) : NULL;
  gboolean will_be_above;
  double scale;
  graphene_rect_t device_rect;
-  gboolean has_background;
-  enum wl_output_transform tf;
-  gboolean dest_changed = FALSE;
-  gboolean source_changed = FALSE;
-  gboolean transform_changed = FALSE;
-  gboolean stacking_changed = FALSE;
-  gboolean needs_commit = FALSE;
-  gboolean background_changed = FALSE;
-  gboolean needs_bg_commit = FALSE;
+  cairo_rectangle_int_t device_dest;

  if (sibling)
    will_be_above = sibling->above_parent;
@@ -339,133 +191,71 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
      return FALSE;
    }

+  self->dest.x = dest->origin.x;
+  self->dest.y = dest->origin.y;
+  self->dest.width = dest->size.width;
+  self->dest.height = dest->size.height;
+
+  self->source.origin.x = source->origin.x;
+  self->source.origin.y = source->origin.y;
+  self->source.size.width = source->size.width;
+  self->source.size.height = source->size.height;
+
+  self->transform = gdk_texture_transform_to_wl (transform);
+
+  scale = gdk_fractional_scale_to_double (&parent->scale);
+
+  device_rect.origin.x = dest->origin.x * scale;
+  device_rect.origin.y = dest->origin.y * scale;
+  device_rect.size.width = dest->size.width * scale;
+  device_rect.size.height = dest->size.height * scale;
+
+  device_dest.x = device_rect.origin.x;
+  device_dest.y = device_rect.origin.y;
+  device_dest.width = device_rect.size.width;
+  device_dest.height = device_rect.size.height;
+
  if (self->dest.x != dest->origin.x ||
      self->dest.y != dest->origin.y ||
      self->dest.width != dest->size.width ||
      self->dest.height != dest->size.height)
-    {
-      self->dest.x = dest->origin.x;
-      self->dest.y = dest->origin.y;
-      self->dest.width = dest->size.width;
-      self->dest.height = dest->size.height;
-      dest_changed = TRUE;
-    }
-
-  if (!gsk_rect_equal (&self->source, source))
-    {
-      self->source.origin.x = source->origin.x;
-      self->source.origin.y = source->origin.y;
-      self->source.size.width = source->size.width;
-      self->source.size.height = source->size.height;
-      source_changed = TRUE;
-    }
-
-  tf = gdk_texture_transform_to_wl (transform);
-  if (self->transform != tf)
-    {
-      self->transform = tf;
-      transform_changed = TRUE;
-    }
-
-  if (sibling != gdk_subsurface_get_sibling (sub, above) ||
-      will_be_above != gdk_subsurface_is_above_parent (sub))
-    stacking_changed = TRUE;
-
-  if (self->texture == NULL)
-    {
-      dest_changed = TRUE;
-      source_changed = TRUE;
-      transform_changed = TRUE;
-      stacking_changed = TRUE;
-    }
-
-  scale = gdk_fractional_scale_to_double (&parent->scale);
-
-  if (background)
-    {
-      background_changed =
-          !self->bg_attached ||
-          self->bg_rect.x != background->origin.x ||
-          self->bg_rect.y != background->origin.y ||
-          self->bg_rect.width != background->size.width ||
-          self->bg_rect.height != background->size.height;
-      self->bg_rect.x = background->origin.x;
-      self->bg_rect.y = background->origin.y;
-      self->bg_rect.width = background->size.width;
-      self->bg_rect.height = background->size.height;
-    }
-  else
-    {
-      background_changed = self->bg_attached;
-      self->bg_rect.x = 0;
-      self->bg_rect.y = 0;
-      self->bg_rect.width = 0;
-      self->bg_rect.height = 0;
-    }
-
-  has_background = self->bg_rect.width > 0 && self->bg_rect.height > 0;
-
-  if (has_background)
-    ensure_bg_surface (self);
-
-  if (!scaled_rect_is_integral (dest, 1, &device_rect))
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Non-integral coordinates %g %g %g %g",
-                         self,
+                         "Non-integer coordinates %g %g %g %g for %dx%d texture, hiding subsurface %p",
                         dest->origin.x, dest->origin.y,
-                         dest->size.width, dest->size.height);
-    }
-  else if (!scaled_rect_is_integral (dest, scale, &device_rect))
-    {
-      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Non-integral device coordinates %g %g %g %g (scale %.2f)",
-                         self,
-                         device_rect.origin.x, device_rect.origin.y,
-                         device_rect.size.width, device_rect.size.height,
-                         scale);
-    }
-  else if (background && !scaled_rect_is_integral (background, 1, &device_rect))
-    {
-      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Non-integral background coordinates %g %g %g %g",
-                         self,
-                         background->origin.x, background->origin.y,
-                         background->size.width, background->size.height);
-    }
-  else if (background && !scaled_rect_is_integral (background, scale, &device_rect))
-    {
-      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Non-integral background device coordinates %g %g %g %g (scale %.2f)",
-                         self,
-                         device_rect.origin.x, device_rect.origin.y,
-                         device_rect.size.width, device_rect.size.height,
-                         scale);
-    }
-  else if (!GDK_IS_DMABUF_TEXTURE (texture) &&
-           !GDK_DISPLAY_DEBUG_CHECK (gdk_surface_get_display (sub->parent), FORCE_OFFLOAD))
-    {
-      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 %s (%dx%d) is not a GdkDmabufTexture",
-                         self,
-                         G_OBJECT_TYPE_NAME (texture),
+                         dest->size.width, dest->size.height,
                         gdk_texture_get_width (texture),
-                         gdk_texture_get_height (texture));
+                         gdk_texture_get_height (texture),
+                         self);
+    }
+  else if (device_dest.x != device_rect.origin.x ||
+           device_dest.y != device_rect.origin.y ||
+           device_dest.width != device_rect.size.width ||
+           device_dest.height != device_rect.size.height)
+    {
+      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                         "Non-integral device coordinates %g %g %g %g (fractional scale %.2f), hiding subsurface %p",
+                         device_rect.origin.x, device_rect.origin.y,
+                         device_rect.size.width, device_rect.size.width,
+                         scale,
+                         self);
+    }
+  else if (!GDK_IS_DMABUF_TEXTURE (texture))
+    {
+      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                         "%dx%d %s is not a GdkDmabufTexture, hiding subsurface %p",
+                         gdk_texture_get_width (texture),
+                         gdk_texture_get_height (texture),
+                         G_OBJECT_TYPE_NAME (texture),
+                         self);
    }
  else if (!will_be_above &&
-           gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE &&
-           !has_background)
+           gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE)
    {
      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Non-opaque texture (%dx%d) below",
-                         self,
+                         "Cannot offload non-opaque %dx%d texture below, hiding subsurface %p",
                         gdk_texture_get_width (texture),
-                         gdk_texture_get_height (texture));
-    }
-  else if (has_background && !display->single_pixel_buffer)
-    {
-      GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                         "[%p] 🗙 Texture has background, but no single-pixel buffer support",
+                         gdk_texture_get_height (texture),
                         self);
    }
  else
@@ -494,13 +284,10 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                }

              GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                                 "[%p] %s Attaching texture (%dx%d) at %d %d %d %d",
-                                 self,
-                                 will_be_above
-                                   ? (has_background ? "▲" : "△")
-                                   : (has_background ? "▼" : "▽"),
+                                 "Attached %dx%d texture to subsurface %p at %d %d %d %d",
                                 gdk_texture_get_width (texture),
                                 gdk_texture_get_height (texture),
+                                 self,
                                 self->dest.x, self->dest.y,
                                 self->dest.width, self->dest.height);
              result = TRUE;
@@ -508,53 +295,36 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
          else
            {
              GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                                 "[%p] 🗙 Failed to create wl_buffer",
+                                 "Compositor failed to create wl_buffer for %dx%d texture, hiding subsurface %p",
+                                 gdk_texture_get_width (texture),
+                                 gdk_texture_get_height (texture),
                                 self);
            }
        }
      else
        {
-          if (dest_changed)
-            GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
-                               "[%p] %s Moving texture (%dx%d) to %d %d %d %d",
-                               self,
-                               will_be_above
-                                 ? (has_background ? "▲" : "△")
-                                 : (has_background ? "▼" : "▽"),
-                               gdk_texture_get_width (texture),
-                               gdk_texture_get_height (texture),
-                               self->dest.x, self->dest.y,
-                               self->dest.width, self->dest.height);
-
          buffer = NULL;
+          GDK_DISPLAY_DEBUG (gdk_surface_get_display (sub->parent), OFFLOAD,
+                             "Moved %dx%d texture in subsurface %p to %d %d %d %d",
+                             gdk_texture_get_width (texture),
+                             gdk_texture_get_height (texture),
+                             self,
+                             self->dest.x, self->dest.y,
+                             self->dest.width, self->dest.height);
          result = TRUE;
        }
    }

  if (result)
    {
-      if (transform_changed)
-        {
-          wl_surface_set_buffer_transform (self->surface, self->transform);
-          needs_commit = TRUE;
-        }
-
-      if (dest_changed)
-        {
-          wl_subsurface_set_position (self->subsurface, self->dest.x, self->dest.y);
-          wp_viewport_set_destination (self->viewport, self->dest.width, self->dest.height);
-          needs_commit = TRUE;
-        }
-
-      if (source_changed)
-        {
-          wp_viewport_set_source (self->viewport,
-                                  wl_fixed_from_double (self->source.origin.x),
-                                  wl_fixed_from_double (self->source.origin.y),
-                                  wl_fixed_from_double (self->source.size.width),
-                                  wl_fixed_from_double (self->source.size.height));
-          needs_commit = TRUE;
-        }
+      wl_surface_set_buffer_transform (self->surface, self->transform);
+      wl_subsurface_set_position (self->subsurface, self->dest.x, self->dest.y);
+      wp_viewport_set_destination (self->viewport, self->dest.width, self->dest.height);
+      wp_viewport_set_source (self->viewport,
+                              wl_fixed_from_double (self->source.origin.x),
+                              wl_fixed_from_double (self->source.origin.y),
+                              wl_fixed_from_double (self->source.size.width),
+                              wl_fixed_from_double (self->source.size.height));

      if (buffer)
        {
@@ -563,95 +333,39 @@ gdk_wayland_subsurface_attach (GdkSubsurface         *sub,
                                    0, 0,
                                    gdk_texture_get_width (texture),
                                    gdk_texture_get_height (texture));
-          needs_commit = TRUE;
-        }

-      if (has_background)
-        {
-          if (background_changed)
-            {
-              wl_subsurface_set_position (self->bg_subsurface, self->bg_rect.x, self->bg_rect.y);
-              wp_viewport_set_destination (self->bg_viewport, self->bg_rect.width, self->bg_rect.height);
-              needs_bg_commit = TRUE;
-            }
-
-          if (!self->bg_attached)
-            {
-              self->bg_attached = TRUE;
-
-              wp_viewport_set_source (self->bg_viewport,
-                                      wl_fixed_from_int (0),
-                                      wl_fixed_from_int (0),
-                                      wl_fixed_from_int (1),
-                                      wl_fixed_from_int (1));
-              wl_surface_attach (self->bg_surface, get_sp_buffer (self), 0, 0);
-              wl_surface_damage_buffer (self->bg_surface, 0, 0, 1, 1);
-              needs_bg_commit = TRUE;
-            }
-        }
-      else
-        {
-          if (self->bg_attached)
-            {
-              self->bg_attached = FALSE;
-              wl_surface_attach (self->bg_surface, NULL, 0, 0);
-              needs_bg_commit = TRUE;
-            }
        }

      result = TRUE;
    }
  else
    {
-      if (g_set_object (&self->texture, NULL))
-        {
-          wl_surface_attach (self->surface, NULL, 0, 0);
-          needs_commit = TRUE;
-        }
+      g_set_object (&self->texture, NULL);

-      if (self->bg_attached)
-        {
-          self->bg_attached = FALSE;
-          wl_surface_attach (self->bg_surface, NULL, 0, 0);
-          needs_bg_commit = TRUE;
-        }
+      wl_surface_attach (self->surface, NULL, 0, 0);
    }

-  if (stacking_changed)
+  if (sib)
    {
-      if (sib)
-        {
-          if (above)
-            wl_subsurface_place_above (self->subsurface, sib->surface);
-          else
-            wl_subsurface_place_below (self->subsurface, sib->surface);
-        }
+      if (above)
+        wl_subsurface_place_above (self->subsurface, sib->surface);
      else
-        {
-          if (above)
-            wl_subsurface_place_above (self->subsurface,
-                                       GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
-          else
-            wl_subsurface_place_below (self->subsurface,
-                                       GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
-        }
-      needs_commit = TRUE;
-
-      if (self->bg_attached)
-        {
-          wl_subsurface_place_below (self->bg_subsurface, self->surface);
-          needs_bg_commit = TRUE;
-        }
+        wl_subsurface_place_below (self->subsurface, sib->surface);
+    }
+  else
+    {
+      if (above)
+        wl_subsurface_place_above (self->subsurface,
+                                   GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
+      else
+        wl_subsurface_place_below (self->subsurface,
+                                   GDK_WAYLAND_SURFACE (sub->parent)->display_server.wl_surface);
    }

-  if (needs_commit)
-    wl_surface_commit (self->surface);
+  wl_surface_commit (self->surface);

-  if (needs_bg_commit)
-    wl_surface_commit (self->bg_surface);
-
-  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = needs_commit || needs_bg_commit;
-  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = stacking_changed || dest_changed || background_changed;
+  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = TRUE;
+  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = TRUE;

  return result;
 }
@@ -663,7 +377,7 @@ gdk_wayland_subsurface_detach (GdkSubsurface *sub)

  if (sub->parent == NULL)
    {
-      g_warning ("Can't detach from destroyed subsurface %p", self);
+      g_warning ("Can't draw to destroyed subsurface %p", self);
      return;
    }

@@ -672,13 +386,6 @@ gdk_wayland_subsurface_detach (GdkSubsurface *sub)
  wl_surface_set_opaque_region (self->surface, self->opaque_region);
  wl_surface_commit (self->surface);

-  if (self->bg_attached)
-    {
-      wl_surface_attach (self->bg_surface, NULL, 0, 0);
-      wl_surface_commit (self->bg_surface);
-      self->bg_attached = FALSE;
-    }
-
  ((GdkWaylandSurface *)sub->parent)->has_pending_subsurface_commits = TRUE;
  GDK_WAYLAND_SURFACE (sub->parent)->opaque_region_dirty = TRUE;
 }
@@ -692,27 +399,27 @@ gdk_wayland_subsurface_get_texture (GdkSubsurface *sub)
 }

 static void
-gdk_wayland_subsurface_get_texture_rect (GdkSubsurface   *sub,
-                                         graphene_rect_t *rect)
+gdk_wayland_subsurface_get_dest (GdkSubsurface   *sub,
+                                 graphene_rect_t *dest)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);

-  rect->origin.x = self->dest.x;
-  rect->origin.y = self->dest.y;
-  rect->size.width = self->dest.width;
-  rect->size.height = self->dest.height;
+  dest->origin.x = self->dest.x;
+  dest->origin.y = self->dest.y;
+  dest->size.width = self->dest.width;
+  dest->size.height = self->dest.height;
 }

 static void
-gdk_wayland_subsurface_get_source_rect (GdkSubsurface   *sub,
-                                        graphene_rect_t *rect)
+gdk_wayland_subsurface_get_source (GdkSubsurface   *sub,
+                                   graphene_rect_t *source)
 {
  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);

-  rect->origin.x = self->source.origin.x;
-  rect->origin.y = self->source.origin.y;
-  rect->size.width = self->source.size.width;
-  rect->size.height = self->source.size.height;
+  source->origin.x = self->source.origin.x;
+  source->origin.y = self->source.origin.y;
+  source->size.width = self->source.size.width;
+  source->size.height = self->source.size.height;
 }

 static GdkTextureTransform
@@ -723,20 +430,6 @@ gdk_wayland_subsurface_get_transform (GdkSubsurface *sub)
  return wl_output_transform_to_gdk (self->transform);
 }

-static gboolean
-gdk_wayland_subsurface_get_background_rect (GdkSubsurface   *sub,
-                                            graphene_rect_t *rect)
-{
-  GdkWaylandSubsurface *self = GDK_WAYLAND_SUBSURFACE (sub);
-
-  rect->origin.x = self->bg_rect.x;
-  rect->origin.y = self->bg_rect.y;
-  rect->size.width = self->bg_rect.width;
-  rect->size.height = self->bg_rect.height;
-
-  return rect->size.width > 0 && rect->size.height > 0;
-}
-
 static void
 gdk_wayland_subsurface_class_init (GdkWaylandSubsurfaceClass *class)
 {
@@ -748,10 +441,9 @@ gdk_wayland_subsurface_class_init (GdkWaylandSubsurfaceClass *class)
  subsurface_class->attach = gdk_wayland_subsurface_attach;
  subsurface_class->detach = gdk_wayland_subsurface_detach;
  subsurface_class->get_texture = gdk_wayland_subsurface_get_texture;
-  subsurface_class->get_source_rect = gdk_wayland_subsurface_get_source_rect;
-  subsurface_class->get_texture_rect = gdk_wayland_subsurface_get_texture_rect;
+  subsurface_class->get_source = gdk_wayland_subsurface_get_source;
+  subsurface_class->get_dest = gdk_wayland_subsurface_get_dest;
  subsurface_class->get_transform = gdk_wayland_subsurface_get_transform;
-  subsurface_class->get_background_rect = gdk_wayland_subsurface_get_background_rect;
 };

 static void
@@ -54,8 +54,6 @@
 #include "linux-dmabuf-unstable-v1-client-protocol.h"
 #include "presentation-time-client-protocol.h"

-#include "gsk/gskrectprivate.h"
-

 /**
 * GdkWaylandSurface:
@@ -659,7 +657,6 @@ static void
 gdk_wayland_surface_sync_opaque_region (GdkSurface *surface)
 {
  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
-  GdkWaylandDisplay *display = GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
  struct wl_region *wl_region = NULL;

  if (!impl->display_server.wl_surface)
@@ -682,21 +679,16 @@ gdk_wayland_surface_sync_opaque_region (GdkSurface *surface)
                continue;

              if (sub->texture != NULL)
-                {
-                  graphene_rect_t bounds;
-                  cairo_rectangle_int_t rect;
-
-                  gdk_subsurface_get_bounds (subsurface, &bounds);
-                  gsk_rect_to_cairo_grow (&bounds, &rect);
-                  cairo_region_subtract_rectangle (region, &rect);
-                }
+                cairo_region_subtract_rectangle (region, &sub->dest);
            }

-          wl_region = wl_region_from_cairo_region (display, region);
+          wl_region = wl_region_from_cairo_region (GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)),
+                                                   region);
          cairo_region_destroy (region);
        }
      else
-        wl_region = wl_region_from_cairo_region (display, impl->opaque_region);
+        wl_region = wl_region_from_cairo_region (GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface)),
+                                                 impl->opaque_region);
    }

  wl_surface_set_opaque_region (impl->display_server.wl_surface, wl_region);
@@ -821,11 +813,6 @@ gdk_wayland_surface_fractional_scale_preferred_scale_cb (void *data,
  gdk_wayland_surface_update_size (surface,
                                   surface->width, surface->height,
                                   &GDK_FRACTIONAL_SCALE_INIT (scale));
-
-  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
-                     "preferred fractional scale, surface %p scale %f",
-                     surface,
-                     gdk_fractional_scale_to_double (&GDK_FRACTIONAL_SCALE_INIT (scale)));
 }

 static const struct wp_fractional_scale_v1_listener fractional_scale_listener = {
@@ -842,8 +829,8 @@ surface_enter (void              *data,
  GdkDisplay *display = gdk_surface_get_display (surface);
  GdkMonitor *monitor;

-  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
-                     "surface enter, surface %p output %p", surface, output);
+  GDK_DISPLAY_DEBUG(gdk_surface_get_display (surface), EVENTS,
+                    "surface enter, surface %p output %p", surface, output);

  impl->display_server.outputs = g_slist_prepend (impl->display_server.outputs, output);

@@ -875,38 +862,9 @@ surface_leave (void              *data,
  gdk_surface_leave_monitor (surface, monitor);
 }

-static void
-surface_preferred_buffer_scale (void              *data,
-                                struct wl_surface *wl_surface,
-                                int32_t            factor)
-{
-  GdkSurface *surface = GDK_SURFACE (data);
-
-  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
-                     "preferred buffer scale, surface %p scale %d",
-                     surface, factor);
-}
-
-static void
-surface_preferred_buffer_transform (void              *data,
-                                    struct wl_surface *wl_surface,
-                                    uint32_t           transform)
-{
-  GdkSurface *surface = GDK_SURFACE (data);
-  const char *transform_name[] = {
-    "normal", "90", "180", "270", "flipped", "flipped-90", "flipped-180", "flipped-270"
-  };
-
-  GDK_DISPLAY_DEBUG (gdk_surface_get_display (surface), EVENTS,
-                     "preferred buffer transform, surface %p transform %s",
-                     surface, transform_name[transform]);
-}
-
 static const struct wl_surface_listener surface_listener = {
  surface_enter,
-  surface_leave,
-  surface_preferred_buffer_scale,
-  surface_preferred_buffer_transform,
+  surface_leave
 };

 static void
@@ -48,7 +48,7 @@ GDK_AVAILABLE_IN_ALL
 struct wl_display      *gdk_wayland_display_get_wl_display      (GdkDisplay *display);
 GDK_AVAILABLE_IN_ALL
 struct wl_compositor   *gdk_wayland_display_get_wl_compositor   (GdkDisplay *display);
-GDK_DEPRECATED_IN_4_16
+GDK_AVAILABLE_IN_ALL
 void                    gdk_wayland_display_set_cursor_theme    (GdkDisplay  *display,
                                                                 const char *name,
                                                                 int          size);
@@ -60,7 +60,7 @@ void                    gdk_wayland_display_set_startup_notification_id (GdkDisp

 GDK_AVAILABLE_IN_ALL
 gboolean                gdk_wayland_display_query_registry      (GdkDisplay  *display,
-                                                                 const char *global);
+								 const char *global);

 GDK_AVAILABLE_IN_4_4
 gpointer                gdk_wayland_display_get_egl_display     (GdkDisplay  *display);
@@ -8,7 +8,6 @@ gdk_wayland_sources = files([
  'gdkdevice-wayland.c',
  'gdkdevicepad-wayland.c',
  'gdkdisplay-wayland.c',
-  'gdkdmabuf-wayland.c',
  'gdkdrag-wayland.c',
  'gdkdragsurface-wayland.c',
  'gdkdrop-wayland.c',
@@ -67,7 +66,6 @@ proto_sources = [
  wlmod.find_protocol('fractional-scale', state: 'staging', version: 1),
  wlmod.find_protocol('linux-dmabuf', state: 'unstable', version: 1),
  wlmod.find_protocol('presentation-time', state: 'stable'),
-  wlmod.find_protocol('single-pixel-buffer', state: 'staging', version: 1),
 ]

 gdk_wayland_gen_headers = []
@@ -908,9 +908,7 @@ _gdk_win32_create_hicon_for_texture (GdkTexture *texture,
  width = cairo_image_surface_get_width (surface);
  height = cairo_image_surface_get_height (surface);

-G_GNUC_BEGIN_IGNORE_DEPRECATIONS
  pixbuf = gdk_pixbuf_get_from_surface (surface, 0, 0, width, height);
-G_GNUC_END_IGNORE_DEPRECATIONS

  icon = pixbuf_to_hicon (pixbuf, is_icon, x, y);

@@ -267,7 +267,7 @@ create_dummy_gl_window (void)
 {
  WNDCLASS wclass = { 0, };
  ATOM klass;
-  HWND hwnd = NULL;
+  HWND hwnd;

  wclass.lpszClassName = "GdkGLDummyWindow";
  wclass.lpfnWndProc = DefWindowProc;
@@ -38,6 +38,7 @@ gdk_win32_vulkan_context_create_surface (GdkVulkanContext *context,
 {
  GdkSurface *window = gdk_draw_context_get_surface (GDK_DRAW_CONTEXT (context));
  GdkDisplay *display = gdk_draw_context_get_display (GDK_DRAW_CONTEXT (context));
+  GdkWin32Surface *win32_surface = GDK_WIN32_SURFACE (window);
  VkWin32SurfaceCreateInfoKHR info;
  VkResult result;

@@ -274,22 +274,11 @@ gdk_x11_cursor_create_for_name (GdkDisplay  *display,
 * will have to be handled by the application (GTK applications can learn
 * about cursor theme changes by listening for change notification
 * for the corresponding `GtkSetting`).
- *
- * Deprecated: 4.16: Use the cursor-related properties of
- *   [GtkSettings](../gtk4/class.Settings.html) to set the cursor theme
 */
 void
 gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                  const char *theme,
                                  const int    size)
-{
-  _gdk_x11_display_set_cursor_theme (display, theme, size);
-}
-
-void
-_gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-                                   const char *theme,
-                                   const int    size)
 {
 #if defined(HAVE_XCURSOR) && defined(HAVE_XFIXES) && XFIXES_MAJOR >= 2
  GdkX11Screen *x11_screen;
@@ -665,6 +665,7 @@ gdk_x11_display_translate_event (GdkEventTranslator *translator,
      if (x11_screen->wmspec_check_window == xevent->xdestroywindow.window)
        {
          x11_screen->wmspec_check_window = None;
+          x11_screen->last_wmspec_check_time = 0;
          g_free (x11_screen->window_manager_name);
          x11_screen->window_manager_name = g_strdup ("unknown");

@@ -3078,7 +3079,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS

  display_class->get_monitors = gdk_x11_display_get_monitors;
  display_class->get_setting = gdk_x11_display_get_setting;
-  display_class->set_cursor_theme = _gdk_x11_display_set_cursor_theme;
+  display_class->set_cursor_theme = gdk_x11_display_set_cursor_theme;

  class->xevent = gdk_event_source_xevent;

@@ -206,10 +206,6 @@ GdkFilterReturn
 gdk_surface_cache_shape_filter (const XEvent *xevent,
                                gpointer      data);

-void _gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
-                                        const char *theme,
-                                        const int    size);
-
 void _gdk_x11_cursor_display_finalize (GdkDisplay *display);

 void _gdk_x11_surface_register_dnd (GdkSurface *window);
@@ -1145,6 +1145,7 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
 {
  GdkDisplay *display;
  Window window;
+  guint64 now;
  int error;

  display = x11_screen->display;
@@ -1154,6 +1155,11 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
  if (x11_screen->wmspec_check_window != None)
    return; /* already have it */

+  now = g_get_monotonic_time ();
+
+  if ((now - x11_screen->last_wmspec_check_time) / 1e6 < 15)
+    return; /* we've checked recently */
+
  window = get_net_supporting_wm_check (x11_screen, x11_screen->xroot_window);
  if (window == None)
    return;
@@ -1178,6 +1184,7 @@ fetch_net_wm_check_window (GdkX11Screen *x11_screen)
        return;

      x11_screen->wmspec_check_window = window;
+      x11_screen->last_wmspec_check_time = now;
      x11_screen->need_refetch_net_supported = TRUE;
      x11_screen->need_refetch_wm_name = TRUE;

@@ -48,6 +48,7 @@ struct _GdkX11Screen
  int xft_dpi;

  /* Window manager */
+  gint64 last_wmspec_check_time;
  Window wmspec_check_window;
  char *window_manager_name;

@@ -68,11 +68,6 @@ gdk_x11_vulkan_context_end_frame (GdkDrawContext *context,
  GDK_DRAW_CONTEXT_CLASS (gdk_x11_vulkan_context_parent_class)->end_frame (context, painted);
 }

-static void
-gdk_x11_vulkan_context_empty_frame (GdkDrawContext *draw_context)
-{
-}
-
 static void
 gdk_x11_vulkan_context_class_init (GdkX11VulkanContextClass *klass)
 {
@@ -80,7 +75,6 @@ gdk_x11_vulkan_context_class_init (GdkX11VulkanContextClass *klass)
  GdkDrawContextClass *draw_context_class = GDK_DRAW_CONTEXT_CLASS (klass);

  draw_context_class->end_frame = gdk_x11_vulkan_context_end_frame;
-  draw_context_class->empty_frame = gdk_x11_vulkan_context_empty_frame;

  context_class->create_surface = gdk_x11_vulkan_context_create_surface;
 }
@@ -88,7 +88,7 @@ GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_program_class                   (GdkDisplay  *display,
                                                                   const char  *program_class);

-GDK_DEPRECATED_IN_4_16
+GDK_AVAILABLE_IN_ALL
 void          gdk_x11_display_set_cursor_theme (GdkDisplay  *display,
                                                const char *theme,
                                                const int    size);
@@ -4013,7 +4013,7 @@ gsk_gl_render_job_visit_subsurface_node (GskGLRenderJob      *job,
              /* Clear the area so we can see through */
              GskGLCommandBatch *batch;
              guint16 color[4];
-              rgba_to_half (&GDK_RGBA_TRANSPARENT, color);
+              rgba_to_half (&(GdkRGBA){0,0,0,0}, color);

              batch = gsk_gl_command_queue_get_batch (job->command_queue);
              batch->draw.blend = 0;
@@ -19,7 +19,7 @@ static gint64 profiler_buffer_uploads;
 static void
 gsk_gpu_buffer_class_init (GskGpuBufferClass *klass)
 {
-  profiler_buffer_uploads_id = gdk_profiler_define_int_counter ("buffer-uploads", "Number of bytes uploaded to GPU");
+  profiler_buffer_uploads_id = gdk_profiler_define_int_counter ("ngl-buffer-uploads", "Number of bytes uploaded to GPU");
 }

 static void
@@ -546,7 +546,7 @@ gsk_gpu_device_maybe_gc (GskGpuDevice *self)

  if (priv->cache_timeout == 0 || dead_texture_pixels > 1000000)
    {
-      GSK_DEBUG (GLYPH_CACHE, "Pre-frame GC (%" G_GSIZE_FORMAT " dead pixels)", dead_texture_pixels);
+      GSK_DEBUG (GLYPH_CACHE, "Pre-frame GC (%lu dead pixels)", dead_texture_pixels);
      gsk_gpu_device_gc (self, g_get_monotonic_time ());
    }
 }
@@ -345,8 +345,8 @@ gsk_gpu_node_processor_init_draw (GskGpuNodeProcessor   *self,

  area.x = 0;
  area.y = 0;
-  area.width = MAX (1, ceilf (graphene_vec2_get_x (scale) * viewport->size.width - EPSILON));
-  area.height = MAX (1, ceilf (graphene_vec2_get_y (scale) * viewport->size.height - EPSILON));
+  area.width = ceilf (graphene_vec2_get_x (scale) * viewport->size.width - EPSILON);
+  area.height = ceilf (graphene_vec2_get_y (scale) * viewport->size.height - EPSILON);

  image = gsk_gpu_device_create_offscreen_image (gsk_gpu_frame_get_device (frame),
                                                 FALSE,
@@ -313,11 +313,6 @@ gsk_gpu_upload_texture_op_try (GskGpuFrame *frame,
    {
      GEnumClass *enum_class = g_type_class_ref (GDK_TYPE_MEMORY_FORMAT);

-      if (!GDK_IS_MEMORY_TEXTURE (texture))
-        {
-          gdk_debug_message ("Unoptimized upload for %s", G_OBJECT_TYPE_NAME (texture));
-        }
-
      if (gdk_texture_get_format (texture) != gsk_gpu_image_get_format (image))
        {
          gdk_debug_message ("Unsupported format %s, converting on CPU to %s",
@@ -48,5 +48,5 @@ gsk_vulkan_descriptors_bind (GskVulkanDescriptors *self,
                             GskVulkanDescriptors *previous,
                             VkCommandBuffer       vk_command_buffer)
 {
-  GSK_VULKAN_DESCRIPTORS_GET_CLASS (self)->bind (self, previous, vk_command_buffer);
+  return GSK_VULKAN_DESCRIPTORS_GET_CLASS (self)->bind (self, previous, vk_command_buffer);
 }
@@ -9,7 +9,6 @@

 #include "gdk/gdkdisplayprivate.h"
 #include "gdk/gdkvulkancontextprivate.h"
-#include "gdk/gdkprofilerprivate.h"

 struct _GskVulkanDevice
 {
@@ -787,7 +786,7 @@ gsk_vulkan_device_get_vk_conversion (GskVulkanDevice *self,
                                                    .sType = VK_STRUCTURE_TYPE_SAMPLER_YCBCR_CONVERSION_CREATE_INFO,
                                                    .format = vk_format,
                                                    .ycbcrModel = VK_SAMPLER_YCBCR_MODEL_CONVERSION_YCBCR_601,
-                                                    .ycbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_NARROW,
+                                                    .ycbcrRange = VK_SAMPLER_YCBCR_RANGE_ITU_FULL,
                                                    .components = (VkComponentMapping) {
                                                        VK_COMPONENT_SWIZZLE_IDENTITY,
                                                        VK_COMPONENT_SWIZZLE_IDENTITY,
@@ -950,9 +949,6 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
  GdkDisplay *display;
  const char *version_string;
  char *vertex_shader_name, *fragment_shader_name;
-  G_GNUC_UNUSED gint64 begin_time = GDK_PROFILER_CURRENT_TIME;
-  const char *clip_name[] = { "NONE", "RECT", "ROUNDED" };
-  const char *blend_name[] = { "OVER", "ADD", "CLEAR" };

  cache_key = (PipelineCacheKey) {
    .op_class = op_class,
@@ -1129,27 +1125,6 @@ gsk_vulkan_device_get_vk_pipeline (GskVulkanDevice           *self,
                                           NULL,
                                           &pipeline);

-  gdk_profiler_end_markf (begin_time,
-                          "Create Vulkan pipeline", "%s version=%s variation=%u clip=%s blend=%s format=%u",
-                          op_class->shader_name,
-                          version_string + 1,
-                          variation,
-                          clip_name[clip],
-                          blend_name[blend],
-                          format);
-
-  GSK_DEBUG (SHADERS,
-             "Create Vulkan pipeline (%s %s, %u/%s/%s/%u) for layout (%" G_GSIZE_FORMAT "/%" G_GSIZE_FORMAT "/%" G_GSIZE_FORMAT ")",
-             op_class->shader_name,
-             version_string + 1,
-             variation,
-             clip_name[clip],
-             blend_name[blend],
-             format,
-             layout->setup.n_buffers,
-             layout->setup.n_samplers,
-             layout->setup.n_immutable_samplers);
-
  g_free (fragment_shader_name);
  g_free (vertex_shader_name);

@@ -825,7 +825,7 @@ gsk_vulkan_image_new_for_dmabuf (GskVulkanDevice *device,
  self->vk_tiling = VK_IMAGE_TILING_DRM_FORMAT_MODIFIER_EXT;
  self->vk_format = vk_format;
  self->vk_pipeline_stage = VK_PIPELINE_STAGE_TOP_OF_PIPE_BIT;
-  self->vk_image_layout = VK_IMAGE_LAYOUT_GENERAL;
+  self->vk_image_layout = VK_IMAGE_LAYOUT_UNDEFINED;
  self->vk_access = 0;

  res  = vkCreateImage (vk_device,
@@ -556,7 +556,7 @@ gsk_standard_contour_init (GskContour             *contour,
                           gsize                   n_points,
                           const gskpathop        *ops,
                           gsize                   n_ops,
-                           gssize                  offset);
+                           ptrdiff_t               offset);

 static void
 gsk_standard_contour_copy (const GskContour *contour,
@@ -29,7 +29,6 @@
 #include "gskdebugprivate.h"
 #include "gskrendernodeprivate.h"
 #include "gdksurfaceprivate.h"
-#include "gdkrgbaprivate.h"

 #include <graphene.h>

@@ -82,26 +81,17 @@ find_texture_transform (GskTransform *transform)
 }

 static GdkTexture *
-find_texture_to_attach (GskOffload           *self,
-                        const GskRenderNode  *subsurface_node,
-                        graphene_rect_t      *out_texture_rect,
-                        graphene_rect_t      *out_source_rect,
-                        gboolean             *has_background,
-                        GdkTextureTransform  *out_texture_transform)
+find_texture_to_attach (GskOffload          *self,
+                        GdkSubsurface       *subsurface,
+                        const GskRenderNode *node,
+                        graphene_rect_t     *out_clip,
+                        GdkTextureTransform *out_texture_transform)
 {
-  GdkSubsurface *subsurface;
-  const GskRenderNode *node;
  gboolean has_clip = FALSE;
  graphene_rect_t clip;
  GskTransform *transform = NULL;
  GdkTexture *ret = NULL;

-  *has_background = FALSE;
-  *out_texture_transform = GDK_TEXTURE_TRANSFORM_NORMAL;
-
-  subsurface = gsk_subsurface_node_get_subsurface (subsurface_node);
-  node = subsurface_node;
-
  for (;;)
    {
      switch ((int) GSK_RENDER_NODE_TYPE (node))
@@ -110,36 +100,16 @@ find_texture_to_attach (GskOffload           *self,
          node = gsk_debug_node_get_child (node);
          break;

-        case GSK_SUBSURFACE_NODE:
-          node = gsk_subsurface_node_get_child (node);
-          break;
-
        case GSK_CONTAINER_NODE:
-          if (gsk_container_node_get_n_children (node) == 1)
+          if (gsk_container_node_get_n_children (node) != 1)
            {
-              node = gsk_container_node_get_child (node, 0);
-              break;
+              GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
+                                 "Can't offload subsurface %p: too much content, container with %d children",
+                                 subsurface, gsk_container_node_get_n_children (node));
+              goto out;
            }
-          else if (gsk_container_node_get_n_children (node) == 2)
-            {
-              GskRenderNode *child = gsk_container_node_get_child (node, 0);
-              graphene_rect_t bounds;
-
-              gsk_transform_transform_bounds (transform, &child->bounds, &bounds);
-              if (GSK_RENDER_NODE_TYPE (child) == GSK_COLOR_NODE &&
-                  gsk_rect_equal (&bounds, &subsurface_node->bounds) &&
-                  gdk_rgba_equal (gsk_color_node_get_color (child), &GDK_RGBA_BLACK))
-                {
-                  *has_background = TRUE;
-                  node = gsk_container_node_get_child (node, 1);
-                  break;
-                }
-            }
-
-          GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                             "[%p] 🗙 Too much content, container with %d children",
-                             subsurface, gsk_container_node_get_n_children (node));
-          goto out;
+          node = gsk_container_node_get_child (node, 0);
+          break;

        case GSK_TRANSFORM_NODE:
          {
@@ -149,7 +119,7 @@ find_texture_to_attach (GskOffload           *self,
              {
                char *s = gsk_transform_to_string (t);
                GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                                   "[%p] 🗙 Transform %s is not just scale/translate",
+                                   "Can't offload subsurface %p: transform %s is not just scale/translate",
                                   subsurface, s);
                g_free (s);
                goto out;
@@ -177,13 +147,12 @@ find_texture_to_attach (GskOffload           *self,
                if (!gsk_rect_intersection (c, &clip, &clip))
                  {
                    GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                                       "[%p] 🗙 Empty clip", subsurface);
+                                      "Can't offload subsurface %p: empty clip", subsurface);
                    goto out;
                  }
              }
            else
              {
-                gsk_transform_transform_bounds (transform, &node->bounds, out_texture_rect);
                clip = *c;
                has_clip = TRUE;
              }
@@ -207,18 +176,17 @@ find_texture_to_attach (GskOffload           *self,

                gsk_rect_intersection (&node->bounds, &clip, &clip);

-                out_source_rect->origin.x = (clip.origin.x - dx) * sx;
-                out_source_rect->origin.y = (clip.origin.y - dy) * sy;
-                out_source_rect->size.width = clip.size.width * sx;
-                out_source_rect->size.height = clip.size.height * sy;
+                out_clip->origin.x = (clip.origin.x - dx) * sx;
+                out_clip->origin.y = (clip.origin.y - dy) * sy;
+                out_clip->size.width = clip.size.width * sx;
+                out_clip->size.height = clip.size.height * sy;
              }
            else
              {
-                gsk_transform_transform_bounds (transform, &node->bounds, out_texture_rect);
-                out_source_rect->origin.x = 0;
-                out_source_rect->origin.y = 0;
-                out_source_rect->size.width = gdk_texture_get_width (texture);
-                out_source_rect->size.height = gdk_texture_get_height (texture);
+                out_clip->origin.x = 0;
+                out_clip->origin.y = 0;
+                out_clip->size.width = gdk_texture_get_width (texture);
+                out_clip->size.height = gdk_texture_get_height (texture);
              }

            ret = texture;
@@ -227,7 +195,7 @@ find_texture_to_attach (GskOffload           *self,

        default:
          GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                             "[%p] 🗙 Only textures supported (found %s)",
+                             "Can't offload subsurface %p: Only textures supported but found %s",
                             subsurface, g_type_name_from_instance ((GTypeInstance *) node));
          goto out;
        }
@@ -476,8 +444,7 @@ visit_node (GskOffload    *self,

      if (info->can_raise)
        {
-          if (gsk_rect_intersects (&transformed_bounds, &info->texture_rect) ||
-              gsk_rect_intersects (&transformed_bounds, &info->background_rect))
+          if (gsk_rect_intersects (&transformed_bounds, &info->dest))
            {
              GskRenderNodeType type = GSK_RENDER_NODE_TYPE (node);

@@ -488,7 +455,7 @@ visit_node (GskOffload    *self,
                  type != GSK_DEBUG_NODE)
                {
                  GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                                     "[%p]   Lowering because a %s overlaps",
+                                     "Can't raise subsurface %p because a %s overlaps",
                                     info->subsurface,
                                     g_type_name_from_instance ((GTypeInstance *) node));
                  info->can_raise = FALSE;
@@ -502,6 +469,7 @@ visit_node (GskOffload    *self,
  switch (GSK_RENDER_NODE_TYPE (node))
    {
    case GSK_BORDER_NODE:
+    case GSK_COLOR_NODE:
    case GSK_CONIC_GRADIENT_NODE:
    case GSK_LINEAR_GRADIENT_NODE:
    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
@@ -511,7 +479,6 @@ visit_node (GskOffload    *self,
    case GSK_TEXTURE_NODE:
    case GSK_TEXTURE_SCALE_NODE:
    case GSK_CAIRO_NODE:
-    case GSK_COLOR_NODE:
    case GSK_INSET_SHADOW_NODE:
    case GSK_OUTSET_SHADOW_NODE:
    case GSK_GL_SHADER_NODE:
@@ -525,7 +492,7 @@ visit_node (GskOffload    *self,
    case GSK_MASK_NODE:
    case GSK_FILL_NODE:
    case GSK_STROKE_NODE:
-      break;
+    break;

    case GSK_CLIP_NODE:
      {
@@ -631,33 +598,29 @@ complex_clip:
        if (info == NULL)
          {
            GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                               "[%p] 🗙 Unknown subsurface",
+                               "Can't offload: unknown subsurface %p",
                               subsurface);
          }
        else if (!self->current_clip->is_fully_contained)
          {
            GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                               "[%p] 🗙 Clipped",
+                               "Can't offload subsurface %p: clipped",
                               subsurface);
          }
        else if (gsk_transform_get_category (transform) < GSK_TRANSFORM_CATEGORY_2D_AFFINE)
          {
            GDK_DISPLAY_DEBUG (gdk_surface_get_display (self->surface), OFFLOAD,
-                               "[%p] 🗙 Non-affine transform",
+                               "Can't offload subsurface %p: non-affine transform",
                               subsurface);
          }
        else
          {
-            gboolean has_background;
-
-            info->texture = find_texture_to_attach (self, node, &info->texture_rect, &info->source_rect, &has_background, &info->transform);
+            info->texture = find_texture_to_attach (self, subsurface, gsk_subsurface_node_get_child (node), &info->source, &info->transform);
            if (info->texture)
              {
                info->can_offload = TRUE;
                info->can_raise = TRUE;
-                transform_bounds (self, &info->texture_rect, &info->texture_rect);
-                info->has_background = has_background;
-                transform_bounds (self, &node->bounds, &info->background_rect);
+                transform_bounds (self, &node->bounds, &info->dest);
                info->place_above = self->last_info ? self->last_info->subsurface : NULL;
                self->last_info = info;
              }
@@ -680,6 +643,7 @@ gsk_offload_new (GdkSurface     *surface,
                 GskRenderNode  *root,
                 cairo_region_t *diff)
 {
+  GdkDisplay *display = gdk_surface_get_display (surface);
  GskOffload *self;

  self = g_new0 (GskOffload, 1);
@@ -696,12 +660,9 @@ gsk_offload_new (GdkSurface     *surface,
  for (gsize i = 0; i < self->n_subsurfaces; i++)
    {
      GskOffloadInfo *info = &self->subsurfaces[i];
-      graphene_rect_t rect;
-
      info->subsurface = gdk_surface_get_subsurface (self->surface, i);
      info->was_offloaded = gdk_subsurface_get_texture (info->subsurface) != NULL;
      info->was_above = gdk_subsurface_is_above_parent (info->subsurface);
-      info->had_background = gdk_subsurface_get_background_rect (info->subsurface, &rect);
    }

  if (self->n_subsurfaces > 0)
@@ -718,28 +679,25 @@ gsk_offload_new (GdkSurface     *surface,
  for (gsize i = 0; i < self->n_subsurfaces; i++)
    {
      GskOffloadInfo *info = &self->subsurfaces[i];
-      graphene_rect_t old_bounds;
-      graphene_rect_t bounds;
+      graphene_rect_t old_dest;

-      gdk_subsurface_get_bounds (info->subsurface, &old_bounds);
+      gdk_subsurface_get_dest (info->subsurface, &old_dest);

      if (info->can_offload)
        {
          if (info->can_raise)
            info->is_offloaded = gdk_subsurface_attach (info->subsurface,
                                                        info->texture,
-                                                        &info->source_rect,
-                                                        &info->texture_rect,
+                                                        &info->source,
+                                                        &info->dest,
                                                        info->transform,
-                                                        info->has_background ? &info->background_rect : NULL,
                                                        TRUE, NULL);
          else
            info->is_offloaded = gdk_subsurface_attach (info->subsurface,
                                                        info->texture,
-                                                        &info->source_rect,
-                                                        &info->texture_rect,
+                                                        &info->source,
+                                                        &info->dest,
                                                        info->transform,
-                                                        info->has_background ? &info->background_rect : NULL,
                                                        info->place_above != NULL,
                                                        info->place_above);
        }
@@ -747,29 +705,34 @@ gsk_offload_new (GdkSurface     *surface,
        {
          info->is_offloaded = FALSE;
          if (info->was_offloaded)
-            gdk_subsurface_detach (info->subsurface);
+            {
+              GDK_DISPLAY_DEBUG (display, OFFLOAD, "Hiding subsurface %p", info->subsurface);
+              gdk_subsurface_detach (info->subsurface);
+            }
        }

-      info->is_above = info->is_offloaded && gdk_subsurface_is_above_parent (info->subsurface);
-
-      gdk_subsurface_get_bounds (info->subsurface, &bounds);
+      if (info->is_offloaded && gdk_subsurface_is_above_parent (info->subsurface))
+        {
+          GDK_DISPLAY_DEBUG (display, OFFLOAD, "Raising subsurface %p", info->subsurface);
+          info->is_above = TRUE;
+        }

      if (info->is_offloaded != info->was_offloaded ||
          info->is_above != info->was_above ||
-          (info->is_offloaded && !gsk_rect_equal (&bounds, &old_bounds)))
+          (info->is_offloaded && !gsk_rect_equal (&info->dest, &old_dest)))
        {
          /* We changed things, need to invalidate everything */
-          cairo_rectangle_int_t rect;
+          cairo_rectangle_int_t int_dest;

          if (info->is_offloaded)
            {
-              gsk_rect_to_cairo_grow (&bounds, &rect);
-              cairo_region_union_rectangle (diff, &rect);
+              gsk_rect_to_cairo_grow (&info->dest, &int_dest);
+              cairo_region_union_rectangle (diff, &int_dest);
            }
          if (info->was_offloaded)
            {
-              gsk_rect_to_cairo_grow (&old_bounds, &rect);
-              cairo_region_union_rectangle (diff, &rect);
+              gsk_rect_to_cairo_grow (&old_dest, &int_dest);
+              cairo_region_union_rectangle (diff, &int_dest);
            }
        }

@@ -31,10 +31,9 @@ typedef struct
  GdkSubsurface *subsurface;
  GdkTexture *texture;
  GdkSubsurface *place_above;
-  graphene_rect_t texture_rect;
-  graphene_rect_t source_rect;
+  graphene_rect_t dest;
+  graphene_rect_t source;
  GdkTextureTransform transform;
-  graphene_rect_t background_rect;

  guint was_offloaded : 1;
  guint can_offload   : 1;
@@ -43,9 +42,6 @@ typedef struct
  guint was_above     : 1;
  guint can_raise     : 1;
  guint is_above      : 1;
-
-  guint had_background : 1;
-  guint has_background : 1;
 } GskOffloadInfo;

 GskOffload *        gsk_offload_new                      (GdkSurface       *surface,
@@ -1143,10 +1143,10 @@ gsk_path_builder_rel_conic_to (GskPathBuilder *self,
 * @x2: x coordinate of second control point
 * @y2: y coordinate of second control point
 *
- * Adds an elliptical arc from the current point to @x2, @y2
+ * Adds an elliptical arc from the current point to @x3, @y3
 * with @x1, @y1 determining the tangent directions.
 *
- * After this, @x2, @y2 will be the new current point.
+ * After this, @x3, @y3 will be the new current point.
 *
 * Note: Two points and their tangents do not determine
 * a unique ellipse, so GSK just picks one. If you need more
@@ -1180,7 +1180,7 @@ gsk_path_builder_arc_to (GskPathBuilder *self,
 * @x2: x coordinate of second control point
 * @y2: y coordinate of second control point
 *
- * Adds an elliptical arc from the current point to @x2, @y2
+ * Adds an elliptical arc from the current point to @x3, @y3
 * with @x1, @y1 determining the tangent directions.
 *
 * All coordinates are given relative to the current point.
@@ -28,9 +28,7 @@ G_BEGIN_DECLS

 typedef enum
 {
-  /* path has only lines */
  GSK_PATH_FLAT,
-  /* all contours are closed */
  GSK_PATH_CLOSED
 } GskPathFlags;

@@ -1,4 +1,5 @@
 /* GSK - The GTK Scene Kit
+ *
 * Copyright 2016  Endless
 *
 * This library is free software; you can redistribute it and/or
@@ -428,6 +429,21 @@ gsk_renderer_render_texture (GskRenderer           *renderer,

  texture = GSK_RENDERER_GET_CLASS (renderer)->render_texture (renderer, root, viewport);

+  if (GSK_RENDERER_DEBUG_CHECK (renderer, RENDERER))
+    {
+      GString *buf = g_string_new ("*** Texture stats ***\n\n");
+
+      gsk_profiler_append_counters (priv->profiler, buf);
+      g_string_append_c (buf, '\n');
+
+      gsk_profiler_append_timers (priv->profiler, buf);
+      g_string_append_c (buf, '\n');
+
+      g_print ("%s\n***\n\n", buf->str);
+
+      g_string_free (buf, TRUE);
+    }
+
  return texture;
 }

@@ -494,6 +510,21 @@ gsk_renderer_render (GskRenderer          *renderer,

  renderer_class->render (renderer, root, clip);

+  if (GSK_RENDERER_DEBUG_CHECK (renderer, RENDERER))
+    {
+      GString *buf = g_string_new ("*** Frame stats ***\n\n");
+
+      gsk_profiler_append_counters (priv->profiler, buf);
+      g_string_append_c (buf, '\n');
+
+      gsk_profiler_append_timers (priv->profiler, buf);
+      g_string_append_c (buf, '\n');
+
+      g_print ("%s\n***\n\n", buf->str);
+
+      g_string_free (buf, TRUE);
+    }
+
  g_clear_pointer (&priv->prev_node, gsk_render_node_unref);
  cairo_region_destroy (clip);
  g_clear_pointer (&offload, gsk_offload_free);
@@ -579,17 +610,12 @@ get_renderer_for_display (GdkSurface *surface)
 static GType
 get_renderer_for_env_var (GdkSurface *surface)
 {
-  static GType env_var_type = G_TYPE_INVALID;
+  static GType env_var_type = G_TYPE_NONE;

-  if (env_var_type == G_TYPE_INVALID)
+  if (env_var_type == G_TYPE_NONE)
    {
      const char *renderer_name = g_getenv ("GSK_RENDERER");
      env_var_type = get_renderer_for_name (renderer_name);
-      if (env_var_type != G_TYPE_INVALID)
-        GSK_DEBUG (RENDERER,
-                   "Environment variable GSK_RENDERER=%s set, trying %s",
-                   renderer_name,
-                   g_type_name (env_var_type));
    }

  return env_var_type;
@@ -607,115 +633,63 @@ get_renderer_for_backend (GdkSurface *surface)
 }

 static gboolean
-gl_supported_platform (GdkSurface *surface,
-                       GType       renderer_type,
-                       gboolean    as_fallback)
+gl_software_rendering (GdkSurface *surface)
 {
  GdkDisplay *display = gdk_surface_get_display (surface);
  GdkGLContext *context;
-  GError *error = NULL;

-  if (!gdk_display_prepare_gl (display, &error))
-    {
-      if (!as_fallback)
-        GSK_DEBUG (RENDERER, "Not using GL: %s", error->message);
-      g_clear_error (&error);
-      return FALSE;
-    }
-
-  if (as_fallback)
-    return TRUE;
+  if (!gdk_display_prepare_gl (display, NULL))
+    return G_TYPE_INVALID;

  context = gdk_display_get_gl_context (display);
  gdk_gl_context_make_current (context);

-  if (strstr ((const char *) glGetString (GL_RENDERER), "llvmpipe") != NULL)
-    {
-      GSK_DEBUG (RENDERER, "Not using '%s': renderer is llvmpipe", g_type_name (renderer_type));
-      return FALSE;
-    }
-
-  return TRUE;
+  return strstr ((const char *) glGetString (GL_RENDERER), "llvmpipe") != NULL;
 }

 static GType
 get_renderer_for_gl (GdkSurface *surface)
 {
-  if (!gl_supported_platform (surface, gsk_ngl_renderer_get_type (), FALSE))
+  if (gl_software_rendering (surface))
    return G_TYPE_INVALID;

  return gsk_ngl_renderer_get_type ();
 }

-static GType
-get_renderer_for_gl_fallback (GdkSurface *surface)
-{
-  if (!gl_supported_platform (surface, GSK_TYPE_GL_RENDERER, TRUE))
-    return G_TYPE_INVALID;
-
-  return GSK_TYPE_GL_RENDERER;
-}
-
 #ifdef GDK_RENDERING_VULKAN
 static gboolean
-vulkan_supported_platform (GdkSurface *surface,
-                           GType       renderer_type,
-                           gboolean    as_fallback)
+vulkan_software_rendering (GdkSurface *surface)
 {
  GdkDisplay *display = gdk_surface_get_display (surface);
  VkPhysicalDeviceProperties props;
-  GError *error = NULL;

-  if (!gdk_display_init_vulkan (display, &error))
-    {
-      if (!as_fallback)
-        GSK_DEBUG (RENDERER, "Not using Vulkan: %s", error->message);
-      g_clear_error (&error);
-      return FALSE;
-    }
+  if (!gdk_display_init_vulkan (display, NULL))
+    return G_TYPE_INVALID;

  vkGetPhysicalDeviceProperties (display->vk_physical_device, &props);

-  if (props.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU)
-    {
-      if (!as_fallback)
-        GSK_DEBUG (RENDERER,
-                   "Not using '%s': device is CPU",
-                   g_type_name (renderer_type));
-      return FALSE;
-    }
-
-  if (as_fallback)
-    return TRUE;
-
-#ifdef GDK_WINDOWING_WAYLAND
-  if (GDK_IS_WAYLAND_DISPLAY (gdk_surface_get_display (surface)))
-    return TRUE;
-#endif
-
-  GSK_DEBUG (RENDERER, "Not using '%s': platform is not Wayland", g_type_name (renderer_type));
-
-  return FALSE;
+  return props.deviceType == VK_PHYSICAL_DEVICE_TYPE_CPU;
 }
+#endif

 static GType
 get_renderer_for_vulkan (GdkSurface *surface)
 {
-  if (!vulkan_supported_platform (surface, GSK_TYPE_VULKAN_RENDERER, FALSE))
+#ifdef GDK_RENDERING_VULKAN
+  if (vulkan_software_rendering (surface))
    return G_TYPE_INVALID;

  return GSK_TYPE_VULKAN_RENDERER;
+#else
+  return G_TYPE_INVALID;
+#endif
 }

 static GType
-get_renderer_for_vulkan_fallback (GdkSurface *surface)
+get_renderer_for_gles2 (GdkSurface *surface)
 {
-  if (!vulkan_supported_platform (surface, GSK_TYPE_VULKAN_RENDERER, TRUE))
-    return G_TYPE_INVALID;
-
-  return GSK_TYPE_VULKAN_RENDERER;
+  return GSK_TYPE_GL_RENDERER;
 }
-#endif

 static GType
 get_renderer_fallback (GdkSurface *surface)
@@ -729,14 +703,9 @@ static struct {
  { get_renderer_for_display },
  { get_renderer_for_env_var },
  { get_renderer_for_backend },
-#ifdef GDK_RENDERING_VULKAN
-  { get_renderer_for_vulkan },
-#endif
  { get_renderer_for_gl },
-#ifdef GDK_RENDERING_VULKAN
-  { get_renderer_for_vulkan_fallback },
-#endif
-  { get_renderer_for_gl_fallback },
+  { get_renderer_for_gles2 },
+  { get_renderer_for_vulkan },
  { get_renderer_fallback },
 };

@@ -774,19 +743,17 @@ gsk_renderer_new_for_surface (GdkSurface *surface)

      if (gsk_renderer_realize (renderer, surface, &error))
        {
-          GSK_DEBUG (RENDERER,
-                     "Using renderer '%s' for surface '%s'",
-                     G_OBJECT_TYPE_NAME (renderer),
-                     G_OBJECT_TYPE_NAME (surface));
+          GSK_RENDERER_DEBUG (renderer, RENDERER,
+                              "Using renderer of type '%s' for surface '%s'",
+                              G_OBJECT_TYPE_NAME (renderer),
+                              G_OBJECT_TYPE_NAME (surface));
          return renderer;
        }

-      GSK_DEBUG (RENDERER,
-                 "Failed to realize renderer '%s' for surface '%s': %s",
+      g_message ("Failed to realize renderer of type '%s' for surface '%s': %s\n",
                 G_OBJECT_TYPE_NAME (renderer),
                 G_OBJECT_TYPE_NAME (surface),
                 error->message);
-
      g_object_unref (renderer);
      g_clear_error (&error);
    }
@@ -39,7 +39,6 @@
 #include "gdk/gdksubsurfaceprivate.h"
 #include "gdk/gdktextureprivate.h"
 #include "gdk/gdktexturedownloaderprivate.h"
-#include "gdk/gdkrgbaprivate.h"

 #include <cairo.h>
 #ifdef CAIRO_HAS_SVG_SURFACE
@@ -2312,25 +2312,6 @@ parse_antialias (GtkCssParser *parser,
  return TRUE;
 }

-static gboolean
-parse_hint_metrics (GtkCssParser *parser,
-                    Context      *context,
-                    gpointer      out)
-{
-  if (!parse_enum (parser, CAIRO_GOBJECT_TYPE_HINT_METRICS, out))
-    return FALSE;
-
-  if (*(cairo_hint_metrics_t *) out != CAIRO_HINT_METRICS_OFF &&
-      *(cairo_hint_metrics_t *) out != CAIRO_HINT_METRICS_ON)
-    {
-      gtk_css_parser_error_value (parser, "Unsupported value for enum \"%s\"",
-                                  g_type_name (CAIRO_GOBJECT_TYPE_HINT_METRICS));
-      return FALSE;
-    }
-
-  return TRUE;
-}
-
 static GskRenderNode *
 parse_text_node (GtkCssParser *parser,
                 Context      *context)
@@ -2341,7 +2322,6 @@ parse_text_node (GtkCssParser *parser,
  PangoGlyphString *glyphs = NULL;
  cairo_hint_style_t hint_style = CAIRO_HINT_STYLE_SLIGHT;
  cairo_antialias_t antialias = CAIRO_ANTIALIAS_GRAY;
-  cairo_hint_metrics_t hint_metrics = CAIRO_HINT_METRICS_OFF;
  PangoFont *hinted;
  const Declaration declarations[] = {
    { "font", parse_font, clear_font, &font },
@@ -2350,7 +2330,6 @@ parse_text_node (GtkCssParser *parser,
    { "glyphs", parse_glyphs, clear_glyphs, &glyphs },
    { "hint-style", parse_hint_style, NULL, &hint_style },
    { "antialias", parse_antialias, NULL, &antialias },
-    { "hint-metrics", parse_hint_metrics, NULL, &hint_metrics },
  };
  GskRenderNode *result;

@@ -2362,7 +2341,7 @@ parse_text_node (GtkCssParser *parser,
      g_assert (font);
    }

-  hinted = gsk_reload_font (font, 1.0, hint_metrics, hint_style, antialias);
+  hinted = gsk_reload_font (font, 1.0, CAIRO_HINT_METRICS_OFF, hint_style, antialias);
  g_object_unref (font);
  font = hinted;

@@ -3560,13 +3539,13 @@ append_texture_param (Printer    *p,
    case GDK_MEMORY_U8:
    case GDK_MEMORY_U16:
      bytes = gdk_texture_save_to_png_bytes (texture);
-      g_string_append (p->str, "url(\"data:image/png;base64,\\\n");
+      g_string_append (p->str, "url(\"data:image/png;base64,");
      break;

    case GDK_MEMORY_FLOAT16:
    case GDK_MEMORY_FLOAT32:
      bytes = gdk_texture_save_to_tiff_bytes (texture);
-      g_string_append (p->str, "url(\"data:image/tiff;base64,\\\n");
+      g_string_append (p->str, "url(\"data:image/tiff;base64,");
      break;

    default:
@@ -3625,7 +3604,7 @@ gsk_text_node_serialize_font (GskRenderNode *node,

    b64 = base64_encode_with_linebreaks ((const guchar *) data, len);

-    g_string_append (p->str, " url(\"data:font/ttf;base64,\\\n");
+    g_string_append (p->str, " url(\"data:font/ttf;base64,");
    append_escaping_newlines (p->str, b64);
    g_string_append (p->str, "\")");

@@ -3644,13 +3623,11 @@ gsk_text_node_serialize_font_options (GskRenderNode *node,
  cairo_font_options_t *options;
  cairo_hint_style_t hint_style;
  cairo_antialias_t antialias;
-  cairo_hint_metrics_t hint_metrics;

  options = cairo_font_options_create ();
  cairo_scaled_font_get_font_options (sf, options);
  hint_style = cairo_font_options_get_hint_style (options);
  antialias = cairo_font_options_get_antialias (options);
-  hint_metrics = cairo_font_options_get_hint_metrics (options);
  cairo_font_options_destroy (options);

  /* medium and full are identical in the absence of subpixel modes */
@@ -3666,12 +3643,6 @@ gsk_text_node_serialize_font_options (GskRenderNode *node,
   */
  if (antialias == CAIRO_ANTIALIAS_NONE)
    append_enum_param (p, "antialias", CAIRO_GOBJECT_TYPE_ANTIALIAS, antialias);
-
-  /* CAIRO_HINT_METRICS_ON is the only value we ever emit here, since off is the default,
-   * and we don't accept any other values.
-   */
-  if (hint_metrics == CAIRO_HINT_METRICS_ON)
-    append_enum_param (p, "hint-metrics", CAIRO_GOBJECT_TYPE_HINT_METRICS, CAIRO_HINT_METRICS_ON);
 }

 void
@@ -4443,7 +4414,7 @@ render_node_print (Printer       *p,
            cairo_surface_write_to_png_stream (surface, cairo_write_array, array);

            _indent (p);
-            g_string_append (p->str, "pixels: url(\"data:image/png;base64,\\\n");
+            g_string_append (p->str, "pixels: url(\"data:image/png;base64,");
            b64 = base64_encode_with_linebreaks (array->data, array->len);
            append_escaping_newlines (p->str, b64);
            g_free (b64);
@@ -4463,7 +4434,7 @@ render_node_print (Printer       *p,
                if (cairo_script_from_recording_surface (script, surface) == CAIRO_STATUS_SUCCESS)
                  {
                    _indent (p);
-                    g_string_append (p->str, "script: url(\"data:;base64,\\\n");
+                    g_string_append (p->str, "script: url(\"data:;base64,");
                    b64 = base64_encode_with_linebreaks (array->data, array->len);
                    append_escaping_newlines (p->str, b64);
                    g_free (b64);
@@ -184,4 +184,10 @@
        </signal>
 </interface>

+<interface name="org.a11y.atspi.Event.Focus">
+	<signal name="Focus"><arg direction="in" type="(suuv)"/>
+          <annotation name="org.qtproject.QtDBus.QtTypeName.In0" value="QSpiEvent"/>
+        </signal>
+</interface>
+
 </node>
@@ -720,16 +720,6 @@ handle_accessible_get_property (GDBusConnection       *connection,
    res = get_parent_context_ref (accessible);
  else if (g_strcmp0 (property_name, "ChildCount") == 0)
    res = g_variant_new_int32 (gtk_at_spi_context_get_child_count (self));
-  else if (g_strcmp0 (property_name, "HelpText"))
-    {
-      if (gtk_at_context_has_accessible_property (GTK_AT_CONTEXT (self), GTK_ACCESSIBLE_PROPERTY_HELP_TEXT))
-        {
-          GtkAccessibleValue *value = gtk_at_context_get_accessible_property (GTK_AT_CONTEXT (self), GTK_ACCESSIBLE_PROPERTY_HELP_TEXT);
-          res = g_variant_new_string (gtk_string_accessible_value_get (value));
-        }
-      else
-        res = g_variant_new_string ("");
-    }
  else
    g_set_error (error, G_IO_ERROR, G_IO_ERROR_NOT_SUPPORTED,
                 "Unknown property '%s'", property_name);
@@ -909,6 +899,24 @@ emit_children_changed (GtkAtSpiContext         *self,
                                    context_ref);
 }

+static void
+emit_focus (GtkAtSpiContext *self,
+            gboolean         focus_in)
+{
+  if (self->connection == NULL)
+    return;
+
+  if (focus_in)
+    g_dbus_connection_emit_signal (self->connection,
+                                   NULL,
+                                   self->context_path,
+                                   "org.a11y.atspi.Event.Focus",
+                                   "Focus",
+                                   g_variant_new ("(siiva{sv})",
+                                                  "", 0, 0, g_variant_new_string ("0"), NULL),
+                                   NULL);
+}
+
 static void
 emit_window_event (GtkAtSpiContext *self,
                   const char      *event_type)
@@ -1146,7 +1154,7 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
    }

  if (changed_properties & GTK_ACCESSIBLE_PROPERTY_CHANGE_DESCRIPTION)
-    {
+  {
      char *label = gtk_at_context_get_description (GTK_AT_CONTEXT (self));
      GVariant *v = g_variant_new_take_string (label);
      emit_property_changed (self, "accessible-description", v);
@@ -1159,14 +1167,6 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
                             "accessible-value",
                             g_variant_new_double (gtk_number_accessible_value_get (value)));
    }
-
-  if (changed_properties & GTK_ACCESSIBLE_PROPERTY_CHANGE_HELP_TEXT)
-    {
-      value = gtk_accessible_attribute_set_get_value (properties, GTK_ACCESSIBLE_PROPERTY_HELP_TEXT);
-      emit_property_changed (self,
-                             "accessible-help-text",
-                             g_variant_new_string (gtk_string_accessible_value_get (value)));
-    }
 }

 static void
@@ -1196,6 +1196,7 @@ gtk_at_spi_context_platform_change (GtkATContext                *ctx,
      gboolean state = gtk_accessible_get_platform_state (GTK_ACCESSIBLE (widget),
                                                          GTK_ACCESSIBLE_PLATFORM_STATE_FOCUSED);
      emit_state_changed (self, "focused", state);
+      emit_focus (self, state);
    }

  if (changed_platform & GTK_ACCESSIBLE_PLATFORM_CHANGE_ACTIVE)
@@ -97,7 +97,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_FORM;

    case GTK_ACCESSIBLE_ROLE_GENERIC:
-      return ATSPI_ROLE_PANEL;
+      return ATSPI_ROLE_FILLER;

    case GTK_ACCESSIBLE_ROLE_GRID:
      return ATSPI_ROLE_TABLE;
@@ -106,7 +106,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_TABLE_CELL;

    case GTK_ACCESSIBLE_ROLE_GROUP:
-      return ATSPI_ROLE_GROUPING;
+      return ATSPI_ROLE_PANEL;

    case GTK_ACCESSIBLE_ROLE_HEADING:
      return ATSPI_ROLE_HEADING;
@@ -26,18 +26,24 @@
 #include "gtkcsserror.h"
 #include "gtkcsslocationprivate.h"

-static void clear_ref (GtkCssVariableValueReference *ref);
-
-#define GDK_ARRAY_NAME gtk_css_parser_references
-#define GDK_ARRAY_TYPE_NAME GtkCssParserReferences
-#define GDK_ARRAY_ELEMENT_TYPE GtkCssVariableValueReference
-#define GDK_ARRAY_BY_VALUE 1
-#define GDK_ARRAY_NO_MEMSET 1
-#define GDK_ARRAY_FREE_FUNC clear_ref
-#include "gdk/gdkarrayimpl.c"
-
 typedef struct _GtkCssParserBlock GtkCssParserBlock;

+struct _GtkCssParser
+{
+  volatile int ref_count;
+
+  GtkCssTokenizer *tokenizer;
+  GFile *file;
+  GFile *directory;
+  GtkCssParserErrorFunc error_func;
+  gpointer user_data;
+  GDestroyNotify user_destroy;
+
+  GArray *blocks;
+  GtkCssLocation location;
+  GtkCssToken token;
+};
+
 struct _GtkCssParserBlock
 {
  GtkCssLocation start_location;
@@ -46,97 +52,8 @@ struct _GtkCssParserBlock
  GtkCssTokenType alternative_token;
 };

-#define GDK_ARRAY_NAME gtk_css_parser_blocks
-#define GDK_ARRAY_TYPE_NAME GtkCssParserBlocks
-#define GDK_ARRAY_ELEMENT_TYPE GtkCssParserBlock
-#define GDK_ARRAY_PREALLOC 32
-#define GDK_ARRAY_NO_MEMSET 1
-#include "gdk/gdkarrayimpl.c"
-
-static inline GtkCssParserBlock *
-gtk_css_parser_blocks_get_last (GtkCssParserBlocks *blocks)
-{
-  return gtk_css_parser_blocks_index (blocks, gtk_css_parser_blocks_get_size (blocks) - 1);
-}
-
-static inline void
-gtk_css_parser_blocks_drop_last (GtkCssParserBlocks *blocks)
-{
-  gtk_css_parser_blocks_set_size (blocks, gtk_css_parser_blocks_get_size (blocks) - 1);
-}
-
-typedef struct _GtkCssTokenizerData GtkCssTokenizerData;
-
-struct _GtkCssTokenizerData
-{
-  GtkCssTokenizer *tokenizer;
-  char *var_name;
-  GtkCssVariableValue *variable;
-};
-
-static void
-gtk_css_tokenizer_data_clear (gpointer data)
-{
-  GtkCssTokenizerData *td = data;
-
-  gtk_css_tokenizer_unref (td->tokenizer);
-  if (td->var_name)
-    g_free (td->var_name);
-  if (td->variable)
-    gtk_css_variable_value_unref (td->variable);
-}
-
-#define GDK_ARRAY_NAME gtk_css_tokenizers
-#define GDK_ARRAY_TYPE_NAME GtkCssTokenizers
-#define GDK_ARRAY_ELEMENT_TYPE GtkCssTokenizerData
-#define GDK_ARRAY_FREE_FUNC gtk_css_tokenizer_data_clear
-#define GDK_ARRAY_BY_VALUE 1
-#define GDK_ARRAY_PREALLOC 16
-#define GDK_ARRAY_NO_MEMSET 1
-#include "gdk/gdkarrayimpl.c"
-
-static inline GtkCssTokenizerData *
-gtk_css_tokenizers_get_last (GtkCssTokenizers *tokenizers)
-{
-  return gtk_css_tokenizers_index (tokenizers, gtk_css_tokenizers_get_size (tokenizers) - 1);
-}
-
-static inline void
-gtk_css_tokenizers_drop_last (GtkCssTokenizers *tokenizers)
-{
-  gtk_css_tokenizers_set_size (tokenizers, gtk_css_tokenizers_get_size (tokenizers) - 1);
-}
-
-struct _GtkCssParser
-{
-  volatile int ref_count;
-
-  GtkCssTokenizers tokenizers;
-  GFile *file;
-  GFile *directory;
-  GtkCssParserErrorFunc error_func;
-  gpointer user_data;
-  GDestroyNotify user_destroy;
-
-  GtkCssParserBlocks blocks;
-  GtkCssLocation location;
-  GtkCssToken token;
-
-  GtkCssVariableValue **refs;
-  gsize n_refs;
-  gsize next_ref;
-  gboolean var_fallback;
-};
-
-static inline GtkCssTokenizer *
-get_tokenizer (GtkCssParser *self)
-{
-  return gtk_css_tokenizers_get_last (&self->tokenizers)->tokenizer;
-}
-
 static GtkCssParser *
 gtk_css_parser_new (GtkCssTokenizer       *tokenizer,
-                    GtkCssVariableValue   *value,
                    GFile                 *file,
                    GtkCssParserErrorFunc  error_func,
                    gpointer               user_data,
@@ -147,21 +64,17 @@ gtk_css_parser_new (GtkCssTokenizer       *tokenizer,
  self = g_new0 (GtkCssParser, 1);

  self->ref_count = 1;
-
-  gtk_css_tokenizers_init (&self->tokenizers);
-  gtk_css_tokenizers_append (&self->tokenizers,
-                             &(GtkCssTokenizerData) {
-                               gtk_css_tokenizer_ref (tokenizer),
-                               NULL,
-                               value ? gtk_css_variable_value_ref (value) : NULL });
-
+  self->tokenizer = gtk_css_tokenizer_ref (tokenizer);
  if (file)
-    self->file = g_object_ref (file);
+    {
+      self->file = g_object_ref (file);
+      self->directory = g_file_get_parent (file);
+    }

  self->error_func = error_func;
  self->user_data = user_data;
  self->user_destroy = user_destroy;
-  gtk_css_parser_blocks_init (&self->blocks);
+  self->blocks = g_array_new (FALSE, FALSE, sizeof (GtkCssParserBlock));

  return self;
 }
@@ -196,50 +109,26 @@ gtk_css_parser_new_for_bytes (GBytes                *bytes,
 {
  GtkCssTokenizer *tokenizer;
  GtkCssParser *result;
-
+  
  tokenizer = gtk_css_tokenizer_new (bytes);
-  result = gtk_css_parser_new (tokenizer, NULL, file, error_func, user_data, user_destroy);
+  result = gtk_css_parser_new (tokenizer, file, error_func, user_data, user_destroy);
  gtk_css_tokenizer_unref (tokenizer);

  return result;
 }

-GtkCssParser *
-gtk_css_parser_new_for_token_stream (GtkCssVariableValue    *value,
-                                     GFile                  *file,
-                                     GtkCssVariableValue   **refs,
-                                     gsize                   n_refs,
-                                     GtkCssParserErrorFunc   error_func,
-                                     gpointer                user_data,
-                                     GDestroyNotify          user_destroy)
-{
-  GtkCssTokenizer *tokenizer;
-  GtkCssParser *result;
-
-  tokenizer = gtk_css_tokenizer_new_for_range (value->bytes, value->offset,
-                                               value->end_offset - value->offset);
-  result = gtk_css_parser_new (tokenizer, value, file, error_func, user_data, user_destroy);
-  gtk_css_tokenizer_unref (tokenizer);
-
-  result->refs = refs;
-  result->n_refs = n_refs;
-  result->next_ref = 0;
-
-  return result;
-}
-
 static void
 gtk_css_parser_finalize (GtkCssParser *self)
 {
  if (self->user_destroy)
    self->user_destroy (self->user_data);

-  gtk_css_tokenizers_clear (&self->tokenizers);
+  g_clear_pointer (&self->tokenizer, gtk_css_tokenizer_unref);
  g_clear_object (&self->file);
  g_clear_object (&self->directory);
-  if (gtk_css_parser_blocks_get_size (&self->blocks) > 0)
-    g_critical ("Finalizing CSS parser with %lu remaining blocks", gtk_css_parser_blocks_get_size (&self->blocks));
-  gtk_css_parser_blocks_clear (&self->blocks);
+  if (self->blocks->len)
+    g_critical ("Finalizing CSS parser with %u remaining blocks", self->blocks->len);
+  g_array_free (self->blocks, TRUE);

  g_free (self);
 }
@@ -274,12 +163,6 @@ gtk_css_parser_get_file (GtkCssParser *self)
  return self->file;
 }

-GBytes *
-gtk_css_parser_get_bytes (GtkCssParser *self)
-{
-  return gtk_css_tokenizer_get_bytes (gtk_css_tokenizers_get (&self->tokenizers, 0)->tokenizer);
-}
-
 /**
 * gtk_css_parser_resolve_url:
 * @self: a `GtkCssParser`
@@ -305,12 +188,7 @@ gtk_css_parser_resolve_url (GtkCssParser *self,
    }

  if (self->directory == NULL)
-    {
-      if (self->file)
-        self->directory = g_file_get_parent (self->file);
-      if (self->directory == NULL)
-        return NULL;
-    }
+    return NULL;

  return g_file_resolve_relative_path (self->directory, url);
 }
@@ -361,7 +239,7 @@ gtk_css_parser_get_start_location (GtkCssParser *self)
 const GtkCssLocation *
 gtk_css_parser_get_end_location (GtkCssParser *self)
 {
-  return gtk_css_tokenizer_get_location (get_tokenizer (self));
+  return gtk_css_tokenizer_get_location (self->tokenizer);
 }

 /**
@@ -381,13 +259,13 @@ gtk_css_parser_get_block_location (GtkCssParser *self)
 {
  const GtkCssParserBlock *block;

-  if (gtk_css_parser_blocks_get_size (&self->blocks) == 0)
+  if (self->blocks->len == 0)
    {
      static const GtkCssLocation start_of_document = { 0, };
      return &start_of_document;
    }

-  block = gtk_css_parser_blocks_get_last (&self->blocks);
+  block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);
  return &block->start_location;
 }

@@ -395,14 +273,12 @@ static void
 gtk_css_parser_ensure_token (GtkCssParser *self)
 {
  GError *error = NULL;
-  GtkCssTokenizer *tokenizer;

  if (!gtk_css_token_is (&self->token, GTK_CSS_TOKEN_EOF))
    return;

-  tokenizer = get_tokenizer (self);
-  self->location = *gtk_css_tokenizer_get_location (tokenizer);
-  if (!gtk_css_tokenizer_read_token (tokenizer, &self->token, &error))
+  self->location = *gtk_css_tokenizer_get_location (self->tokenizer);
+  if (!gtk_css_tokenizer_read_token (self->tokenizer, &self->token, &error))
    {
      /* We ignore the error here, because the resulting token will
       * likely already trigger an error in the parsing code and
@@ -410,49 +286,6 @@ gtk_css_parser_ensure_token (GtkCssParser *self)
       */
      g_clear_error (&error);
    }
-
-  if (gtk_css_tokenizers_get_size (&self->tokenizers) > 1 && gtk_css_token_is (&self->token, GTK_CSS_TOKEN_EOF))
-    {
-      gtk_css_tokenizers_drop_last (&self->tokenizers);
-      gtk_css_parser_ensure_token (self);
-      return;
-    }
-
-  /* Resolve var(--name): skip it and insert the resolved reference instead */
-  if (self->n_refs > 0 && gtk_css_token_is_function (&self->token, "var") && self->var_fallback == 0)
-    {
-      GtkCssVariableValue *ref;
-      GtkCssTokenizer *ref_tokenizer;
-
-      gtk_css_parser_start_block (self);
-
-      g_assert (gtk_css_parser_has_token (self, GTK_CSS_TOKEN_IDENT));
-
-      char *var_name = gtk_css_parser_consume_ident (self);
-      g_assert (var_name[0] == '-' && var_name[1] == '-');
-
-      /* If we encounter var() in a fallback when we can already resolve the
-       * actual variable, skip it */
-      self->var_fallback++;
-      gtk_css_parser_skip (self);
-      gtk_css_parser_end_block (self);
-      self->var_fallback--;
-
-      g_assert (self->next_ref < self->n_refs);
-
-      ref = self->refs[self->next_ref++];
-      ref_tokenizer = gtk_css_tokenizer_new_for_range (ref->bytes, ref->offset,
-                                                       ref->end_offset - ref->offset);
-      gtk_css_tokenizers_append (&self->tokenizers,
-                                 &(GtkCssTokenizerData) {
-                                   ref_tokenizer,
-                                   g_strdup (var_name),
-                                   gtk_css_variable_value_ref (ref)
-                                 });
-
-      gtk_css_parser_ensure_token (self);
-      g_free (var_name);
-    }
 }

 const GtkCssToken *
@@ -462,9 +295,9 @@ gtk_css_parser_peek_token (GtkCssParser *self)

  gtk_css_parser_ensure_token (self);

-  if (gtk_css_parser_blocks_get_size (&self->blocks) > 0)
+  if (self->blocks->len)
    {
-      const GtkCssParserBlock *block = gtk_css_parser_blocks_get_last (&self->blocks);
+      const GtkCssParserBlock *block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);
      if (gtk_css_token_is (&self->token, block->end_token) ||
          gtk_css_token_is (&self->token, block->inherited_end_token) ||
          gtk_css_token_is (&self->token, block->alternative_token))
@@ -519,7 +352,7 @@ gtk_css_parser_start_block (GtkCssParser *self)
  block.inherited_end_token = GTK_CSS_TOKEN_EOF;
  block.alternative_token = GTK_CSS_TOKEN_EOF;
  block.start_location = self->location;
-  gtk_css_parser_blocks_append (&self->blocks, block);
+  g_array_append_val (self->blocks, block);

  gtk_css_token_clear (&self->token);
 }
@@ -531,13 +364,13 @@ gtk_css_parser_start_semicolon_block (GtkCssParser    *self,
  GtkCssParserBlock block;

  block.end_token = GTK_CSS_TOKEN_SEMICOLON;
-  if (gtk_css_parser_blocks_get_size (&self->blocks) > 0)
-    block.inherited_end_token = gtk_css_parser_blocks_get_last (&self->blocks)->end_token;
+  if (self->blocks->len)
+    block.inherited_end_token = g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1).end_token;
  else
    block.inherited_end_token = GTK_CSS_TOKEN_EOF;
  block.alternative_token = alternative_token;
  block.start_location = self->location;
-  gtk_css_parser_blocks_append (&self->blocks, block);
+  g_array_append_val (self->blocks, block);
 }

 void
@@ -545,9 +378,9 @@ gtk_css_parser_end_block_prelude (GtkCssParser *self)
 {
  GtkCssParserBlock *block;

-  g_return_if_fail (gtk_css_parser_blocks_get_size (&self->blocks) > 0);
+  g_return_if_fail (self->blocks->len > 0);

-  block = gtk_css_parser_blocks_get_last (&self->blocks);
+  block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);

  if (block->alternative_token == GTK_CSS_TOKEN_EOF)
    return;
@@ -572,11 +405,11 @@ gtk_css_parser_end_block (GtkCssParser *self)
 {
  GtkCssParserBlock *block;

-  g_return_if_fail (gtk_css_parser_blocks_get_size (&self->blocks) > 0);
+  g_return_if_fail (self->blocks->len > 0);

  gtk_css_parser_skip_until (self, GTK_CSS_TOKEN_EOF);

-  block = gtk_css_parser_blocks_get_last (&self->blocks);
+  block = &g_array_index (self->blocks, GtkCssParserBlock, self->blocks->len - 1);

  if (gtk_css_token_is (&self->token, GTK_CSS_TOKEN_EOF))
    {
@@ -585,7 +418,7 @@ gtk_css_parser_end_block (GtkCssParser *self)
                           gtk_css_parser_get_block_location (self),
                           gtk_css_parser_get_start_location (self),
                           "Unterminated block at end of document");
-      gtk_css_parser_blocks_drop_last (&self->blocks);
+      g_array_set_size (self->blocks, self->blocks->len - 1);
    }
  else if (gtk_css_token_is (&self->token, block->inherited_end_token))
    {
@@ -595,11 +428,11 @@ gtk_css_parser_end_block (GtkCssParser *self)
                           gtk_css_parser_get_block_location (self),
                           gtk_css_parser_get_start_location (self),
                           "Expected ';' at end of block");
-      gtk_css_parser_blocks_drop_last (&self->blocks);
+      g_array_set_size (self->blocks, self->blocks->len - 1);
    }
  else
    {
-      gtk_css_parser_blocks_drop_last (&self->blocks);
+      g_array_set_size (self->blocks, self->blocks->len - 1);
      if (gtk_css_token_is_preserved (&self->token, NULL))
        {
          gtk_css_token_clear (&self->token);
@@ -669,19 +502,6 @@ gtk_css_parser_skip_until (GtkCssParser    *self,
    }
 }

-void
-gtk_css_parser_skip_whitespace (GtkCssParser *self)
-{
-  const GtkCssToken *token;
-
-  for (token = gtk_css_parser_peek_token (self);
-       gtk_css_token_is (token, GTK_CSS_TOKEN_WHITESPACE);
-       token = gtk_css_parser_peek_token (self))
-    {
-      gtk_css_parser_consume_token (self);
-    }
-}
-
 void
 gtk_css_parser_emit_error (GtkCssParser         *self,
                           const GtkCssLocation *start,
@@ -1292,319 +1112,3 @@ gtk_css_parser_consume_any (GtkCssParser            *parser,

  return result;
 }
-
-gboolean
-gtk_css_parser_has_references (GtkCssParser *self)
-{
-  GtkCssTokenizer *tokenizer = get_tokenizer (self);
-  gboolean ret = FALSE;
-  int inner_blocks = 0, i;
-
-  gtk_css_tokenizer_save (tokenizer);
-
-  do {
-      const GtkCssToken *token;
-
-      token = gtk_css_parser_get_token (self);
-
-      if (inner_blocks == 0)
-        {
-          if (gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
-            break;
-
-          if (gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_PARENS) ||
-              gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_SQUARE))
-            {
-              goto error;
-            }
-        }
-
-      if (gtk_css_token_is_preserved (token, NULL))
-        {
-          if (inner_blocks > 0 && gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
-            {
-              gtk_css_parser_end_block (self);
-              inner_blocks--;
-            }
-          else
-            {
-              gtk_css_parser_consume_token (self);
-            }
-        }
-      else
-        {
-          gboolean is_var = gtk_css_token_is_function (token, "var");
-
-          inner_blocks++;
-          gtk_css_parser_start_block (self);
-
-          if (!ret && is_var)
-            {
-              token = gtk_css_parser_get_token (self);
-
-              if (gtk_css_token_is (token, GTK_CSS_TOKEN_IDENT))
-                {
-                  const char *var_name = gtk_css_token_get_string (token);
-
-                  if (var_name[0] != '-' || var_name[1] != '-')
-                    goto error;
-
-                  gtk_css_parser_consume_token (self);
-
-                  if (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_EOF) &&
-                      !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_COMMA))
-                    {
-                      goto error;
-                    }
-
-                  ret = TRUE;
-                }
-            }
-        }
-    }
-  while (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_SEMICOLON) &&
-         !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_CLOSE_CURLY));
-
-  if (inner_blocks > 0)
-    goto error;
-
-  g_assert (tokenizer == get_tokenizer (self));
-
-  gtk_css_tokenizer_restore (tokenizer);
-  self->location = *gtk_css_tokenizer_get_location (tokenizer);
-  gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);
-
-  return ret;
-
-error:
-  for (i = 0; i < inner_blocks; i++)
-    gtk_css_parser_end_block (self);
-
-  g_assert (tokenizer == get_tokenizer (self));
-
-  gtk_css_tokenizer_restore (tokenizer);
-  self->location = *gtk_css_tokenizer_get_location (tokenizer);
-  gtk_css_tokenizer_read_token (tokenizer, &self->token, NULL);
-
-  return FALSE;
-}
-
-static void
-clear_ref (GtkCssVariableValueReference *ref)
-{
-  g_free (ref->name);
-  if (ref->fallback)
-    gtk_css_variable_value_unref (ref->fallback);
-}
-
-#define GDK_ARRAY_NAME gtk_css_parser_references
-#define GDK_ARRAY_TYPE_NAME GtkCssParserReferences
-#define GDK_ARRAY_ELEMENT_TYPE GtkCssVariableValueReference
-
-GtkCssVariableValue *
-gtk_css_parser_parse_value_into_token_stream (GtkCssParser *self)
-{
-  GBytes *bytes = gtk_css_tokenizer_get_bytes (get_tokenizer (self));
-  const GtkCssToken *token;
-  gsize offset;
-  gsize length = 0;
-  GtkCssParserReferences refs;
-  int inner_blocks = 0, i;
-  gboolean is_initial = FALSE;
-
-  for (token = gtk_css_parser_peek_token (self);
-       gtk_css_token_is (token, GTK_CSS_TOKEN_WHITESPACE);
-       token = gtk_css_parser_peek_token (self))
-    {
-      gtk_css_parser_consume_token (self);
-    }
-
-  gtk_css_parser_references_init (&refs);
-
-  offset = self->location.bytes;
-
-  do {
-      token = gtk_css_parser_get_token (self);
-
-      if (length == 0 && gtk_css_token_is_ident (token, "initial"))
-        is_initial = TRUE;
-
-      if (gtk_css_token_is (token, GTK_CSS_TOKEN_BAD_STRING) ||
-          gtk_css_token_is (token, GTK_CSS_TOKEN_BAD_URL))
-        {
-          gtk_css_parser_error_syntax (self, "Invalid property value");
-          goto error;
-        }
-
-      if (inner_blocks == 0)
-        {
-          if (gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
-            break;
-
-          if (gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_PARENS) ||
-              gtk_css_token_is (token, GTK_CSS_TOKEN_CLOSE_SQUARE))
-            {
-              gtk_css_parser_error_syntax (self, "Invalid property value");
-              goto error;
-            }
-        }
-
-      if (gtk_css_token_is_preserved (token, NULL))
-        {
-          if (inner_blocks > 0 && gtk_css_token_is (token, GTK_CSS_TOKEN_EOF))
-            {
-              length++;
-              gtk_css_parser_end_block (self);
-
-              inner_blocks--;
-            }
-          else
-            {
-              length++;
-              gtk_css_parser_consume_token (self);
-            }
-        }
-      else
-        {
-          gboolean is_var = gtk_css_token_is_function (token, "var");
-
-          length++;
-          inner_blocks++;
-
-          gtk_css_parser_start_block (self);
-
-          if (is_var)
-            {
-              token = gtk_css_parser_get_token (self);
-
-              if (gtk_css_token_is (token, GTK_CSS_TOKEN_IDENT))
-                {
-                  GtkCssVariableValueReference ref;
-                  char *var_name = g_strdup (gtk_css_token_get_string (token));
-
-                  if (var_name[0] != '-' || var_name[1] != '-')
-                    {
-                      gtk_css_parser_error_value (self, "Invalid variable name: %s", var_name);
-                      g_free (var_name);
-                      goto error;
-                    }
-
-                  length++;
-                  gtk_css_parser_consume_token (self);
-
-                  if (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_EOF) &&
-                      !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_COMMA))
-                    {
-                      gtk_css_parser_error_syntax (self, "Invalid property value");
-                      g_free (var_name);
-                      goto error;
-                    }
-
-                  ref.name = var_name;
-
-                  if (gtk_css_parser_has_token (self, GTK_CSS_TOKEN_EOF))
-                    {
-                      ref.length = 3;
-                      ref.fallback = NULL;
-                    }
-                  else
-                    {
-                      length++;
-                      gtk_css_parser_consume_token (self);
-
-                      ref.fallback = gtk_css_parser_parse_value_into_token_stream (self);
-
-                      if (ref.fallback == NULL)
-                        {
-                          gtk_css_parser_error_value (self, "Invalid fallback for: %s", var_name);
-                          g_free (var_name);
-                          goto error;
-                        }
-
-                      ref.length = 4 + ref.fallback->length;
-                      length += ref.fallback->length;
-                    }
-
-                  gtk_css_parser_references_append (&refs, &ref);
-                }
-            }
-        }
-    }
-  while (!gtk_css_parser_has_token (self, GTK_CSS_TOKEN_SEMICOLON) &&
-         !gtk_css_parser_has_token (self, GTK_CSS_TOKEN_CLOSE_CURLY));
-
-  if (inner_blocks > 0)
-    {
-      gtk_css_parser_error_syntax (self, "Invalid property value");
-      goto error;
-    }
-
-  if (is_initial && length == 1)
-    {
-      gtk_css_parser_references_clear (&refs);
-
-      return gtk_css_variable_value_new_initial (bytes,
-                                                 offset,
-                                                 self->location.bytes);
-    }
-  else
-    {
-      GtkCssVariableValueReference *out_refs;
-      gsize n_refs;
-
-      n_refs = gtk_css_parser_references_get_size (&refs);
-      out_refs = gtk_css_parser_references_steal (&refs);
-
-      return gtk_css_variable_value_new (bytes,
-                                         offset,
-                                         self->location.bytes,
-                                         length,
-                                         out_refs,
-                                         n_refs);
-    }
-
-error:
-  for (i = 0; i < inner_blocks; i++)
-    gtk_css_parser_end_block (self);
-
-  gtk_css_parser_references_clear (&refs);
-
-  return NULL;
-}
-
-void
-gtk_css_parser_get_expanding_variables (GtkCssParser          *self,
-                                        GtkCssVariableValue ***variables,
-                                        char                ***variable_names,
-                                        gsize                 *n_variables)
-{
-  gsize len = gtk_css_tokenizers_get_size (&self->tokenizers);
-  GtkCssVariableValue **vars = NULL;
-  char **names = NULL;
-  gsize n;
-
-  if (variables)
-    vars = g_new0 (GtkCssVariableValue *, len + 1);
-  if (variable_names)
-    names = g_new0 (char *, len + 1);
-
-  n = 0;
-  for (gsize i = 0; i < gtk_css_tokenizers_get_size (&self->tokenizers); i++)
-    {
-      GtkCssTokenizerData *data = gtk_css_tokenizers_index (&self->tokenizers, i);
-      if (variables && data->variable)
-        vars[n] = gtk_css_variable_value_ref (data->variable);
-      if (variable_names)
-        names[n] = g_strdup (data->var_name);
-      n++;
-    }
-
-  if (variables)
-    *variables = vars;
-
-  if (variable_names)
-    *variable_names = names;
-
-  if (n_variables)
-    *n_variables = n;
-}
@@ -22,7 +22,6 @@

 #include "gtkcssenums.h"
 #include "gtkcsstokenizerprivate.h"
-#include "gtkcssvariablevalueprivate.h"

 #include <gio/gio.h>

@@ -59,18 +58,10 @@ GtkCssParser *          gtk_css_parser_new_for_bytes            (GBytes
                                                                 GtkCssParserErrorFunc           error_func,
                                                                 gpointer                        user_data,
                                                                 GDestroyNotify                  user_destroy);
-GtkCssParser *          gtk_css_parser_new_for_token_stream     (GtkCssVariableValue            *value,
-                                                                 GFile                          *file,
-                                                                 GtkCssVariableValue           **refs,
-                                                                 gsize                           n_refs,
-                                                                 GtkCssParserErrorFunc           error_func,
-                                                                 gpointer                        user_data,
-                                                                 GDestroyNotify                  user_destroy);
 GtkCssParser *          gtk_css_parser_ref                      (GtkCssParser                   *self);
 void                    gtk_css_parser_unref                    (GtkCssParser                   *self);

 GFile *                 gtk_css_parser_get_file                 (GtkCssParser                   *self) G_GNUC_PURE;
-GBytes *                gtk_css_parser_get_bytes                (GtkCssParser                   *self) G_GNUC_PURE;
 GFile *                 gtk_css_parser_resolve_url              (GtkCssParser                   *self,
                                                                 const char                     *url);

@@ -90,7 +81,6 @@ void                    gtk_css_parser_end_block                (GtkCssParser
 void                    gtk_css_parser_skip                     (GtkCssParser                   *self);
 void                    gtk_css_parser_skip_until               (GtkCssParser                   *self,
                                                                 GtkCssTokenType                 token_type);
-void                    gtk_css_parser_skip_whitespace          (GtkCssParser                   *self);

 void                    gtk_css_parser_emit_error               (GtkCssParser                   *self,
                                                                 const GtkCssLocation           *start,
@@ -160,14 +150,5 @@ gsize                   gtk_css_parser_consume_any              (GtkCssParser
                                                                 gsize                           n_options,
                                                                 gpointer                        user_data);

-gboolean                gtk_css_parser_has_references           (GtkCssParser                   *parser);
-
-GtkCssVariableValue *   gtk_css_parser_parse_value_into_token_stream (GtkCssParser              *parser);
-
-void                    gtk_css_parser_get_expanding_variables (GtkCssParser              *parser,
-                                                                GtkCssVariableValue     ***variables,
-                                                                char                    ***names,
-                                                                gsize                     *n_variables);
-
 G_END_DECLS

@@ -26,7 +26,6 @@ struct _GtkCssSection
  int                 ref_count;
  GtkCssSection      *parent;
  GFile              *file;
-  GBytes             *bytes;
  GtkCssLocation      start_location;
  GtkCssLocation      end_location;   /* end location if parser is %NULL */
 };
@@ -49,15 +48,6 @@ GtkCssSection *
 gtk_css_section_new (GFile                *file,
                     const GtkCssLocation *start,
                     const GtkCssLocation *end)
-{
-  return gtk_css_section_new_with_bytes (file, NULL,start, end);
-}
-
-GtkCssSection *
-gtk_css_section_new_with_bytes (GFile  *file,
-                                GBytes *bytes,
-                                const GtkCssLocation *start,
-                                const GtkCssLocation *end)
 {
  GtkCssSection *result;

@@ -70,8 +60,6 @@ gtk_css_section_new_with_bytes (GFile  *file,
  result->ref_count = 1;
  if (file)
    result->file = g_object_ref (file);
-  if (bytes)
-    result->bytes = g_bytes_ref (bytes);
  result->start_location = *start;
  result->end_location = *end;

@@ -116,8 +104,6 @@ gtk_css_section_unref (GtkCssSection *section)
    gtk_css_section_unref (section->parent);
  if (section->file)
    g_object_unref (section->file);
-  if (section->bytes)
-    g_bytes_unref (section->bytes);

  g_free (section);
 }
@@ -165,14 +151,6 @@ gtk_css_section_get_file (const GtkCssSection *section)
  return section->file;
 }

-GBytes *
-gtk_css_section_get_bytes (const GtkCssSection *section)
-{
-  g_return_val_if_fail (section != NULL, NULL);
-
-  return section->bytes;
-}
-
 /**
 * gtk_css_section_get_start_location:
 * @section: the section
@@ -46,11 +46,6 @@ GDK_AVAILABLE_IN_ALL
 GtkCssSection *    gtk_css_section_new                 (GFile                *file,
                                                        const GtkCssLocation *start,
                                                        const GtkCssLocation *end);
-GDK_AVAILABLE_IN_4_16
-GtkCssSection *    gtk_css_section_new_with_bytes      (GFile                *file,
-                                                        GBytes               *bytes,
-                                                        const GtkCssLocation *start,
-                                                        const GtkCssLocation *end);
 GDK_AVAILABLE_IN_ALL
 GtkCssSection *    gtk_css_section_ref                 (GtkCssSection        *section);
 GDK_AVAILABLE_IN_ALL
@@ -66,8 +61,6 @@ GDK_AVAILABLE_IN_ALL
 GtkCssSection *    gtk_css_section_get_parent          (const GtkCssSection  *section);
 GDK_AVAILABLE_IN_ALL
 GFile *            gtk_css_section_get_file            (const GtkCssSection  *section);
-GDK_AVAILABLE_IN_4_16
-GBytes *           gtk_css_section_get_bytes           (const GtkCssSection  *section);
 GDK_AVAILABLE_IN_ALL
 const GtkCssLocation *
                   gtk_css_section_get_start_location  (const GtkCssSection  *section);
@@ -36,9 +36,6 @@ struct _GtkCssTokenizer
  const char            *end;

  GtkCssLocation         position;
-
-  GtkCssLocation         saved_position;
-  const char            *saved_data;
 };

 void
@@ -571,14 +568,6 @@ gtk_css_token_init_dimension (GtkCssToken     *token,

 GtkCssTokenizer *
 gtk_css_tokenizer_new (GBytes *bytes)
-{
-  return gtk_css_tokenizer_new_for_range (bytes, 0, g_bytes_get_size (bytes));
-}
-
-GtkCssTokenizer *
-gtk_css_tokenizer_new_for_range (GBytes *bytes,
-                                 gsize   offset,
-                                 gsize   length)
 {
  GtkCssTokenizer *tokenizer;

@@ -587,8 +576,8 @@ gtk_css_tokenizer_new_for_range (GBytes *bytes,
  tokenizer->bytes = g_bytes_ref (bytes);
  tokenizer->name_buffer = g_string_new (NULL);

-  tokenizer->data = g_bytes_get_region (bytes, 1, offset, length);
-  tokenizer->end = tokenizer->data + length;
+  tokenizer->data = g_bytes_get_data (bytes, NULL);
+  tokenizer->end = tokenizer->data + g_bytes_get_size (bytes);

  gtk_css_location_init (&tokenizer->position);

@@ -615,12 +604,6 @@ gtk_css_tokenizer_unref (GtkCssTokenizer *tokenizer)
  g_free (tokenizer);
 }

-GBytes *
-gtk_css_tokenizer_get_bytes (GtkCssTokenizer *tokenizer)
-{
-  return tokenizer->bytes;
-}
-
 const GtkCssLocation *
 gtk_css_tokenizer_get_location (GtkCssTokenizer *tokenizer)
 {
@@ -1037,7 +1020,7 @@ gtk_css_tokenizer_read_ident_like (GtkCssTokenizer  *tokenizer,
 {
  gtk_css_tokenizer_read_name (tokenizer);

-  if (gtk_css_tokenizer_remaining (tokenizer) > 0 && *tokenizer->data == '(')
+  if (*tokenizer->data == '(')
    {
      gtk_css_tokenizer_consume_ascii (tokenizer);
      if (g_ascii_strcasecmp (tokenizer->name_buffer->str, "url") == 0)
@@ -1501,23 +1484,3 @@ gtk_css_tokenizer_read_token (GtkCssTokenizer  *tokenizer,
    }
 }

-void
-gtk_css_tokenizer_save (GtkCssTokenizer *tokenizer)
-{
-  g_assert (!tokenizer->saved_data);
-
-  tokenizer->saved_position = tokenizer->position;
-  tokenizer->saved_data = tokenizer->data;
-}
-
-void
-gtk_css_tokenizer_restore (GtkCssTokenizer *tokenizer)
-{
-  g_assert (tokenizer->saved_data);
-
-  tokenizer->position = tokenizer->saved_position;
-  tokenizer->data = tokenizer->saved_data;
-
-  gtk_css_location_init (&tokenizer->saved_position);
-  tokenizer->saved_data = NULL;
-}
@@ -138,22 +138,15 @@ void                    gtk_css_token_print                     (const GtkCssTok
 char *                  gtk_css_token_to_string                 (const GtkCssToken      *token);

 GtkCssTokenizer *       gtk_css_tokenizer_new                   (GBytes                 *bytes);
-GtkCssTokenizer *       gtk_css_tokenizer_new_for_range         (GBytes                 *bytes,
-                                                                 gsize                   offset,
-                                                                 gsize                   length);

 GtkCssTokenizer *       gtk_css_tokenizer_ref                   (GtkCssTokenizer        *tokenizer);
 void                    gtk_css_tokenizer_unref                 (GtkCssTokenizer        *tokenizer);

-GBytes *                gtk_css_tokenizer_get_bytes             (GtkCssTokenizer        *tokenizer);
 const GtkCssLocation *  gtk_css_tokenizer_get_location          (GtkCssTokenizer        *tokenizer) G_GNUC_CONST;

 gboolean                gtk_css_tokenizer_read_token            (GtkCssTokenizer        *tokenizer,
                                                                 GtkCssToken            *token,
                                                                 GError                **error);

-void                     gtk_css_tokenizer_save                 (GtkCssTokenizer        *tokenizer);
-void                     gtk_css_tokenizer_restore              (GtkCssTokenizer        *tokenizer);
-
 G_END_DECLS

@@ -1,158 +0,0 @@
-/*
- * Copyright (C) 2023 GNOME Foundation Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Alice Mikhaylenko <alicem@gnome.org>
- */
-
-#include "gtkcssvariablevalueprivate.h"
-
-GtkCssVariableValue *
-gtk_css_variable_value_new (GBytes                       *bytes,
-                            gsize                         offset,
-                            gsize                         end_offset,
-                            gsize                         length,
-                            GtkCssVariableValueReference *references,
-                            gsize                         n_references)
-{
-  GtkCssVariableValue *self = g_new0 (GtkCssVariableValue, 1);
-
-  self->ref_count = 1;
-
-  self->bytes = g_bytes_ref (bytes);
-  self->offset = offset;
-  self->end_offset = end_offset;
-  self->length = length;
-
-  self->references = references;
-  self->n_references = n_references;
-
-  return self;
-}
-
-GtkCssVariableValue *
-gtk_css_variable_value_new_initial (GBytes *bytes,
-                                    gsize   offset,
-                                    gsize   end_offset)
-{
-  GtkCssVariableValue *self = gtk_css_variable_value_new (bytes, offset, end_offset, 1, NULL, 0);
-
-  self->is_invalid = TRUE;
-
-  return self;
-}
-
-GtkCssVariableValue *
-gtk_css_variable_value_ref (GtkCssVariableValue *self)
-{
-  self->ref_count++;
-
-  return self;
-}
-
-void
-gtk_css_variable_value_unref (GtkCssVariableValue *self)
-{
-  gsize i;
-
-  self->ref_count--;
-  if (self->ref_count > 0)
-    return;
-
-  g_bytes_unref (self->bytes);
-
-  for (i = 0; i < self->n_references; i++)
-    {
-      GtkCssVariableValueReference *ref = &self->references[i];
-
-      g_free (ref->name);
-      if (ref->fallback)
-        gtk_css_variable_value_unref (ref->fallback);
-    }
-
-  if (self->section)
-    gtk_css_section_unref (self->section);
-
-  g_free (self->references);
-  g_free (self);
-}
-
-void
-gtk_css_variable_value_print (GtkCssVariableValue *self,
-                              GString             *string)
-{
-  gsize len = self->end_offset - self->offset;
-  gconstpointer data = g_bytes_get_region (self->bytes, 1, self->offset, len);
-
-  g_assert (data != NULL);
-
-  g_string_append_len (string, (const char *) data, len);
-}
-
-char *
-gtk_css_variable_value_to_string (GtkCssVariableValue *self)
-{
-  GString *string = g_string_new (NULL);
-  gtk_css_variable_value_print (self, string);
-  return g_string_free (string, FALSE);
-}
-
-gboolean
-gtk_css_variable_value_equal (const GtkCssVariableValue *value1,
-                              const GtkCssVariableValue *value2)
-{
-  if (value1 == value2)
-    return TRUE;
-
-  if (value1 == NULL || value2 == NULL)
-    return FALSE;
-
-  if (value1->bytes != value2->bytes)
-    return FALSE;
-
-  if (value1->offset != value2->offset)
-    return FALSE;
-
-  if (value1->end_offset != value2->end_offset)
-    return FALSE;
-
-  return TRUE;
-}
-
-GtkCssVariableValue *
-gtk_css_variable_value_transition  (GtkCssVariableValue *start,
-                                    GtkCssVariableValue *end,
-                                    double               progress)
-{
-  GtkCssVariableValue *ret = progress < 0.5 ? start : end;
-
-  if (ret == NULL)
-    return NULL;
-
-  return gtk_css_variable_value_ref (ret);
-}
-
-void
-gtk_css_variable_value_set_section (GtkCssVariableValue *self,
-                                    GtkCssSection       *section)
-{
-  self->section = gtk_css_section_ref (section);
-}
-
-void
-gtk_css_variable_value_taint (GtkCssVariableValue *self)
-{
-  self->is_animation_tainted = TRUE;
-}
@@ -1,77 +0,0 @@
-/*
- * Copyright (C) 2023 GNOME Foundation Inc.
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- *
- * Authors: Alice Mikhaylenko <alicem@gnome.org>
- */
-
-#pragma once
-
-#include "gtkcss.h"
-#include "gtkcsstokenizerprivate.h"
-
-G_BEGIN_DECLS
-
-typedef struct _GtkCssVariableValueReference GtkCssVariableValueReference;
-typedef struct _GtkCssVariableValue GtkCssVariableValue;
-
-struct _GtkCssVariableValueReference
-{
-  char *name;
-  gsize length;
-  GtkCssVariableValue *fallback;
-};
-
-struct _GtkCssVariableValue
-{
-  int ref_count;
-
-  GBytes *bytes;
-  gsize offset;
-  gsize end_offset;
-  gsize length;
-
-  GtkCssVariableValueReference *references;
-  gsize n_references;
-
-  GtkCssSection *section;
-  gboolean is_invalid;
-  gboolean is_animation_tainted;
-};
-
-GtkCssVariableValue *gtk_css_variable_value_new         (GBytes                       *bytes,
-                                                         gsize                         offset,
-                                                         gsize                         end_offset,
-                                                         gsize                         length,
-                                                         GtkCssVariableValueReference *references,
-                                                         gsize                         n_references);
-GtkCssVariableValue *gtk_css_variable_value_new_initial (GBytes                       *bytes,
-                                                         gsize                         offset,
-                                                         gsize                         end_offset);
-GtkCssVariableValue *gtk_css_variable_value_ref         (GtkCssVariableValue          *self);
-void                 gtk_css_variable_value_unref       (GtkCssVariableValue          *self);
-void                 gtk_css_variable_value_print       (GtkCssVariableValue          *self,
-                                                         GString                      *string);
-char *               gtk_css_variable_value_to_string   (GtkCssVariableValue          *self);
-gboolean             gtk_css_variable_value_equal       (const GtkCssVariableValue    *value1,
-                                                         const GtkCssVariableValue    *value2) G_GNUC_PURE;
-GtkCssVariableValue *gtk_css_variable_value_transition  (GtkCssVariableValue          *start,
-                                                         GtkCssVariableValue          *end,
-                                                         double                        progress);
-void                 gtk_css_variable_value_set_section (GtkCssVariableValue          *self,
-                                                         GtkCssSection                *section);
-void                 gtk_css_variable_value_taint       (GtkCssVariableValue          *self);
-
-G_END_DECLS
@@ -6,9 +6,8 @@ gtk_css_public_sources = files([
 gtk_css_private_sources = files([
  'gtkcssdataurl.c',
  'gtkcssparser.c',
-  'gtkcssserializer.c',
  'gtkcsstokenizer.c',
-  'gtkcssvariablevalue.c',
+  'gtkcssserializer.c',
 ])

 gtk_css_public_headers = files([
@@ -21,16 +21,9 @@
 #include "gtkscalerprivate.h"

 #include "gdk/gdktextureprivate.h"
-#include "gdk/loaders/gdkpngprivate.h"

 /* {{{ Pixbuf helpers */

-static inline gboolean
-pixbuf_is_only_fg (GdkPixbuf *pixbuf)
-{
-  return gdk_pixbuf_get_option (pixbuf, "tEXt::only-foreground") != NULL;
-}
-
 static GdkPixbuf *
 load_from_stream (GdkPixbufLoader  *loader,
                  GInputStream     *stream,
@@ -206,7 +199,6 @@ _gdk_pixbuf_new_from_resource_at_scale (const char   *resource_path,

 static GdkPixbuf *
 load_symbolic_svg (const char     *escaped_file_data,
-                   gsize           len,
                   int             width,
                   int             height,
                   const char     *icon_width_str,
@@ -222,38 +214,37 @@ load_symbolic_svg (const char     *escaped_file_data,
  char *data;

  data = g_strconcat ("<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"no\"?>\n"
-                      "<svg version=\"1.1\" "
-                           "xmlns=\"http://www.w3.org/2000/svg\" "
-                           "xmlns:xi=\"http://www.w3.org/2001/XInclude\" "
-                           "width=\"", icon_width_str, "\" "
-                           "height=\"", icon_height_str, "\">"
-                        "<style type=\"text/css\">"
-                          "rect,circle,path {"
-                            "fill: ", fg_string," !important;"
-                          "}\n"
-                          ".warning {"
-                             "fill: ", warning_color_string, " !important;"
-                          "}\n"
-                          ".error {"
-                            "fill: ", error_color_string ," !important;"
-                          "}\n"
-                          ".success {"
-                            "fill: ", success_color_string, " !important;"
-                          "}"
-                        "</style>"
-                        "<xi:include href=\"data:text/xml;base64,",
+                      "<svg version=\"1.1\"\n"
+                      "     xmlns=\"http://www.w3.org/2000/svg\"\n"
+                      "     xmlns:xi=\"http://www.w3.org/2001/XInclude\"\n"
+                      "     width=\"", icon_width_str, "\"\n"
+                      "     height=\"", icon_height_str, "\">\n"
+                      "  <style type=\"text/css\">\n"
+                      "    rect,circle,path {\n"
+                      "      fill: ", fg_string," !important;\n"
+                      "    }\n"
+                      "    .warning {\n"
+                      "      fill: ", warning_color_string, " !important;\n"
+                      "    }\n"
+                      "    .error {\n"
+                      "      fill: ", error_color_string ," !important;\n"
+                      "    }\n"
+                      "    .success {\n"
+                      "      fill: ", success_color_string, " !important;\n"
+                      "    }\n"
+                      "  </style>\n"
+                      "  <xi:include href=\"data:text/xml;base64,", escaped_file_data, "\"/>\n"
+                      "</svg>",
                      NULL);

  stream = g_memory_input_stream_new_from_data (data, -1, g_free);
-  g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream), escaped_file_data, len, NULL);
-  g_memory_input_stream_add_data (G_MEMORY_INPUT_STREAM (stream), "\"/></svg>", strlen ("\"/></svg>"), NULL);
  pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream, width, height, TRUE, NULL, error);
  g_object_unref (stream);

  return pixbuf;
 }

-static gboolean
+static void
 extract_plane (GdkPixbuf *src,
               GdkPixbuf *dst,
               int        from_plane,
@@ -264,7 +255,6 @@ extract_plane (GdkPixbuf *src,
  gsize src_stride, dst_stride;
  guchar *src_row, *dst_row;
  int x, y;
-  gboolean all_clear = TRUE;

  width = gdk_pixbuf_get_width (src);
  height = gdk_pixbuf_get_height (src);
@@ -284,109 +274,11 @@ extract_plane (GdkPixbuf *src,
      dst_row = dst_data + dst_stride * y;
      for (x = 0; x < width; x++)
        {
-          if (src_row[from_plane] != 0)
-            all_clear = FALSE;
-
          dst_row[to_plane] = src_row[from_plane];
          src_row += 4;
          dst_row += 4;
        }
    }
-
-  return all_clear;
-}
-
-static void
-keep_alpha (GdkPixbuf *src)
-{
-  guchar *data;
-  int width, height;
-  gsize stride;
-
-  data = gdk_pixbuf_get_pixels (src);
-  width = gdk_pixbuf_get_width (src);
-  height = gdk_pixbuf_get_height (src);
-  stride = gdk_pixbuf_get_rowstride (src);
-
-  for (int y = 0; y < height; y++)
-    {
-      guchar *row = data + stride * y;
-      for (int x = 0; x < width; x++)
-        {
-          row[0] = row[1] = row[2] = 0;
-          row += 4;
-        }
-    }
-}
-
-static void
-svg_find_size_strings (const char  *data,
-                       gsize        len,
-                       char       **width,
-                       char       **height)
-{
-  gsize i, j, k, l;
-
-  *width = NULL;
-  *height = NULL;
-
-  for (i = 0; i < len - 4; i++)
-    {
-      if (strncmp (data + i, "<svg", 4) == 0)
-        {
-          for (j = i + strlen ("<svg"); j < len - 9; j++)
-            {
-              if (strncmp (data + j, "height=\"", strlen ("height=\"")) == 0)
-                {
-                  k = l = j + strlen ("height=\"");
-                  while (l < len && data[l] != '\"')
-                    l++;
-
-                  *height = g_strndup (data + k, l - k);
-
-                  if (*width && *height)
-                    return;
-
-                  j = l;
-                }
-              else if (strncmp (data + j, "width=\"", strlen ("width=\"")) == 0)
-                {
-                  k = l = j + strlen ("width=\"");
-                  while (l < len && data[l] != '\"')
-                    l++;
-
-                  *width = g_strndup (data + k, l - k);
-
-                  if (*width && *height)
-                    return;
-
-                  j = l;
-                }
-              else if (data[j] == '>')
-                {
-                  break;
-                }
-            }
-
-          break;
-        }
-    }
-
-  *width = g_strdup ("16px");
-  *height = g_strdup ("16px");
-}
-
-static gboolean
-svg_has_symbolic_classes (const char *data,
-                          gsize       len)
-{
-#ifdef HAVE_MEMMEM
-  return memmem (data, len, "class=\"error\"", strlen ("class=\"error\"")) != NULL ||
-         memmem (data, len, "class=\"warning\"", strlen ("class=\"warning\"")) != NULL ||
-         memmem (data, len, "class=\"success\"", strlen ("class=\"success\"")) != NULL;
-#else
-  return TRUE;
-#endif
 }

 GdkPixbuf *
@@ -401,46 +293,38 @@ gtk_make_symbolic_pixbuf_from_data (const char  *file_data,
 {
  const char *r_string = "rgb(255,0,0)";
  const char *g_string = "rgb(0,255,0)";
-  char *icon_width_str = NULL;
-  char *icon_height_str = NULL;
-  char *escaped_file_data = NULL;
-  gsize len;
+  char *icon_width_str;
+  char *icon_height_str;
+  GdkPixbuf *loaded;
  GdkPixbuf *pixbuf = NULL;
-  gboolean has_symbolic_classes;
-  gboolean only_fg = TRUE;
-
-  has_symbolic_classes = svg_has_symbolic_classes (file_data, file_len);
+  int plane;
+  int icon_width, icon_height;
+  char *escaped_file_data;

  /* Fetch size from the original icon */
-  if (has_symbolic_classes || width == 0 || height == 0)
-    svg_find_size_strings (file_data, file_len, &icon_width_str, &icon_height_str);
+  GInputStream *stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
+  GdkPixbuf *reference = gdk_pixbuf_new_from_stream (stream, NULL, error);

-  if (width == 0)
-    width = (int) (g_ascii_strtoull (icon_width_str, NULL, 0) * scale);
-  if (height == 0)
-    height = (int) (g_ascii_strtoull (icon_height_str, NULL, 0) * scale);
+  g_object_unref (stream);

-  if (!has_symbolic_classes)
-    {
-      GInputStream *stream;
+  if (!reference)
+    return NULL;

-      stream = g_memory_input_stream_new_from_data (file_data, file_len, NULL);
-      pixbuf = gdk_pixbuf_new_from_stream_at_scale (stream, width, height, TRUE, NULL, error);
-      g_object_unref (stream);
-
-      if (pixbuf)
-        keep_alpha (pixbuf);
-
-      goto out;
-    }
+  icon_width = gdk_pixbuf_get_width (reference);
+  icon_height = gdk_pixbuf_get_height (reference);
+  g_object_unref (reference);

  escaped_file_data = g_base64_encode ((guchar *) file_data, file_len);
-  len = strlen (escaped_file_data);
+  icon_width_str = g_strdup_printf ("%d", icon_width);
+  icon_height_str = g_strdup_printf ("%d", icon_height);

-  for (int plane = 0; plane < 3; plane++)
+  if (width == 0)
+    width = icon_width * scale;
+  if (height == 0)
+    height = icon_height * scale;
+
+  for (plane = 0; plane < 3; plane++)
    {
-      GdkPixbuf *loaded;
-
      /* Here we render the svg with all colors solid, this should
       * always make the alpha channel the same and it should match
       * the final alpha channel for all possible renderings. We
@@ -453,7 +337,7 @@ gtk_make_symbolic_pixbuf_from_data (const char  *file_data,
       * channels, with the color of the fg being implicitly
       * the "rest", as all color fractions should add up to 1.
       */
-      loaded = load_symbolic_svg (escaped_file_data, len, width, height,
+      loaded = load_symbolic_svg (escaped_file_data, width, height,
                                  icon_width_str,
                                  icon_height_str,
                                  g_string,
@@ -474,26 +358,25 @@ gtk_make_symbolic_pixbuf_from_data (const char  *file_data,
          g_free (filename);
        }

-      if (plane == 0)
+      if (pixbuf == NULL)
        {
          pixbuf = gdk_pixbuf_new (GDK_COLORSPACE_RGB, TRUE, 8,
                                   gdk_pixbuf_get_width (loaded),
                                   gdk_pixbuf_get_height (loaded));
-          memset (gdk_pixbuf_get_pixels (pixbuf), 0, gdk_pixbuf_get_byte_length (pixbuf));
-
-          extract_plane (loaded, pixbuf, 3, 3);
+          gdk_pixbuf_fill (pixbuf, 0);
        }

-      only_fg &= extract_plane (loaded, pixbuf, 0, plane);
+      if (plane == 0)
+        extract_plane (loaded, pixbuf, 3, 3);
+
+      extract_plane (loaded, pixbuf, 0, plane);

      g_object_unref (loaded);
    }

-out:
-  if (only_fg && pixbuf)
-    gdk_pixbuf_set_option (pixbuf, "tEXt::only-foreground", "true");
-
  g_free (escaped_file_data);
+
+out:
  g_free (icon_width_str);
  g_free (icon_height_str);

@@ -526,17 +409,17 @@ make_symbolic_pixbuf_from_resource (const char  *path,
 }

 static GdkPixbuf *
-make_symbolic_pixbuf_from_filename (const char  *filename,
-                                    int          width,
-                                    int          height,
-                                    double       scale,
-                                    GError     **error)
+make_symbolic_pixbuf_from_path (const char  *path,
+                                int          width,
+                                int          height,
+                                double       scale,
+                                GError     **error)
 {
  char *data;
  gsize size;
  GdkPixbuf *pixbuf;

-  if (!g_file_get_contents (filename, &data, &size, error))
+  if (!g_file_get_contents (path, &data, &size, error))
    return NULL;

  pixbuf = gtk_make_symbolic_pixbuf_from_data (data, size, width, height, scale, NULL, error);
@@ -570,85 +453,11 @@ make_symbolic_pixbuf_from_file (GFile       *file,
 /* }}} */
 /* {{{ Texture API */

-static GdkTexture *
-texture_new_from_bytes (GBytes    *bytes,
-                        gboolean  *only_fg,
-                        GError   **error)
-{
-  GHashTable *options;
-  GdkTexture *texture;
-
-  if (!gdk_is_png (bytes))
-    return gdk_texture_new_from_bytes (bytes, error);
-
-  options = g_hash_table_new_full (g_str_hash, g_str_equal, g_free, g_free);
-  texture = gdk_load_png (bytes, options, error);
-  *only_fg = g_hash_table_contains (options, "foreground-only");
-  g_hash_table_unref (options);
-
-  return texture;
-}
-
-GdkTexture *
-gdk_texture_new_from_filename_with_fg (const char    *filename,
-                                       gboolean      *only_fg,
-                                       GError       **error)
-{
-  GFile *file;
-  GBytes *bytes;
-  GdkTexture *texture = NULL;
-
-  file = g_file_new_for_path (filename);
-  bytes = g_file_load_bytes (file, NULL, NULL, error);
-  if (bytes)
-    texture = texture_new_from_bytes (bytes, only_fg, error);
-  g_bytes_unref (bytes);
-  g_object_unref (file);
-
-  return texture;
-}
-
-GdkTexture *
-gdk_texture_new_from_resource_with_fg (const char *path,
-                                       gboolean   *only_fg)
-{
-  GBytes *bytes;
-  GdkTexture *texture = NULL;
-
-  bytes = g_resources_lookup_data (path, 0, NULL);
-  if (bytes)
-    texture = texture_new_from_bytes (bytes, only_fg, NULL);
-  g_bytes_unref (bytes);
-
-  return texture;
-}
-
-GdkTexture *
-gdk_texture_new_from_stream_with_fg (GInputStream  *stream,
-                                     gboolean      *only_fg,
-                                     GCancellable  *cancellable,
-                                     GError       **error)
-{
-  GdkPixbuf *pixbuf;
-  GdkTexture *texture = NULL;
-
-  pixbuf = _gdk_pixbuf_new_from_stream_scaled (stream, 0, cancellable, error);
-  if (pixbuf)
-    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
-      texture = gdk_texture_new_for_pixbuf (pixbuf);
-      g_object_unref (pixbuf);
-    }
-
-  return texture;
-}
-
 GdkTexture *
 gdk_texture_new_from_stream_at_scale (GInputStream  *stream,
                                      int            width,
                                      int            height,
                                      gboolean       aspect,
-                                      gboolean      *only_fg,
                                      GCancellable  *cancellable,
                                      GError       **error)
 {
@@ -658,7 +467,24 @@ gdk_texture_new_from_stream_at_scale (GInputStream  *stream,
  pixbuf = _gdk_pixbuf_new_from_stream_at_scale (stream, width, height, aspect, cancellable, error);
  if (pixbuf)
    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
+      texture = gdk_texture_new_for_pixbuf (pixbuf);
+      g_object_unref (pixbuf);
+    }
+
+  return texture;
+}
+
+GdkTexture *
+gdk_texture_new_from_stream (GInputStream  *stream,
+                             GCancellable  *cancellable,
+                             GError       **error)
+{
+  GdkPixbuf *pixbuf;
+  GdkTexture *texture = NULL;
+
+  pixbuf = _gdk_pixbuf_new_from_stream_scaled (stream, 0, cancellable, error);
+  if (pixbuf)
+    {
      texture = gdk_texture_new_for_pixbuf (pixbuf);
      g_object_unref (pixbuf);
    }
@@ -671,7 +497,6 @@ gdk_texture_new_from_resource_at_scale (const char    *path,
                                        int            width,
                                        int            height,
                                        gboolean       preserve_aspect,
-                                        gboolean      *only_fg,
                                        GError       **error)
 {
  GdkPixbuf *pixbuf;
@@ -680,7 +505,6 @@ gdk_texture_new_from_resource_at_scale (const char    *path,
  pixbuf = _gdk_pixbuf_new_from_resource_at_scale (path, width, height, preserve_aspect, error);
  if (pixbuf)
    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
      texture = gdk_texture_new_for_pixbuf (pixbuf);
      g_object_unref (pixbuf);
    }
@@ -692,20 +516,18 @@ gdk_texture_new_from_resource_at_scale (const char    *path,
 /* {{{ Symbolic texture API */

 GdkTexture *
-gdk_texture_new_from_filename_symbolic (const char    *filename,
-                                        int            width,
-                                        int            height,
-                                        double         scale,
-                                        gboolean      *only_fg,
-                                        GError       **error)
+gdk_texture_new_from_path_symbolic (const char    *path,
+                                    int            width,
+                                    int            height,
+                                    double         scale,
+                                    GError       **error)
 {
  GdkPixbuf *pixbuf;
  GdkTexture *texture = NULL;

-  pixbuf = make_symbolic_pixbuf_from_filename (filename, width, height, scale, error);
+  pixbuf = make_symbolic_pixbuf_from_path (path, width, height, scale, error);
  if (pixbuf)
    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
      texture = gdk_texture_new_for_pixbuf (pixbuf);
      g_object_unref (pixbuf);
    }
@@ -724,7 +546,6 @@ gdk_texture_new_from_resource_symbolic (const char  *path,
                                        int          width,
                                        int          height,
                                        double       scale,
-                                        gboolean    *only_fg,
                                        GError     **error)
 {
  GdkPixbuf *pixbuf;
@@ -733,7 +554,6 @@ gdk_texture_new_from_resource_symbolic (const char  *path,
  pixbuf = make_symbolic_pixbuf_from_resource (path, width, height, scale, error);
  if (pixbuf)
    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
      texture = gdk_texture_new_for_pixbuf (pixbuf);
      g_object_unref (pixbuf);
    }
@@ -768,19 +588,14 @@ gdk_texture_new_from_file_symbolic (GFile       *file,
                                    int          width,
                                    int          height,
                                    double       scale,
-                                    gboolean    *only_fg,
                                    GError     **error)
 {
  GdkPixbuf *pixbuf;
-  GdkTexture *texture = NULL;
+  GdkTexture *texture;

  pixbuf = make_symbolic_pixbuf_from_file (file, width, height, scale, error);
-  if (pixbuf)
-    {
-      *only_fg = pixbuf_is_only_fg (pixbuf);
-      texture = gdk_texture_new_for_pixbuf (pixbuf);
-      g_object_unref (pixbuf);
-    }
+  texture = gdk_texture_new_for_pixbuf (pixbuf);
+  g_object_unref (pixbuf);

  return texture;
 }
@@ -789,7 +604,7 @@ gdk_texture_new_from_file_symbolic (GFile       *file,
 /* {{{ Scaled paintable API */

 typedef struct {
-  double scale;
+  int scale_factor;
 } LoaderData;

 static void
@@ -805,24 +620,24 @@ on_loader_size_prepared (GdkPixbufLoader *loader,
  format = gdk_pixbuf_loader_get_format (loader);
  if (!gdk_pixbuf_format_is_scalable (format))
    {
-      loader_data->scale = 1.0;
+      loader_data->scale_factor = 1;
      return;
    }

  gdk_pixbuf_loader_set_size (loader,
-                              width * loader_data->scale,
-                              height * loader_data->scale);
+                              width * loader_data->scale_factor,
+                              height * loader_data->scale_factor);
 }

 static GdkPaintable *
 gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
-                                     double  scale)
+                                     int     scale_factor)
 {
  LoaderData loader_data;
  GdkTexture *texture;
  GdkPaintable *paintable;

-  loader_data.scale = scale;
+  loader_data.scale_factor = scale_factor;

  if (gdk_texture_can_load (bytes))
    {
@@ -852,8 +667,8 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
      texture = gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader));
      g_object_unref (loader);

-      if (loader_data.scale != 1.0)
-        paintable = gtk_scaler_new (GDK_PAINTABLE (texture), loader_data.scale);
+      if (loader_data.scale_factor != 1)
+        paintable = gtk_scaler_new (GDK_PAINTABLE (texture), loader_data.scale_factor);
      else
        paintable = g_object_ref (GDK_PAINTABLE (texture));

@@ -864,20 +679,20 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
 }

 GdkPaintable *
-gdk_paintable_new_from_filename_scaled (const char *filename,
-                                        double      scale)
+gdk_paintable_new_from_path_scaled (const char *path,
+                                    int         scale_factor)
 {
  char *contents;
  gsize length;
  GBytes *bytes;
  GdkPaintable *paintable;

-  if (!g_file_get_contents (filename, &contents, &length, NULL))
+  if (!g_file_get_contents (path, &contents, &length, NULL))
    return NULL;

  bytes = g_bytes_new_take (contents, length);

-  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale);
+  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale_factor);

  g_bytes_unref (bytes);

@@ -886,7 +701,7 @@ gdk_paintable_new_from_filename_scaled (const char *filename,

 GdkPaintable *
 gdk_paintable_new_from_resource_scaled (const char *path,
-                                        double      scale)
+                                        int         scale_factor)
 {
  GBytes *bytes;
  GdkPaintable *paintable;
@@ -895,16 +710,15 @@ gdk_paintable_new_from_resource_scaled (const char *path,
  if (!bytes)
    return NULL;

-  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale);
-
+  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale_factor);
  g_bytes_unref (bytes);

  return paintable;
 }

 GdkPaintable *
-gdk_paintable_new_from_file_scaled (GFile  *file,
-                                    double  scale)
+gdk_paintable_new_from_file_scaled (GFile *file,
+                                    int    scale_factor)
 {
  GBytes *bytes;
  GdkPaintable *paintable;
@@ -913,7 +727,7 @@ gdk_paintable_new_from_file_scaled (GFile  *file,
  if (!bytes)
    return NULL;

-  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale);
+  paintable = gdk_paintable_new_from_bytes_scaled (bytes, scale_factor);

  g_bytes_unref (bytes);

@@ -29,56 +29,45 @@ GdkPixbuf *gtk_make_symbolic_pixbuf_from_data       (const char    *data,
                                                     const char    *debug_output_to,
                                                     GError       **error);

-GdkTexture *gdk_texture_new_from_filename_with_fg   (const char    *filename,
-                                                     gboolean      *only_fg,
-                                                     GError       **error);
-GdkTexture *gdk_texture_new_from_resource_with_fg   (const char    *path,
-                                                     gboolean      *only_fg);
-GdkTexture *gdk_texture_new_from_stream_with_fg     (GInputStream  *stream,
-                                                     gboolean      *only_fg,
+GdkTexture *gdk_texture_new_from_stream             (GInputStream  *stream,
                                                     GCancellable  *cancellable,
                                                     GError       **error);
 GdkTexture *gdk_texture_new_from_stream_at_scale    (GInputStream  *stream,
                                                     int            width,
                                                     int            height,
                                                     gboolean       aspect,
-                                                     gboolean      *only_fg,
                                                     GCancellable  *cancellable,
                                                     GError       **error);
 GdkTexture *gdk_texture_new_from_resource_at_scale  (const char    *path,
                                                     int            width,
                                                     int            height,
                                                     gboolean       aspect,
-                                                     gboolean      *only_fg,
                                                     GError       **error);

-GdkTexture *gdk_texture_new_from_filename_symbolic  (const char    *path,
+GdkTexture *gdk_texture_new_from_path_symbolic      (const char    *path,
                                                     int            width,
                                                     int            height,
                                                     double         scale,
-                                                     gboolean      *only_fg,
                                                     GError       **error);
 GdkTexture *gdk_texture_new_from_file_symbolic      (GFile         *file,
                                                     int            width,
                                                     int            height,
                                                     double         scale,
-                                                     gboolean      *only_fg,
                                                     GError       **error);
 GdkTexture *gdk_texture_new_from_resource_symbolic  (const char    *path,
                                                     int            width,
                                                     int            height,
                                                     double         scale,
-                                                     gboolean      *only_fg,
                                                     GError       **error);

 GdkTexture *gtk_load_symbolic_texture_from_file     (GFile         *file);
-GdkTexture *gtk_load_symbolic_texture_from_resource (const char    *path);
+GdkTexture *gtk_load_symbolic_texture_from_resource (const char    *data);

-GdkPaintable *gdk_paintable_new_from_filename_scaled (const char    *filename,
-                                                      double         scale);
+GdkPaintable *gdk_paintable_new_from_path_scaled     (const char    *path,
+                                                      int            scale_factor);
 GdkPaintable *gdk_paintable_new_from_resource_scaled (const char    *path,
-                                                      double         scale);
+                                                      int            scale_factor);
 GdkPaintable *gdk_paintable_new_from_file_scaled     (GFile         *file,
-                                                      double         scale);
+                                                      int            scale_factor);

 G_END_DECLS
@@ -27,8 +27,6 @@
 #include "gtktextviewprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkcsscolorvalueprivate.h"
-#include "gdk/gdkrgbaprivate.h"
-#include "gtkcssshadowvalueprivate.h"

 #include <math.h>

@@ -98,11 +96,6 @@ gsk_pango_renderer_draw_glyph_item (PangoRenderer  *renderer,
 {
  GskPangoRenderer *crenderer = (GskPangoRenderer *) (renderer);
  GdkRGBA color;
-  gboolean has_shadow = FALSE;
-
-  if (crenderer->shadow_style)
-    has_shadow = gtk_css_shadow_value_push_snapshot (crenderer->shadow_style->font->text_shadow,
-                                                     crenderer->snapshot);

  get_color (crenderer, PANGO_RENDER_PART_FOREGROUND, &color);

@@ -112,9 +105,6 @@ gsk_pango_renderer_draw_glyph_item (PangoRenderer  *renderer,
                            &color,
                            (float) x / PANGO_SCALE,
                            (float) y / PANGO_SCALE);
-
-  if (has_shadow)
-    gtk_snapshot_pop (crenderer->snapshot);
 }

 static void
@@ -211,7 +201,7 @@ gsk_pango_renderer_draw_error_underline (PangoRenderer *renderer,
  gtk_snapshot_append_color (crenderer->snapshot, &rgba, &dot.bounds);
  gtk_snapshot_pop (crenderer->snapshot);
  gtk_snapshot_append_color (crenderer->snapshot,
-                             &GDK_RGBA_TRANSPARENT,
+                             &(GdkRGBA) { 0.f, 0.f, 0.f, 0.f },
                             &GRAPHENE_RECT_INIT (xx, yy, 1.5 * hh, hh));

  gtk_snapshot_pop (crenderer->snapshot);
@@ -352,20 +342,20 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
      GTK_IS_TEXT_VIEW (crenderer->widget))
    {
      GtkCssNode *node;
-      GtkCssStyle *style;
+      GtkCssValue *value;

      node = gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget);
-      style = gtk_css_node_get_style (node);
-      fg_rgba = gtk_css_color_value_get_rgba (style->core->color);
+      value = gtk_css_node_get_style (node)->core->color;
+      fg_rgba = gtk_css_color_value_get_rgba (value);
    }
  else if (crenderer->state == GSK_PANGO_RENDERER_CURSOR && gtk_widget_has_focus (crenderer->widget))
    {
      GtkCssNode *node;
-      GtkCssStyle *style;
+      GtkCssValue *value;

      node = gtk_widget_get_css_node (crenderer->widget);
-      style = gtk_css_node_get_style (node);
-      fg_rgba = gtk_css_color_value_get_rgba (style->background->background_color);
+      value = gtk_css_node_get_style (node)->background->background_color;
+      fg_rgba = gtk_css_color_value_get_rgba (value);
    }
  else
    fg_rgba = appearance->fg_rgba;
@@ -391,15 +381,6 @@ gsk_pango_renderer_prepare_run (PangoRenderer  *renderer,
    }
  else
    text_renderer_set_rgba (crenderer, PANGO_RENDER_PART_UNDERLINE, fg_rgba);
-
-  crenderer->shadow_style = NULL;
-  if (GTK_IS_TEXT_VIEW (crenderer->widget))
-    {
-      if (crenderer->state == GSK_PANGO_RENDERER_SELECTED)
-        crenderer->shadow_style = gtk_css_node_get_style (gtk_text_view_get_selection_node ((GtkTextView *)crenderer->widget));
-      else if (crenderer->state != GSK_PANGO_RENDERER_CURSOR)
-        crenderer->shadow_style = gtk_css_node_get_style (gtk_widget_get_css_node (crenderer->widget));
-    }
 }

 static void
@@ -457,7 +438,6 @@ gsk_pango_renderer_release (GskPangoRenderer *renderer)
    {
      renderer->widget = NULL;
      renderer->snapshot = NULL;
-      renderer->shadow_style = NULL;

      if (renderer->error_color)
        {
@@ -20,7 +20,6 @@

 #include <pango/pango.h>
 #include "gtk/gtksnapshot.h"
-#include "gtk/gtkcssstyleprivate.h"

 G_BEGIN_DECLS

@@ -59,7 +58,6 @@ struct _GskPangoRenderer
  GtkWidget             *widget;
  GtkSnapshot           *snapshot;
  const GdkRGBA         *fg_color;
-  GtkCssStyle           *shadow_style;

  /* Error underline color for this widget */
  GdkRGBA               *error_color;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Khalid Abu Shawarib	af9567b221	gtk/columnview: Invert resizing drag direction in RTL Reverse the side of column resizing drag handle in RTL and change the base for drag coordinates and the column resizing caluculations. Fixes https://gitlab.gnome.org/GNOME/gtk/-/issues/6049	2024-04-13 22:24:51 +03:00
Khalid Abu Shawarib	e411b14105	gtk/columnview: Invert horizontal translation in RTL Part of https://gitlab.gnome.org/GNOME/gtk/-/issues/6049	2024-04-13 21:50:19 +03:00
Khalid Abu Shawarib	55f908279f	gtk/range: Invert autoscroll properly This inverts autoscroll properly in Right-to-Left. part of https://gitlab.gnome.org/GNOME/gtk/-/issues/6049	2024-04-13 21:50:19 +03:00
Khalid Abu Shawarib	e3a416bf2b	gtk/scrollbar: Mark range as flippable This inverts both the gesture interaction and physical placment of the scrollbar in Right-to-Left. Part of https://gitlab.gnome.org/GNOME/gtk/-/issues/6049	2024-04-13 21:50:19 +03:00