inspector: Remove the GtkAtSpiContext use

There is generic API to access the D-Bus object path of the accessibility context object.
a11y: Implement get_dbus_object_path() for AT-SPI context
2023-02-04 12:17:47 +01:00 · 2023-02-04 12:16:59 +01:00 · 2023-02-04 12:14:14 +01:00
244 changed files with 20709 additions and 23605 deletions
@@ -26,31 +26,25 @@ variables:
  BACKEND_FLAGS: "-Dx11-backend=true -Dwayland-backend=true -Dbroadway-backend=true"
  FEATURE_FLAGS: "-Dvulkan=enabled -Dcloudproviders=enabled -Ddemos=false -Dbuild-examples=false -Dbuild-tests=false -Dbuild-testsuite=true"
  MESON_TEST_TIMEOUT_MULTIPLIER: 3
-  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v41"
+  FEDORA_IMAGE: "registry.gitlab.gnome.org/gnome/gtk/fedora:v40"
+  FLATPAK_IMAGE: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"

-workflow:
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: $CI_COMMIT_BRANCH
-
-default:
-  retry:
-    max: 2
-    when:
-      - 'runner_system_failure'
-      - 'stuck_or_timeout_failure'
-      - 'scheduler_failure'
-      - 'api_failure'
-  interruptible: true
+.only-default:
+  only:
+    - branches
+  except:
+    - tags

 style-check-diff:
+  extends: .only-default
  image: $FEDORA_IMAGE
  stage: check
-  when: manual
+  allow_failure: true
  script:
    - .gitlab-ci/run-style-check-diff.sh

 .build-fedora-default:
+  extends: .only-default
  image: $FEDORA_IMAGE
  artifacts:
    when: always
@@ -166,6 +160,7 @@ fedora-mingw64:
    - ninja -C _build

 .mingw-defaults:
+  extends: .only-default
  stage: build
  tags:
    - win32-ps
@@ -197,8 +192,9 @@ msys2-mingw64:
 macos:
  # Sadly, this fails regularly, and its failure is never enlightening
  allow_failure: true
-  rules:
-    - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  extends: .only-default
+  only:
+    - branches@GNOME/gtk
  stage: build
  tags:
    - macos
@@ -231,9 +227,10 @@ macos:
      - "${CI_PROJECT_DIR}/_build/meson-logs"

 vs2017-x64:
+  extends: .only-default
  # TODO: Uncomment this when ready to merge.
-  # rules:
-  #   - if: $CI_PROJECT_NAMESPACE == "GNOME"
+  #only:
+  #  - branches@GNOME/gtk
  stage: build
  tags:
    - win32-ps
@@ -246,7 +243,7 @@ vs2017-x64:
      - "${CI_PROJECT_DIR}/_build/meson-logs"

 .flatpak-defaults:
-  image: "quay.io/gnome_infrastructure/gnome-runtime-images:gnome-master"
+  image: $FLATPAK_IMAGE
  stage: flatpak
  allow_failure: true
  tags:
@@ -256,67 +253,65 @@ vs2017-x64:
      - "${APPID}-dev.flatpak"
      - 'repo.tar'
    expire_in: 1 day
-  rules:
-    # Only build Flatpak bundles automatically on main
-    - if: $CI_COMMIT_BRANCH == "main"
-    - if: $CI_COMMIT_BRANCH != "main"
-      when: "manual"
  script:
    - bash -x ./.gitlab-ci/flatpak-build.sh "${APPID}"

-flatpak:demo:
-  extends: '.flatpak-defaults'
+# Manual jobs, for branches and MRs
+.flatpak-manual:
+  extends: .flatpak-defaults
+  when: manual
+
+# Only build Flatpak bundles automatically on main
+.flatpak-main:
+  extends: .flatpak-defaults
+  only:
+    - main
+
+flatpak-manual:demo:
+  extends: .flatpak-manual
  needs: []
  variables:
    APPID: org.gtk.Demo4

-flatpak:demo:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:demo:
+  extends: .flatpak-main
  needs: []
-  tags:
-    - flatpak-aarch64
  variables:
    APPID: org.gtk.Demo4

-flatpak:widget-factory:
-  extends: '.flatpak-defaults'
+flatpak-manual:widget-factory:
+  extends: .flatpak-manual
  needs: []
  variables:
    APPID: org.gtk.WidgetFactory4

-flatpak:widget-factory:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:widget-factory:
+  extends: .flatpak-main
  needs: []
-  tags:
-    - flatpak-aarch64
  variables:
    APPID: org.gtk.WidgetFactory4

-flatpak:icon-browser:
-  extends: '.flatpak-defaults'
+flatpak-manual:icon-browser:
+  extends: .flatpak-manual
  needs: []
  variables:
    APPID: org.gtk.IconBrowser4

-flatpak:icon-browser:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:icon-browser:
+  extends: .flatpak-main
  needs: []
-  tags:
-    - flatpak-aarch64
  variables:
    APPID: org.gtk.IconBrowser4

-flatpak:node-editor:
-  extends: '.flatpak-defaults'
+flatpak-manual:node-editor:
+  extends: .flatpak-manual
  needs: []
  variables:
    APPID: org.gtk.gtk4.NodeEditor

-flatpak:node-editor:aarch64:
-  extends: '.flatpak-defaults'
+flatpak-main:node-editor:
+  extends: .flatpak-main
  needs: []
-  tags:
-    - flatpak-aarch64
  variables:
    APPID: org.gtk.gtk4.NodeEditor

@@ -325,35 +320,23 @@ flatpak:node-editor:aarch64:
 # https://gitlab.gnome.org/GNOME/Initiatives/-/wikis/DevOps-with-Flatpak
 nightly demo:
    extends: '.publish_nightly'
-    needs: ['flatpak:demo']
-
-nightly demo aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:demo:aarch64']
+    dependencies: ['flatpak-main:demo']
+    needs: ['flatpak-main:demo']

 nightly factory:
    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory']
-
-nightly factory aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:widget-factory:aarch64']
+    dependencies: ['flatpak-main:widget-factory']
+    needs: ['flatpak-main:widget-factory']

 nightly icon-browser:
    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser']
-
-nightly icon-browser aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:icon-browser:aarch64']
+    dependencies: ['flatpak-main:icon-browser']
+    needs: ['flatpak-main:icon-browser']

 nightly node-editor:
    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor']
-
-nightly node-editor aarch64:
-    extends: '.publish_nightly'
-    needs: ['flatpak:node-editor:aarch64']
+    dependencies: ['flatpak-main:node-editor']
+    needs: ['flatpak-main:node-editor']

 static-scan:
  image: $FEDORA_IMAGE
@@ -436,9 +419,9 @@ reference:
 publish-docs:
  image: fedora:latest
  stage: publish
-  interruptible: false
  needs: ['reference']
  script:
    - "curl -X POST -F token=${PAGES_TRIGGER_TOKEN} -F ref=docs-gtk-org https://gitlab.gnome.org/api/v4/projects/665/trigger/pipeline"
-  rules:
-    - if: $CI_COMMIT_REF_NAME == "main"
+  only:
+    refs:
+      - main
@@ -82,7 +82,6 @@ RUN dnf -y install \
    python3-gobject \
    python3-jinja2 \
    python3-markdown \
-    python3-packaging \
    python3-pip \
    python3-pygments \
    python3-typogrify \
@@ -20,7 +20,6 @@ flatpak build ${builddir} meson \
                -Dx11-backend=true \
                -Dwayland-backend=true \
                -Dbuild-tests=false \
-                -Dbuild-testsuite=false \
                -Dbuild-examples=false \
                -Dintrospection=disabled \
                -Ddemos=true \
@@ -23,7 +23,6 @@ push=0
 list=0
 print_help=0
 no_login=0
-no_cache=0

 while (($# > 0)); do
        case "${1%%=*}" in
@@ -35,7 +34,6 @@ while (($# > 0)); do
                --base|-b) read_arg base "$@" || shift;;
                --version|-v) read_arg base_version "$@" || shift;;
                --no-login) no_login=1;;
-                --no-cache) no_cache=1;;
                *) echo -e "\e[1;31mERROR\e[0m: Unknown option '$1'"; exit 1;;
        esac
        shift
@@ -105,21 +103,11 @@ TAG="${REGISTRY}/gnome/gtk/${base}:${base_version}"

 if [ $build == 1 ]; then
        echo -e "\e[1;32mBUILDING\e[0m: ${base} as ${TAG}"
-        if [ $no_cache == 0 ]; then
-                ${CMD} build \
-                        ${format} \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        else
-                ${CMD} build \
-                        ${format} \
-                        --no-cache \
-                        --build-arg HOST_USER_ID="$UID" \
-                        --tag "${TAG}" \
-                        --file "${base}.Dockerfile" .
-        fi
-
+        ${CMD} build \
+                ${format} \
+                --build-arg HOST_USER_ID="$UID" \
+                --tag "${TAG}" \
+                --file "${base}.Dockerfile" .
        exit $?
 fi

@@ -21,7 +21,7 @@ many things that we value:
 Please, do not use the issue tracker for support questions. If you have
 questions on how to use GTK effectively, you can use:

- - the `gtk` [room on matrix](https://matrix.to/#/#gtk:gnome.org)
+ - the `#gtk` IRC channel on irc.gnome.org
 - the [gtk tag on the GNOME Discourse instance](https://discourse.gnome.org/tag/gtk)

 You can also look at the GTK tag on [Stack
@@ -44,7 +44,6 @@ If you're reporting a bug make sure to list:

 0. which version of GTK are you using?
 0. which operating system are you using?
- 0. what display and graphics driver are you using?
 0. the necessary steps to reproduce the issue
 0. the expected outcome
 0. a description of the behavior; screenshots are also welcome
@@ -1,101 +1,4 @@
-Overview of Changes in 4.10.1, xx-xx-xxxx
-=========================================
-
-Overview of Changes in 4.10.0, 04-03-2023
-=========================================
-
-* GtkTextView
- - Document hanging indentation
-
-* GtkListView
- - Fix a size allocation problem
-
-* GtkFileChooser
- - Fix paned behavior
- - Fix a crash
-
-* GtkText
- - Fix various problems with undo
-
-* Accessibility
- - Make some getters transfer-full
- - Allow setting accessible parents and siblings
- - Add a role for toggle buttons
- - Miscellaneous property fixes and improvements
-
-* gtk
- - Improve the handling resize-during-size-allocate
-
-* gdk
- - Introduce GdkTextureDownloader and use it
- - Make gdk_texture_get_format public
-
-* gsk
- - Make mask nodes more versatile
- - Improve the GL implementation for texture scale nodes
-
-* X11
- - Fix key handling during DND
-
-* Tools
- - gtk-builder-tool: Try harder to handle templates
- - gtk-builder-tool: Prefer properties over <child>
-
-* Translation updates
- Basque
- Belarusian
- Bulgarian
- Indonesian
- Galician
- Georgian
- German
- Hebrew
- Lithuanian
- Portuguese
- Spanish
- Swedish
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.4, 12-02-2023
-========================================
-
-* Printing:
- - Add a CPDB backend
- - Drop the lpr backend
-
-* GtkFileDialog:
- - Robustness fixes
-
-* GtkScaleButton:
- - Add an 'active' property
-
-* GtkSearchEntry:
- - Add placeholder text
-
-* Fix conflicting type names between gtk and gio
-
-* Gsk:
- - Settable filtering for scaled textures
- - Add mask nodes
- - Some robustness and crash fixes
-
-* Wayland:
- - Handle dispatch failing in more places
-
-* Deprecations:
- - GtkVolumeButton
-
-* Translation updates:
- Belarusian
- Chinese (Taiwan)
- Georgian
- Turkish
- Ukrainian
-
-
-Overview of Changes in 4.9.3, 04-02-2023
+Overview of Changes in 4.9.3, xx-xx-xxxx
 ========================================

 * Add GtkUriLauncher, as replacement for gtk_show_uri
@@ -122,15 +25,6 @@ Overview of Changes in 4.9.3, 04-02-2023
 * GtkSwitch:
 - Make state and active independently settable

-* GtkFileChooser:
- - Fix a crash with DND
- - Fix excessively wide sidebar
- - Make context menus work again
-
-* Accessibility:
- - Make GtkAccessible public, so it can be implemented outside GTK
- - Support accessible implementation for editables
-
 * CSS:
 - Fix randomly stopping CSS animations

@@ -215,12 +215,6 @@
    <file>demo3widget.h</file>
    <file>demo3widget.ui</file>
  </gresource>
-  <gresource prefix="/mask">
-    <file>demo4widget.c</file>
-    <file>demo4widget.h</file>
-    <file>hsla.h</file>
-    <file>hsla.c</file>
-  </gresource>
  <gresource prefix="/paintable_svg">
    <file>svgpaintable.h</file>
    <file>svgpaintable.c</file>
@@ -317,7 +311,6 @@
    <file>list_store.c</file>
    <file>main.c</file>
    <file>markup.c</file>
-    <file>mask.c</file>
    <file>menu.c</file>
    <file>overlay.c</file>
    <file>overlay_decorative.c</file>
@@ -3,8 +3,7 @@

 enum
 {
-  PROP_TEXTURE = 1,
-  PROP_FILTER,
+  PROP_PAINTABLE = 1,
  PROP_SCALE
 };

@@ -12,9 +11,8 @@ struct _Demo3Widget
 {
  GtkWidget parent_instance;

-  GdkTexture *texture;
+  GdkPaintable *paintable;
  float scale;
-  GskScalingFilter filter;

  GtkWidget *menu;
 };
@@ -30,7 +28,6 @@ static void
 demo3_widget_init (Demo3Widget *self)
 {
  self->scale = 1.f;
-  self->filter = GSK_SCALING_FILTER_LINEAR;
  gtk_widget_init_template (GTK_WIDGET (self));
 }

@@ -39,7 +36,7 @@ demo3_widget_dispose (GObject *object)
 {
  Demo3Widget *self = DEMO3_WIDGET (object);

-  g_clear_object (&self->texture);
+  g_clear_object (&self->paintable);

  gtk_widget_dispose_template (GTK_WIDGET (self), DEMO3_TYPE_WIDGET);

@@ -53,13 +50,12 @@ demo3_widget_snapshot (GtkWidget   *widget,
  Demo3Widget *self = DEMO3_WIDGET (widget);
  int x, y, width, height;
  double w, h;
-  GskRenderNode *node;

  width = gtk_widget_get_width (widget);
  height = gtk_widget_get_height (widget);

-  w = self->scale * gdk_texture_get_width (self->texture);
-  h = self->scale * gdk_texture_get_height (self->texture);
+  w = self->scale * gdk_paintable_get_intrinsic_width (self->paintable);
+  h = self->scale * gdk_paintable_get_intrinsic_height (self->paintable);

  x = MAX (0, (width - ceil (w)) / 2);
  y = MAX (0, (height - ceil (h)) / 2);
@@ -67,11 +63,7 @@ demo3_widget_snapshot (GtkWidget   *widget,
  gtk_snapshot_push_clip (snapshot, &GRAPHENE_RECT_INIT (0, 0, width, height));
  gtk_snapshot_save (snapshot);
  gtk_snapshot_translate (snapshot, &GRAPHENE_POINT_INIT (x, y));
-  node = gsk_texture_scale_node_new (self->texture,
-                                     &GRAPHENE_RECT_INIT (0, 0, w, h),
-                                     self->filter);
-  gtk_snapshot_append_node (snapshot, node);
-  gsk_render_node_unref (node);
+  gdk_paintable_snapshot (self->paintable, snapshot, w, h);
  gtk_snapshot_restore (snapshot);
  gtk_snapshot_pop (snapshot);
 }
@@ -89,9 +81,9 @@ demo3_widget_measure (GtkWidget      *widget,
  int size;

  if (orientation == GTK_ORIENTATION_HORIZONTAL)
-    size = gdk_texture_get_width (self->texture);
+    size = gdk_paintable_get_intrinsic_width (self->paintable);
  else
-    size = gdk_texture_get_height (self->texture);
+    size = gdk_paintable_get_intrinsic_height (self->paintable);

  *minimum = *natural = self->scale * size;
 }
@@ -121,9 +113,9 @@ demo3_widget_set_property (GObject      *object,

  switch (prop_id)
    {
-    case PROP_TEXTURE:
-      g_clear_object (&self->texture);
-      self->texture = g_value_dup_object (value);
+    case PROP_PAINTABLE:
+      g_clear_object (&self->paintable);
+      self->paintable = g_value_dup_object (value);
      gtk_widget_queue_resize (GTK_WIDGET (object));
      break;

@@ -132,11 +124,6 @@ demo3_widget_set_property (GObject      *object,
      gtk_widget_queue_resize (GTK_WIDGET (object));
      break;

-    case PROP_FILTER:
-      self->filter = g_value_get_enum (value);
-      gtk_widget_queue_resize (GTK_WIDGET (object));
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -153,18 +140,14 @@ demo3_widget_get_property (GObject     *object,

  switch (prop_id)
    {
-    case PROP_TEXTURE:
-      g_value_set_object (value, self->texture);
+    case PROP_PAINTABLE:
+      g_value_set_object (value, self->paintable);
      break;

    case PROP_SCALE:
      g_value_set_float (value, self->scale);
      break;

-    case PROP_FILTER:
-      g_value_set_enum (value, self->filter);
-      break;
-
    default:
      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
      break;
@@ -222,21 +205,16 @@ demo3_widget_class_init (Demo3WidgetClass *class)
  widget_class->measure = demo3_widget_measure;
  widget_class->size_allocate = demo3_widget_size_allocate;

-  g_object_class_install_property (object_class, PROP_TEXTURE,
-      g_param_spec_object ("texture", NULL, NULL,
-                           GDK_TYPE_TEXTURE,
+  g_object_class_install_property (object_class, PROP_PAINTABLE,
+      g_param_spec_object ("paintable", "Paintable", "Paintable",
+                           GDK_TYPE_PAINTABLE,
                           G_PARAM_READWRITE));

  g_object_class_install_property (object_class, PROP_SCALE,
-      g_param_spec_float ("scale", NULL, NULL,
+      g_param_spec_float ("scale", "Scale", "Scale",
                          0.0, 10.0, 1.0,
                          G_PARAM_READWRITE));

-  g_object_class_install_property (object_class, PROP_FILTER,
-      g_param_spec_enum ("filter", NULL, NULL,
-                         GSK_TYPE_SCALING_FILTER, GSK_SCALING_FILTER_LINEAR,
-                         G_PARAM_READWRITE));
-
  /* These are the actions that we are using in the menu */
  gtk_widget_class_install_action (widget_class, "zoom.in", NULL, zoom_cb);
  gtk_widget_class_install_action (widget_class, "zoom.out", NULL, zoom_cb);
@@ -251,13 +229,16 @@ GtkWidget *
 demo3_widget_new (const char *resource)
 {
  Demo3Widget *self;
-  GdkTexture *texture;
+  GdkPixbuf *pixbuf;
+  GdkPaintable *paintable;

-  texture = gdk_texture_new_from_resource (resource);
+  pixbuf = gdk_pixbuf_new_from_resource (resource, NULL);
+  paintable = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (pixbuf));

-  self = g_object_new (DEMO3_TYPE_WIDGET, "texture", texture, NULL);
+  self = g_object_new (DEMO3_TYPE_WIDGET, "paintable", paintable, NULL);

-  g_object_unref (texture);
+  g_object_unref (pixbuf);
+  g_object_unref (paintable);

  return GTK_WIDGET (self);
 }
@@ -1,226 +0,0 @@
-#include <math.h>
-#include "demo4widget.h"
-#include "hsla.h"
-
-enum
-{
-  PROP_0,
-  PROP_PROGRESS,
-};
-
-struct _Demo4Widget
-{
-  GtkWidget parent_instance;
-  PangoLayout *layout;
-  GskColorStop stops[8];
-  gsize n_stops;
-  double progress;
-
-  guint tick;
-};
-
-struct _Demo4WidgetClass
-{
-  GtkWidgetClass parent_class;
-};
-
-G_DEFINE_TYPE (Demo4Widget, demo4_widget, GTK_TYPE_WIDGET)
-
-static void
-rotate_color (GdkRGBA *rgba)
-{
-  GdkHSLA hsla;
-
-  _gdk_hsla_init_from_rgba (&hsla, rgba);
-  hsla.hue -= 1;
-  _gdk_rgba_init_from_hsla (rgba, &hsla);
-}
-
-static gboolean
-rotate_colors (GtkWidget     *widget,
-               GdkFrameClock *clock,
-               gpointer       user_data)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-
-  for (unsigned int i = 0; i < self->n_stops; i++)
-    rotate_color (&self->stops[i].color);
-
-  gtk_widget_queue_draw (widget);
-
-  return G_SOURCE_CONTINUE;
-}
-
-static void
-demo4_widget_init (Demo4Widget *self)
-{
-  PangoFontDescription *desc;
-
-  self->progress = 0.5;
-
-  self->n_stops = 8;
-  self->stops[0].offset = 0;
-  self->stops[0].color = (GdkRGBA) { 1, 0, 0, 1 };
-
-  for (unsigned int i = 1; i < self->n_stops; i++)
-    {
-      GdkHSLA hsla;
-
-      self->stops[i].offset = i / (double)(self->n_stops - 1);
-      _gdk_hsla_init_from_rgba (&hsla, &self->stops[i - 1].color);
-      hsla.hue += 360.0 / (double)(self->n_stops - 1);
-      _gdk_rgba_init_from_hsla (&self->stops[i].color, &hsla);
-    }
-
-  self->layout = gtk_widget_create_pango_layout (GTK_WIDGET (self), "123");
-  desc = pango_font_description_from_string ("Cantarell Bold 210");
-  pango_layout_set_font_description (self->layout, desc);
-  pango_font_description_free (desc);
-
-  self->tick = gtk_widget_add_tick_callback (GTK_WIDGET (self), rotate_colors, NULL, NULL);
-}
-
-static void
-demo4_widget_dispose (GObject *object)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  g_clear_object (&self->layout);
-  gtk_widget_remove_tick_callback (GTK_WIDGET (self), self->tick);
-
-  G_OBJECT_CLASS (demo4_widget_parent_class)->dispose (object);
-}
-
-static void
-demo4_widget_snapshot_content (GtkWidget   *widget,
-                               GtkSnapshot *snapshot,
-                               GskMaskMode  mode)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height, layout_width, layout_height;
-  double scale;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, mode);
-  pango_layout_get_pixel_size (self->layout, &layout_width, &layout_height);
-  scale = MIN ((double) width / layout_width, (double) height / layout_height);
-  gtk_snapshot_translate (snapshot,
-                          &GRAPHENE_POINT_INIT ((width - scale * layout_width) / 2,
-                                                (height - scale * layout_height) / 2));
-  gtk_snapshot_scale (snapshot, scale, scale);
-  gtk_snapshot_append_layout (snapshot, self->layout, &(GdkRGBA) { 0, 0, 0, 1 });
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, height),
-                                       self->stops,
-                                       self->n_stops);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_snapshot (GtkWidget   *widget,
-                       GtkSnapshot *snapshot)
-{
-  Demo4Widget *self = DEMO4_WIDGET (widget);
-  int width, height;
-
-  width = gtk_widget_get_width (widget);
-  height = gtk_widget_get_height (widget);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_INVERTED_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_INVERTED_ALPHA);
-  gtk_snapshot_pop (snapshot);
-
-  gtk_snapshot_push_mask (snapshot, GSK_MASK_MODE_LUMINANCE);
-  gtk_snapshot_append_linear_gradient (snapshot,
-                                       &GRAPHENE_RECT_INIT (0, 0, width, height),
-                                       &GRAPHENE_POINT_INIT (0, 0),
-                                       &GRAPHENE_POINT_INIT (width, 0),
-                                       (GskColorStop[2]) {
-                                         { MAX (0.0, self->progress - 5.0 / width), { 1, 1, 1, 1 } },
-                                         { MIN (1.0, self->progress + 5.0 / width), { 0, 0, 0, 1 } }
-                                       }, 2);
-  gtk_snapshot_pop (snapshot);
-  demo4_widget_snapshot_content (widget, snapshot, GSK_MASK_MODE_ALPHA);
-  gtk_snapshot_pop (snapshot);
-}
-
-static void
-demo4_widget_set_property (GObject      *object,
-                           guint         prop_id,
-                           const GValue *value,
-                           GParamSpec   *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      self->progress = g_value_get_double (value);
-      gtk_widget_queue_draw (GTK_WIDGET (object));
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_get_property (GObject     *object,
-                           guint        prop_id,
-                           GValue      *value,
-                           GParamSpec  *pspec)
-{
-  Demo4Widget *self = DEMO4_WIDGET (object);
-
-  switch (prop_id)
-    {
-    case PROP_PROGRESS:
-      g_value_set_double (value, self->progress);
-      break;
-
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-    }
-}
-
-static void
-demo4_widget_class_init (Demo4WidgetClass *class)
-{
-  GObjectClass *object_class = G_OBJECT_CLASS (class);
-  GtkWidgetClass *widget_class = GTK_WIDGET_CLASS (class);
-
-  object_class->dispose = demo4_widget_dispose;
-  object_class->get_property = demo4_widget_get_property;
-  object_class->set_property = demo4_widget_set_property;
-
-  widget_class->snapshot = demo4_widget_snapshot;
-
-  g_object_class_install_property (object_class, PROP_PROGRESS,
-      g_param_spec_double ("progress", NULL, NULL,
-                           0.0, 1.0, 0.5,
-                           G_PARAM_READWRITE));
-}
-
-GtkWidget *
-demo4_widget_new (void)
-{
-  return g_object_new (DEMO4_TYPE_WIDGET, NULL);
-}
-
@@ -1,8 +0,0 @@
-#pragma once
-
-#include <gtk/gtk.h>
-
-#define DEMO4_TYPE_WIDGET (demo4_widget_get_type ())
-G_DECLARE_FINAL_TYPE (Demo4Widget, demo4_widget, DEMO4, WIDGET, GtkWidget)
-
-GtkWidget * demo4_widget_new (void);
@@ -356,10 +356,6 @@ canvas_item_start_editing (CanvasItem *item)

 }

-typedef struct {
-  double x, y;
-} Hotspot;
-
 static GdkContentProvider *
 prepare (GtkDragSource *source,
         double         x,
@@ -367,7 +363,6 @@ prepare (GtkDragSource *source,
 {
  GtkWidget *canvas;
  GtkWidget *item;
-  Hotspot *hotspot;

  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  item = gtk_widget_pick (canvas, x, y, GTK_PICK_DEFAULT);
@@ -378,10 +373,6 @@ prepare (GtkDragSource *source,

  g_object_set_data (G_OBJECT (canvas), "dragged-item", item);

-  hotspot = g_new (Hotspot, 1);
-  gtk_widget_translate_coordinates (canvas, item, x, y, &hotspot->x, &hotspot->y);
-  g_object_set_data_full (G_OBJECT (canvas), "hotspot", hotspot, g_free);
-
  return gdk_content_provider_new_typed (GTK_TYPE_WIDGET, item);
 }

@@ -392,14 +383,12 @@ drag_begin (GtkDragSource *source,
  GtkWidget *canvas;
  CanvasItem *item;
  GdkPaintable *paintable;
-  Hotspot *hotspot;

  canvas = gtk_event_controller_get_widget (GTK_EVENT_CONTROLLER (source));
  item = CANVAS_ITEM (g_object_get_data (G_OBJECT (canvas), "dragged-item"));
-  hotspot = (Hotspot *) g_object_get_data (G_OBJECT (canvas), "hotspot");

  paintable = canvas_item_get_drag_icon (item);
-  gtk_drag_source_set_icon (source, paintable, hotspot->x, hotspot->y);
+  gtk_drag_source_set_icon (source, paintable, item->r, item->r);
  g_object_unref (paintable);

  gtk_widget_set_opacity (GTK_WIDGET (item), 0.3);
@@ -48,16 +48,14 @@
 #define VERTICES_PER_TOOTH 34
 #define GEAR_VERTEX_STRIDE 6

-static inline void
-_sincos (double x, double *_sin, double *_cos)
+#ifndef HAVE_SINCOS
+static void
+sincos (double x, double *_sin, double *_cos)
 {
-#ifdef HAVE_SINCOS
-  sincos (x, _sin, _cos);
-#else
  *_sin = sin (x);
  *_cos = cos (x);
-#endif
 }
+#endif

 /**
 * Struct describing the vertices in triangle strip
@@ -309,11 +307,11 @@ create_gear (GLfloat inner_radius,
    struct point p[7];

    /* Calculate needed sin/cos for various angles */
-    _sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
-    _sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);
+    sincos(i * 2.0 * G_PI / teeth + da * 0, &s[0], &c[0]);
+    sincos(i * 2.0 * M_PI / teeth + da * 1, &s[1], &c[1]);
+    sincos(i * 2.0 * M_PI / teeth + da * 2, &s[2], &c[2]);
+    sincos(i * 2.0 * M_PI / teeth + da * 3, &s[3], &c[3]);
+    sincos(i * 2.0 * M_PI / teeth + da * 4, &s[4], &c[4]);

    GEAR_POINT(p[0], r2, 1);
    GEAR_POINT(p[1], r2, 2);
@@ -522,7 +520,7 @@ void perspective(GLfloat *m, GLfloat fovy, GLfloat aspect, GLfloat zNear, GLfloa
   identity(tmp);

   deltaZ = zFar - zNear;
-   _sincos(radians, &sine, &cosine);
+   sincos(radians, &sine, &cosine);

   if ((deltaZ == 0) || (sine == 0) || (aspect == 0))
      return;
@@ -1,146 +0,0 @@
-#include <gdk/gdk.h>
-#include "hsla.h"
-
-void
-_gdk_hsla_init_from_rgba (GdkHSLA       *hsla,
-                          const GdkRGBA *rgba)
-{
-  float min;
-  float max;
-  float red;
-  float green;
-  float blue;
-  float delta;
-
-  g_return_if_fail (hsla != NULL);
-  g_return_if_fail (rgba != NULL);
-
-  red = rgba->red;
-  green = rgba->green;
-  blue = rgba->blue;
-
-  if (red > green)
-    {
-      if (red > blue)
-        max = red;
-      else
-        max = blue;
-
-      if (green < blue)
-        min = green;
-      else
-        min = blue;
-    }
-  else
-    {
-      if (green > blue)
-        max = green;
-      else
-        max = blue;
-
-      if (red < blue)
-        min = red;
-      else
-        min = blue;
-    }
-
-  hsla->lightness = (max + min) / 2;
-  hsla->saturation = 0;
-  hsla->hue = 0;
-  hsla->alpha = rgba->alpha;
-
-  if (max != min)
-    {
-      if (hsla->lightness <= 0.5)
-        hsla->saturation = (max - min) / (max + min);
-      else
-        hsla->saturation = (max - min) / (2 - max - min);
-
-      delta = max -min;
-      if (red == max)
-        hsla->hue = (green - blue) / delta;
-      else if (green == max)
-        hsla->hue = 2 + (blue - red) / delta;
-      else if (blue == max)
-        hsla->hue = 4 + (red - green) / delta;
-
-      hsla->hue *= 60;
-      if (hsla->hue < 0.0)
-        hsla->hue += 360;
-    }
-}
-
-void
-_gdk_rgba_init_from_hsla (GdkRGBA       *rgba,
-                          const GdkHSLA *hsla)
-{
-  float hue;
-  float lightness;
-  float saturation;
-  float m1, m2;
-
-  lightness = hsla->lightness;
-  saturation = hsla->saturation;
-
-  if (lightness <= 0.5)
-    m2 = lightness * (1 + saturation);
-  else
-    m2 = lightness + saturation - lightness * saturation;
-  m1 = 2 * lightness - m2;
-
-  rgba->alpha = hsla->alpha;
-
-  if (saturation == 0)
-    {
-      rgba->red = lightness;
-      rgba->green = lightness;
-      rgba->blue = lightness;
-    }
-  else
-    {
-      hue = hsla->hue + 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->red = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->red = m2;
-      else if (hue < 240)
-        rgba->red = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->red = m1;
-
-      hue = hsla->hue;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->green = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->green = m2;
-      else if (hue < 240)
-        rgba->green = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->green = m1;
-
-      hue = hsla->hue - 120;
-      while (hue > 360)
-        hue -= 360;
-      while (hue < 0)
-        hue += 360;
-
-      if (hue < 60)
-        rgba->blue = m1 + (m2 - m1) * hue / 60;
-      else if (hue < 180)
-        rgba->blue = m2;
-      else if (hue < 240)
-        rgba->blue = m1 + (m2 - m1) * (240 - hue) / 60;
-      else
-        rgba->blue = m1;
-    }
-}
@@ -1,15 +0,0 @@
-#pragma once
-
-typedef struct _GdkHSLA GdkHSLA;
-
-struct _GdkHSLA {
-  float hue;
-  float saturation;
-  float lightness;
-  float alpha;
-};
-
-void            _gdk_hsla_init_from_rgba    (GdkHSLA          *hsla,
-                                             const GdkRGBA    *rgba);
-void            _gdk_rgba_init_from_hsla    (GdkRGBA          *rgba,
-                                             const GdkHSLA    *hsla);
@@ -1,53 +0,0 @@
-/* Masking
- *
- * Demonstrates mask nodes.
- *
- * This demo uses a text node as mask for
- * an animated linear gradient.
- */
-
-#include <gtk/gtk.h>
-#include "demo4widget.h"
-
-
-GtkWidget *
-do_mask (GtkWidget *do_widget)
-{
-  static GtkWidget *window = NULL;
-
-  if (!window)
-    {
-      GtkWidget *box;
-      GtkWidget *demo;
-      GtkWidget *scale;
-
-      window = gtk_window_new ();
-      gtk_window_set_title (GTK_WINDOW (window), "Mask Nodes");
-      gtk_window_set_default_size (GTK_WINDOW (window), 600, 400);
-      gtk_window_set_display (GTK_WINDOW (window),
-                              gtk_widget_get_display (do_widget));
-      g_object_add_weak_pointer (G_OBJECT (window), (gpointer *)&window);
-
-      box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
-      gtk_window_set_child (GTK_WINDOW (window), box);
-
-      demo = demo4_widget_new ();
-      gtk_widget_set_hexpand (demo, TRUE);
-      gtk_widget_set_vexpand (demo, TRUE);
-
-      gtk_box_append (GTK_BOX (box), demo);
-
-      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0, 1, 0.1);
-      gtk_range_set_value (GTK_RANGE (scale), 0.5);
-      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value", demo, "progress", 0);
-
-      gtk_box_append (GTK_BOX (box), scale);
-    }
-
-  if (!gtk_widget_get_visible (window))
-    gtk_widget_set_visible (window, TRUE);
-  else
-    gtk_window_destroy (GTK_WINDOW (window));
-
-  return window;
-}
@@ -22,11 +22,9 @@ do_menu (GtkWidget *do_widget)
  if (!window)
    {
      GtkWidget *box;
-      GtkWidget *box2;
      GtkWidget *sw;
      GtkWidget *widget;
      GtkWidget *scale;
-      GtkWidget *dropdown;

      window = gtk_window_new ();
      gtk_window_set_title (GTK_WINDOW (window), "Menu");
@@ -45,19 +43,10 @@ do_menu (GtkWidget *do_widget)
      widget = demo3_widget_new ("/transparent/portland-rose.jpg");
      gtk_scrolled_window_set_child (GTK_SCROLLED_WINDOW (sw), widget);

-      box2 = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 0);
-      gtk_box_append (GTK_BOX (box), box2);
-
      scale = gtk_scale_new_with_range (GTK_ORIENTATION_HORIZONTAL, 0.01, 10.0, 0.1);
      gtk_range_set_value (GTK_RANGE (scale), 1.0);
-      gtk_widget_set_hexpand (scale, TRUE);
-      gtk_box_append (GTK_BOX (box2), scale);
+      gtk_box_append (GTK_BOX (box), scale);

-      dropdown = gtk_drop_down_new (G_LIST_MODEL (gtk_string_list_new ((const char *[]){ "Linear", "Nearest", "Trilinear", NULL })), NULL);
-      gtk_box_append (GTK_BOX (box2), dropdown);
-
-      g_object_bind_property (dropdown, "selected", widget, "filter", G_BINDING_DEFAULT);
- 
      g_object_bind_property (gtk_range_get_adjustment (GTK_RANGE (scale)), "value",
                              widget, "scale",
                              G_BINDING_BIDIRECTIONAL);
@@ -46,7 +46,6 @@ demos = files([
  'links.c',
  'listbox.c',
  'listbox_controls.c',
-  'mask.c',
  'menu.c',
  'flowbox.c',
  'list_store.c',
@@ -115,7 +114,6 @@ extra_demo_sources = files([
  'gtkshadertoy.c',
  'gtkshaderstack.c',
  'gskshaderpaintable.c',
-  'hsla.c',
  'puzzlepiece.c',
  'bluroverlay.c',
  'demoimage.c',
@@ -128,7 +126,6 @@ extra_demo_sources = files([
  'four_point_transform.c',
  'demo2widget.c',
  'demo3widget.c',
-  'demo4widget.c',
  'pixbufpaintable.c',
  'script-names.c',
  'unicode-names.c',
@@ -13,13 +13,20 @@
 static GtkWidget *app_picker;

 static void
-set_file (GFile    *file,
-          gpointer  data)
+file_opened (GObject *source,
+             GAsyncResult *result,
+             void *data)
 {
+  GFile *file;
+  GError *error = NULL;
  char *name;

+  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
+
  if (!file)
    {
+      g_print ("%s\n", error->message);
+      g_error_free (error);
      gtk_widget_set_sensitive (app_picker, FALSE);
      g_object_set_data (G_OBJECT (app_picker), "file", NULL);
      return;
@@ -33,25 +40,6 @@ set_file (GFile    *file,
  g_object_set_data_full (G_OBJECT (app_picker), "file", g_object_ref (file), g_object_unref);
 }

-static void
-file_opened (GObject *source,
-             GAsyncResult *result,
-             void *data)
-{
-  GFile *file;
-  GError *error = NULL;
-
-  file = gtk_file_dialog_open_finish (GTK_FILE_DIALOG (source), result, &error);
-
-  if (!file)
-    {
-      g_print ("%s\n", error->message);
-      g_error_free (error);
-    }
-
-  set_file (file, data);
-}
-
 static gboolean
 abort_mission (gpointer data)
 {
@@ -142,28 +130,11 @@ launch_uri (GtkButton *picker)
  g_object_unref (launcher);
 }

-static gboolean
-on_drop (GtkDropTarget *target,
-         const GValue  *value,
-         double         x,
-         double         y,
-         gpointer       data)
-{
-  if (G_VALUE_HOLDS (value, G_TYPE_FILE))
-    {
-      set_file (g_value_get_object (value), data);
-      return TRUE;
-    }
-
-  return FALSE;
-}
-
 GtkWidget *
 do_pickers (GtkWidget *do_widget)
 {
  static GtkWidget *window = NULL;
  GtkWidget *table, *label, *picker, *button;
-  GtkDropTarget *drop_target;

  if (!window)
  {
@@ -208,13 +179,7 @@ do_pickers (GtkWidget *do_widget)

    picker = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 6);
    button = gtk_button_new_from_icon_name ("document-open-symbolic");
-
    label = gtk_label_new ("None");
-
-    drop_target = gtk_drop_target_new (G_TYPE_FILE, GDK_ACTION_COPY);
-    g_signal_connect (drop_target, "drop", G_CALLBACK (on_drop), label);
-    gtk_widget_add_controller (button, GTK_EVENT_CONTROLLER (drop_target));
-
    gtk_label_set_xalign (GTK_LABEL (label), 0.);
    gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_MIDDLE);
    gtk_widget_set_hexpand (label, TRUE);
@@ -22,7 +22,6 @@ show_shortcuts (GtkWidget   *window,
  gtk_window_set_transient_for (GTK_WINDOW (overlay), GTK_WINDOW (window));
  g_object_set (overlay, "view-name", view, NULL);
  g_object_unref (builder);
-  gtk_window_present (GTK_WINDOW (overlay));
 }

 G_MODULE_EXPORT void
@@ -178,16 +178,6 @@ Creates a node like `gsk_inset_shadow_node_new()` with the given properties.

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

-### mask
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| source   | `<node>`         | color { }              | always      |
-| mode     | `<blend-mode>`   | alpha                  | non-default |
-| mask     | `<node>`         | color { }              | always      |
-
-Creates a node like `gsk_mask_node_new()` with the given properties.
-
 ### opacity

 | property | syntax           | default                | printed     |
@@ -307,21 +297,6 @@ The default texture is a 10x10 checkerboard with the top left and bottom right
 representation for this texture is `url("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAAoAAAAKCAYAAACNMs+9AAAABmJLR0QA/wD/AP+gvaeTAAAAKUlEQVQYlWP8z3DmPwMaYGQwYUQXY0IXwAUGUCGGoxkYGBiweXAoeAYAz44F3e3U1xUAAAAASUVORK5CYII=")
 `.

-### texture-scale
-
-| property | syntax           | default                | printed     |
-| -------- | ---------------- | ---------------------- | ----------- |
-| bounds   | `<rect>`         | 50                     | always      |
-| texture  | `<url>`          | *see below*            | always      |
-| filter   | `filter`         | *see below*            | non-default |
-
-Creates a node like `gsk_texture_scale_node_new()` with the given properties.
-
-The default texture is a 10x10 checkerboard, just like for texture.
-
-The possible filter values are `linear`, `nearest` and `trilinear`, with
-`linear` being the default.
-
 ### transform

 | property | syntax           | default                | printed     |
@@ -239,14 +239,14 @@ control whether Vulkan should be used.
 ### `media-gstreamer` and `media-ffmpeg`

 By default, GTK will try to build the gstreamer backend for
-media playback support. These options can be used to explicitly
+media playback support. These option can be used to explicitly
 control which media backends should be built.

-### `print-cups` and `print-cpdb`
+### `print-cups`

-By default, GTK will try to build the cups and file print backends
-if their dependencies are found. These options can be used to
-explicitly control which print backends should be built.
+By default, GTK will try to build various print backends
+if their dependencies are found. This option can be used
+to explicitly control whether the cups print backend should be built.

 ### `cloudproviders`

@@ -66,10 +66,6 @@ You can compile the program above with GCC using:
 gcc $( pkg-config --cflags gtk4 ) -o example-0 example-0.c $( pkg-config --libs gtk4 )
 ```

-**Note**: If the above compilation does not work due to an error regarding `G_APPLICATION_DEFAULT_FLAGS`
-this could be due to your OS providing an older version of GLib. For GLib versions older than 2.74 you
-will need to replace `G_APPLICATION_DEFAULT_FLAGS` with `G_APPLICATION_FLAGS_NONE` in this example, and
-others in this documentation.
 For more information on how to compile a GTK application, please
 refer to the [Compiling GTK Applications](compiling.html)
 section in this reference.
@@ -33,11 +33,6 @@ Validation
 The ``validate`` command validates the given UI definition file and reports
 errors to ``stderr``.

-Note that there are limitations to the validation that can be done for templates,
-since they are closely tied to the class_init function they are used in.
-If your UI file uses types from third-party libraries, it may help to add those
-libraries to the `LD_PRELOAD` environment variable.
-
 ``--deprecations``

  Warn about uses of deprecated types in the UI definition file.
@@ -115,7 +115,7 @@ Instead of gtk_show_uri(), you should use GtkUriLauncher or GtkFileLauncher.
 This is an oldfashioned widget that does not do all that much anymore, since
 it no longer has a resize handle for the window.

-## GtkLockButton and GtkVolumeButton are going away
+## GtkLockButton is going away

-These are very specialized widgets that should better live with the application
-where they are used.
+This is an very specialized widget that should better live with the application
+where it is used.
@@ -7,50 +7,37 @@ the question you have, this list is a good place to start.

 ## General Questions

-*  How do I get started with GTK?
+1.  How do I get started with GTK?

    The GTK [website](https://www.gtk.org) offers some
    [tutorials](https://www.gtk.org/documentation.php) and other documentation
-    This reference manual also contains a introductory
+    (most of it about GTK 2.x and 3.x, but still somewhat applicable). This
+    reference manual also contains a introductory
    [Getting Started](#gtk-getting-started) part.

    More documentation ranging from whitepapers to online books can be found at
    the [GNOME developer's site](https://developer.gnome.org). After studying these
    materials you should be well prepared to come back to this reference manual for details.

-*  Where can I get help with GTK, submit a bug report, or make a feature request?
+2.  Where can I get help with GTK, submit a bug report, or make a feature request?

    See the [documentation](#gtk-resources) on this topic.

-*  How do I port from one GTK version to another?
+3.  How do I port from one GTK version to another?

-    Every major version of GTK comes with a [migration guide](#migrating). You may also
-    find useful information in the documentation for specific widgets and functions. If
-    you have a question not covered in the manual, feel free to ask, and please
+    See the [migration guide](#migrating). You may also find useful information in
+    the documentation for specific widgets and functions. If you have a question not
+    covered in the manual, feel free to ask, and please
    [file a bug report](https://gitlab.gnome.org/GNOME/gtk/issues/new) against the
    documentation.

-*  Should I maintain parallel versions of my UI in GTK x and GTK y?
-
-    At the end of the day, that is up to you.
-
-    Our experience is that it is a lot of work, and usually not a good idea.
-
-    If you are not ready to make the jump to the next major version of GTK,
-    it is perfectly fine to stick with the stable release. We maintain them
-    for that reason.
-
-*  How does memory management work in GTK? Should I free data returned from functions?
+4.  How does memory management work in GTK? Should I free data returned from functions?

    See the documentation for `GObject` and `GInitiallyUnowned`. For `GObject` note
    specifically `g_object_ref()` and `g_object_unref()`. `GInitiallyUnowned` is a
    subclass of `GObject` so the same points apply, except that it has a "floating"
    state (explained in its documentation).

-    In a widget tree, each container owns a reference to its children. The root
-    object (typically a `GtkWindow`) is owned by GTK. GTK will drop its reference
-    when you call [method@Gtk.Window.destroy].
-
    For strings returned from functions, they will be declared "const" if they should
    not be freed. Non-const strings should be freed with `g_free()`. Arrays follow the
    same rule. If you find an undocumented exception to the rules, please
@@ -59,7 +46,7 @@ the question you have, this list is a good place to start.
    The transfer annotations for gobject-introspection that are part of the
    documentation can provide useful hints for memory handling semantics as well.

-*  Why does my program leak memory, if I destroy a widget immediately
+5.  Why does my program leak memory, if I destroy a widget immediately
    after creating it?

    If `GtkFoo` isn't a toplevel window, then
@@ -82,7 +69,7 @@ the question you have, this list is a good place to start.
    the initial floating reference and you don't have to worry about reference
    counting at all ... just remove the widget from the container to get rid of it.

-*  How do I use GTK with threads?
+6.  How do I use GTK with threads?

    GTK requires that all GTK API calls are made from the same thread in which
    the `GtkApplication` was created, or `gtk_init()` was called (the _main thread_).
@@ -92,7 +79,7 @@ the question you have, this list is a good place to start.
    the results back to the main thread using `g_idle_add()` or `GAsyncQueue`. GIO
    offers useful tools for such an approach such as `GTask`.

-*  How do I internationalize a GTK program?
+7.  How do I internationalize a GTK program?

    Most people use [GNU gettext](https://www.gnu.org/software/gettext/),
    already required in order to install GLib. On a UNIX or Linux system with
@@ -147,7 +134,7 @@ the question you have, this list is a good place to start.

        #define _(x) dgettext (GETTEXT_PACKAGE, x)

-*  How do I use non-ASCII characters in GTK programs ?
+8.  How do I use non-ASCII characters in GTK programs ?

    GTK uses [Unicode](http://www.unicode.org) (more exactly UTF-8) for all text.
    UTF-8 encodes each Unicode codepoint as a sequence of one to six bytes and
@@ -230,7 +217,7 @@ the question you have, this list is a good place to start.
    to call bind_textdomain_codeset() to ensure that translated strings
    are returned in UTF-8 encoding.

-*  How do I use GTK with C++?
+9.  How do I use GTK with C++?

    There are two ways to approach this. The GTK header files use the subset
    of C that's also valid C++, so you can simply use the normal GTK API
@@ -255,23 +242,19 @@ the question you have, this list is a good place to start.

    There are very few functions that require this cast, however.

-*  How do I use GTK with other non-C languages?
+10. How do I use GTK with other non-C languages?

    See the list of [language bindings](https://www.gtk.org/language-bindings.php)
    on the GTK [website](https://www.gtk.org).

-*  How do I load an image or animation from a file?
+11. How do I load an image or animation from a file?

    To load an image file straight into a display widget, use
-    [ctor@Gtk.Picture.new_for_file] or [ctor@GTk.Picture.new_for_filename].
-    To load an image for another purpose, use [ctor@Gdk.Texture.new_from_file].
-    To load a video from a file, use [ctor@Gtk.MediaFile.new_for_file].
+    [ctor@Gtk.Image.new_from_file]. To load an image for another purpose, use
+    [ctor@Gdk.Texture.new_from_file]. To load a video from a file, use
+    [ctor@Gtk.MediaFile.new_for_file].

-*  How do I draw text?
-
-    If you just want to put text into your user interface somewhere, it is
-    usually easiest to just use one of ready-made widgets for this purpose,
-    such as [class@Gtk.Label].
+12. How do I draw text?

    To draw a piece of text onto a cairo surface, use a Pango layout and
    [func@PangoCairo.show_layout].
@@ -289,7 +272,7 @@ the question you have, this list is a good place to start.
    To draw a piece of text in a widget [vfunc@Gtk.Widget.snapshot] implementation,
    use [method@Gtk.Snapshot.append_layout].

-*  How do I measure the size of a piece of text?
+13. How do I measure the size of a piece of text?

    To obtain the size of a piece of text, use a Pango layout and
    [method@Pango.Layout.get_pixel_size], using code like the following:
@@ -304,7 +287,7 @@ the question you have, this list is a good place to start.
    See also the [Layout Objects](https://developer.gnome.org/pango/stable/pango-Layout-Objects.html)
    section of the [Pango documentation](https://developer.gnome.org/pango/stable/).

-*  Why are types not registered if I use their `GTK_TYPE_BLAH` macro?
+14. Why are types not registered if I use their `GTK_TYPE_BLAH` macro?

    The %GTK_TYPE_BLAH macros are defined as calls to gtk_blah_get_type(), and
    the `_get_type()` functions are declared as %G_GNUC_CONST which allows the
@@ -315,14 +298,14 @@ the question you have, this list is a good place to start.

        g_type_ensure (GTK_TYPE_BLAH);

-*  How do I create a transparent toplevel window?
+15. How do I create a transparent toplevel window?

    Any toplevel window can be transparent. It is just a matter of setting a
    transparent background in the CSS style for it.

 ## Which widget should I use...

-*  ...for lists and trees?
+16. ...for lists and trees?

    This question has different answers, depending on the size of the dataset
    and the required formatting flexibility.
@@ -338,7 +321,7 @@ the question you have, this list is a good place to start.
    and widgetry inside the list, then you probably want to use a [class@Gtk.ListBox],
    which uses regular widgets for display.

-*  ...for multi-line text display or editing?
+17. ...for multi-line text display or editing?

    See the [text widget overview](#TextWidget) -- you should use the
    [class@Gtk.TextView] widget.
@@ -347,7 +330,7 @@ the question you have, this list is a good place to start.
    of course. It can be made selectable with [method@Gtk.Label.set_selectable]. For a
    single-line text entry, see [class@Gtk.Entry].

-*  ...to display an image or animation?
+18. ...to display an image or animation?

    GTK has two widgets that are dedicated to displaying images. [class@Gtk.Image], for
    small, fixed-size icons and [class@Gtk.Picture] for content images.
@@ -363,14 +346,17 @@ the question you have, this list is a good place to start.
        mediafile = gtk_media_file_new_for_filename ("example.webm");
        picture = gtk_picture_new_for_paintable (GDK_PAINTABLE (mediafile));

-*  ...for presenting a set of mutually-exclusive choices, where Windows
+19. ...for presenting a set of mutually-exclusive choices, where Windows
    would use a combo box?

-    With GTK, a [class@Gtk.DropDown] is the recommended widget to use for this use case.
+    With GTK, a [class@Gtk.ComboBox] is the recommended widget to use for this use case.
+    If you need an editable text entry, use the [property@Gtk.ComboBox:has-entry] property.
+
+    A newer alternative is [class@Gtk.DropDown].

 ## Questions about GtkWidget

-*  How do I change the color of a widget?
+20. How do I change the color of a widget?

    The background color of a widget is determined by the CSS style that applies
    to it. To change that, you can set style classes on the widget, and provide
@@ -378,7 +364,7 @@ the question you have, this list is a good place to start.
    [method@Gtk.CssProvider.load_from_file] and its variants.
    See [method@Gtk.StyleContext.add_provider].

-*  How do I change the font of a widget?
+21. How do I change the font of a widget?

    If you want to make the text of a label larger, you can use
    gtk_label_set_markup():
@@ -402,14 +388,14 @@ the question you have, this list is a good place to start.
    of this approach is that users can then override the font you have chosen.
    See the `GtkStyleContext` documentation for more discussion.

-*  How do I disable/ghost/desensitize a widget?
+22. How do I disable/ghost/desensitize a widget?

    In GTK a disabled widget is termed _insensitive_.
    See [method@Gtk.Widget.set_sensitive].

 ## GtkTextView questions

-*  How do I get the contents of the entire text widget as a string?
+23. How do I get the contents of the entire text widget as a string?

    See [method@Gtk.TextBuffer.get_bounds] and [method@Gtk.TextBuffer.get_text]
    or [method@Gtk.TextIter.get_text].
@@ -424,14 +410,14 @@ the question you have, this list is a good place to start.
        /* use text */
        g_free (text);

-*  How do I make a text widget display its complete contents in a specific font?
+24. How do I make a text widget display its complete contents in a specific font?

    If you use [method@Gtk.TextBuffer.insert_with_tags] with appropriate tags to
    select the font, the inserted text will have the desired appearance, but
    text typed in by the user before or after the tagged block will appear in
    the default style.

-*  How do I make a text view scroll to the end of the buffer automatically ?
+25. How do I make a text view scroll to the end of the buffer automatically ?

    A good way to keep a text buffer scrolled to the end is to place a
    [mark](#GtkTextMark) at the end of the buffer, and give it right gravity.
@@ -446,21 +432,21 @@ the question you have, this list is a good place to start.

 ## GtkTreeView questions

-*  How do I associate some data with a row in the tree?
+26. How do I associate some data with a row in the tree?

    Remember that the [iface@Gtk.TreeModel] columns don't necessarily have to be
    displayed. So you can put non-user-visible data in your model just
    like any other data, and retrieve it with [method@Gtk.TreeModel.get].
    See the [tree widget overview](#TreeWidget).

-*  How do I put an image and some text in the same column?
+27. How do I put an image and some text in the same column?

    You can pack more than one [class@Gtk.CellRenderer] into a single [class@Gtk.TreeViewColumn]
    using [method@Gtk.TreeViewColumn.pack_start] or [method@Gtk.TreeViewColumn.pack_end].
    So pack both a [class@Gtk.CellRendererPixbuf] and a [class@Gtk.CellRendererText] into the
    column.

-*  I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
+28. I can set data easily on my [class@Gtk.TreeStore] or [class@Gtk.ListStore] models using
    [method@Gtk.ListStore.set] and [method@Gtk.TreeStore.set], but can't read it back?

    Both the [class@Gtk.TreeStore] and the [class@Gtk.ListStore] implement the [iface@Gtk.TreeModel]
@@ -468,7 +454,7 @@ the question you have, this list is a good place to start.
    implements. The easiest way to read a set of data back is to use
    [method@Gtk.TreeModel.get].

-*  How do I change the way that numbers are formatted by `GtkTreeView`?
+29. How do I change the way that numbers are formatted by `GtkTreeView`?

    Use [method@Gtk.TreeView.insert_column_with_data_func] or
    [method@Gtk.TreeViewColumn.set_cell_data_func] and do the conversion
@@ -542,21 +528,19 @@ the question you have, this list is a good place to start.
                                                   (gpointer)DOUBLE_COLUMN, NULL);
        }

-*  How do I hide the expander arrows in my tree view?
+30. How do I hide the expander arrows in my tree view?

    Set the expander-column property of the tree view to a hidden column.
    See [method@Gtk.TreeView.set_expander_column] and [method@Gtk.TreeViewColumn.set_visible].

 ## Using cairo with GTK

-*  How do I use cairo to draw in GTK applications?
+31. How do I use cairo to draw in GTK applications?

-    [class@Gtk.DrawingArea] is a ready-made widget for drawing with cairo.
+    Use [method@Gtk.Snapshot.append_cairo] in your [vfunc@Gtk.Widget.snapshot] vfunc
+    to obtain a cairo context and draw with that.

-    If you implement a custom widget, use [method@Gtk.Snapshot.append_cairo]
-    in your [vfunc@Gtk.Widget.snapshot] vfunc to obtain a cairo context and draw with that.
-
-*  Can I improve the performance of my application by using another backend
+32. Can I improve the performance of my application by using another backend
    of cairo (such as GL)?

    No. Most drawing in GTK is not done via cairo anymore (but instead
@@ -567,7 +551,7 @@ the question you have, this list is a good place to start.

    If you are interested in using GL for your own drawing, see [class@Gtk.GLArea].

-*  Can I use cairo to draw on a `GdkPixbuf`?
+33. Can I use cairo to draw on a `GdkPixbuf`?

    No. The cairo image surface does not support the pixel format used by `GdkPixbuf`.

@@ -69,7 +69,6 @@
 #include <gdk/gdksnapshot.h>
 #include <gdk/gdksurface.h>
 #include <gdk/gdktexture.h>
-#include <gdk/gdktexturedownloader.h>
 #include <gdk/gdktoplevel.h>
 #include <gdk/gdktoplevellayout.h>
 #include <gdk/gdktoplevelsize.h>
@@ -1511,6 +1511,7 @@ gdk_button_event_get_button (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkKeyEvent */

 /**
@@ -1971,6 +1972,7 @@ gdk_key_event_get_match (GdkEvent        *event,
 }

 /* }}} */
+
 /* {{{ GdkTouchEvent */

 /**
@@ -2107,6 +2109,7 @@ gdk_touch_event_get_emulating_pointer (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkCrossingEvent */

 /**
@@ -2250,6 +2253,7 @@ gdk_crossing_event_get_detail (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkDeleteEvent */

 /**
@@ -2280,6 +2284,7 @@ gdk_delete_event_new (GdkSurface *surface)
 }

 /* }}} */
+
 /* {{{ GdkFocusEvent */

 /**
@@ -2336,6 +2341,7 @@ gdk_focus_event_get_in (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkScrollEvent */

 /**
@@ -2594,6 +2600,7 @@ gdk_scroll_event_get_unit (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkTouchpadEvent */

 /**
@@ -2852,6 +2859,7 @@ gdk_touchpad_event_get_pinch_scale (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkPadEvent */

 /**
@@ -3025,6 +3033,7 @@ gdk_pad_event_get_group_mode (GdkEvent *event,
 }

 /* }}} */
+
 /* {{{ GdkMotionEvent */

 /**
@@ -3186,6 +3195,7 @@ gdk_event_get_history (GdkEvent *event,
 }

 /* }}} */
+
 /* {{{ GdkProximityEvent */

 /**
@@ -3248,6 +3258,7 @@ gdk_proximity_event_new (GdkEventType   type,
 }

 /* }}} */
+
 /* {{{ GdkDNDEvent */

 /**
@@ -3353,6 +3364,7 @@ gdk_dnd_event_get_drop (GdkEvent *event)
 }

 /* }}} */
+
 /* {{{ GdkGrabBrokenEvent */

 /**
@@ -3430,5 +3442,3 @@ gdk_grab_broken_event_get_implicit (GdkEvent *event)
 }

 /* }}} */
-
-/* vim:set foldmethod=marker expandtab: */
@@ -24,6 +24,7 @@
 #include "gdkglcontextprivate.h"
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
+#include "gdktextureprivate.h"

 #include <epoxy/gl.h>

@@ -178,10 +178,10 @@ gdk_memory_texture_new_subtexture (GdkMemoryTexture  *source,
  GBytes *bytes;

  g_return_val_if_fail (GDK_IS_MEMORY_TEXTURE (source), NULL);
-  g_return_val_if_fail (x >= 0 && x < GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (y >= 0 && y < GDK_TEXTURE (source)->height, NULL);
-  g_return_val_if_fail (width > 0 && x + width <= GDK_TEXTURE (source)->width, NULL);
-  g_return_val_if_fail (height > 0 && y + height <= GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (x >= 0 || x < GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (y >= 0 || y < GDK_TEXTURE (source)->height, NULL);
+  g_return_val_if_fail (width > 0 || x + width <= GDK_TEXTURE (source)->width, NULL);
+  g_return_val_if_fail (height > 0 || y + height <= GDK_TEXTURE (source)->height, NULL);

  texture = GDK_TEXTURE (source);
  bpp = gdk_memory_format_bytes_per_pixel (texture->format);
@@ -222,7 +222,7 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
  data = g_malloc_n (stride, texture->height);

  gdk_texture_do_download (texture, format, data, stride);
-  bytes = g_bytes_new_take (data, stride * texture->height);
+  bytes = g_bytes_new_take (data, stride);
  result = gdk_memory_texture_new (texture->width,
                                   texture->height,
                                   format,
@@ -233,11 +233,15 @@ gdk_memory_texture_from_texture (GdkTexture      *texture,
  return GDK_MEMORY_TEXTURE (result);
 }

-GBytes *
-gdk_memory_texture_get_bytes (GdkMemoryTexture *self,
-                              gsize            *out_stride)
+const guchar *
+gdk_memory_texture_get_data (GdkMemoryTexture *self)
 {
-  *out_stride = self->stride;
-  return self->bytes;
+  return g_bytes_get_data (self->bytes, NULL);
+}
+
+gsize
+gdk_memory_texture_get_stride (GdkMemoryTexture *self)
+{
+  return self->stride;
 }

@@ -37,8 +37,8 @@ GdkTexture *            gdk_memory_texture_new_subtexture   (GdkMemoryTexture  *
                                                             int                width,
                                                             int                height);

-GBytes *                gdk_memory_texture_get_bytes        (GdkMemoryTexture  *self,
-                                                             gsize             *out_stride);
+const guchar *          gdk_memory_texture_get_data         (GdkMemoryTexture  *self);
+gsize                   gdk_memory_texture_get_stride       (GdkMemoryTexture  *self);


 G_END_DECLS
@@ -27,7 +27,7 @@
 #include "gdkmemoryformatprivate.h"
 #include "gdkmemorytextureprivate.h"
 #include "gdksurface.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdktextureprivate.h"

 #include <gdk-pixbuf/gdk-pixbuf.h>

@@ -218,9 +218,9 @@ gdk_pixbuf_get_from_surface (cairo_surface_t *surface,

 static void
 pixbuf_texture_unref_cb (guchar   *pixels,
-                         gpointer  bytes)
+                         gpointer  texture)
 {
-  g_bytes_unref (bytes);
+  g_object_unref (texture);
 }

 /**
@@ -238,27 +238,22 @@ pixbuf_texture_unref_cb (guchar   *pixels,
 GdkPixbuf *
 gdk_pixbuf_get_from_texture (GdkTexture *texture)
 {
-  GdkTextureDownloader downloader;
-  GBytes *bytes;
-  gsize stride;
+  GdkMemoryTexture *memtex;
  gboolean alpha;

  alpha = gdk_memory_format_alpha (gdk_texture_get_format (texture)) != GDK_MEMORY_ALPHA_OPAQUE;

-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, 
-                                     alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
-                                           : GDK_MEMORY_GDK_PIXBUF_OPAQUE);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
+  memtex = gdk_memory_texture_from_texture (texture,
+                                            alpha ? GDK_MEMORY_GDK_PIXBUF_ALPHA
+                                                  : GDK_MEMORY_GDK_PIXBUF_OPAQUE);

-  return gdk_pixbuf_new_from_data (g_bytes_get_data (bytes, NULL),
+  return gdk_pixbuf_new_from_data (gdk_memory_texture_get_data (memtex),
                                   GDK_COLORSPACE_RGB,
                                   alpha,
                                   8,
-                                   gdk_texture_get_width (texture),
-                                   gdk_texture_get_height (texture),
-                                   stride,
+                                   gdk_texture_get_width (GDK_TEXTURE (memtex)),
+                                   gdk_texture_get_height (GDK_TEXTURE (memtex)),
+                                   gdk_memory_texture_get_stride (memtex),
                                   pixbuf_texture_unref_cb,
-                                   bytes);
+                                   memtex);
 }
@@ -722,9 +722,6 @@ gdk_texture_download_surface (GdkTexture *texture)
 *                       cairo_image_surface_get_stride (surface));
 * cairo_surface_mark_dirty (surface);
 * ```
- *
- * For more flexible download capabilites, see
- * [struct@Gdk.TextureDownloader].
 */
 void
 gdk_texture_download (GdkTexture *texture,
@@ -741,29 +738,9 @@ gdk_texture_download (GdkTexture *texture,
                           stride);
 }

-/**
- * gdk_texture_get_format:
- * @self: a GdkTexture
- *
- * Gets the memory format most closely associated with the data of
- * the texture.
- *
- * Note that it may not be an exact match for texture data
- * stored on the GPU or with compression.
- *
- * The format can give an indication about the bit depth and opacity
- * of the texture and is useful to determine the best format for
- * downloading the texture.
- *
- * Returns: the preferred format for the texture's data
- *
- * Since: 4.10
- **/
 GdkMemoryFormat
 gdk_texture_get_format (GdkTexture *self)
 {
-  g_return_val_if_fail (GDK_IS_TEXTURE (self), GDK_MEMORY_DEFAULT);
-
  return self->format;
 }

@@ -24,7 +24,6 @@
 #endif

 #include <gdk/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
 #include <gdk/gdktypes.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>

@@ -83,8 +82,6 @@ GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_width                  (GdkTexture      *texture) G_GNUC_PURE;
 GDK_AVAILABLE_IN_ALL
 int                     gdk_texture_get_height                 (GdkTexture      *texture) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_10
-GdkMemoryFormat         gdk_texture_get_format                 (GdkTexture      *self) G_GNUC_PURE;

 GDK_AVAILABLE_IN_ALL
 void                    gdk_texture_download                   (GdkTexture      *texture,
@@ -1,268 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2023 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.          See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-/**
- * GdkTextureDownloader:
- *
- * The `GdkTextureDownloader` is used to download the contents of a
- * [class@Gdk.Texture].
- *
- * It is intended to be created as a short-term object for a single download,
- * but can be used for multipe downloads of different textures or with different
- * settings.
- *
- * `GdkTextureDownloader` can be used to convert data between different formats.
- * Create a `GdkTexture` for the existing format and then download it in a
- * different format.
- *
- * Since: 4.10
- */
-
-#include "config.h"
-
-#include "gdktexturedownloaderprivate.h"
-
-#include "gdkmemoryformatprivate.h"
-#include "gdkmemorytextureprivate.h"
-#include "gdktextureprivate.h"
-
-G_DEFINE_BOXED_TYPE (GdkTextureDownloader, gdk_texture_downloader,
-                     gdk_texture_downloader_copy,
-                     gdk_texture_downloader_free)
-
-
-void
-gdk_texture_downloader_init (GdkTextureDownloader *self,
-                             GdkTexture           *texture)
-{
-  self->texture = g_object_ref (texture);
-  self->format = GDK_MEMORY_DEFAULT;
-}
-
-void
-gdk_texture_downloader_finish (GdkTextureDownloader *self)
-{
-  g_object_unref (self->texture);
-}
-
-/**
- * gdk_texture_downloader_new:
- * @texture: texture to download
- *
- * Creates a new texture downloader for @texture.
- *
- * Returns: A new texture downloader
- *
- * Since: 4.10
- **/
-GdkTextureDownloader *
-gdk_texture_downloader_new (GdkTexture *texture)
-{
-  GdkTextureDownloader *self;
-
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-
-  self = g_slice_new (GdkTextureDownloader);
-  gdk_texture_downloader_init (self, texture);
-
-  return self;
-}
-
-/**
- * gdk_texture_downloader_copy:
- * @self: the downloader to copy
- *
- * Creates a copy of the downloader.
- *
- * This function is meant for language bindings.
- *
- * Returns: A copy of the downloader
- *
- * Since: 4.10
- **/
-GdkTextureDownloader *
-gdk_texture_downloader_copy (const GdkTextureDownloader *self)
-{
-  GdkTextureDownloader *copy;
-
-  g_return_val_if_fail (self != NULL, NULL);
-
-  copy = gdk_texture_downloader_new (self->texture);
-  gdk_texture_downloader_set_format (copy, self->format);
-
-  return copy;
-}
-
-/**
- * gdk_texture_downloader_free:
- * @self: texture downloader to free
- *
- * Frees the given downloader and all its associated resources.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_free (GdkTextureDownloader *self)
-{
-  g_return_if_fail (self != NULL);
-
-  gdk_texture_downloader_finish (self);
-  g_slice_free (GdkTextureDownloader, self);
-}
-
-/**
- * gdk_texture_downloader_set_texture:
- * @self: a texture downloader
- * @texture: the new texture to download
- *
- * Changes the texture the downloader will download.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_set_texture (GdkTextureDownloader *self,
-                                    GdkTexture           *texture)
-{
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (GDK_IS_TEXTURE (texture));
-
-  g_set_object (&self->texture, texture);
-}
-
-/**
- * gdk_texture_downloader_get_texture:
- * @self: a texture downloader
- *
- * Gets the texture that the downloader will download.
- *
- * Returns: (transfer none): The texture to download
- *
- * Since: 4.10
- **/
-GdkTexture *
-gdk_texture_downloader_get_texture (const GdkTextureDownloader *self)
-{
-  g_return_val_if_fail (self != NULL, NULL);
-
-  return self->texture;
-}
-
-/**
- * gdk_texture_downloader_set_format:
- * @self: a texture downloader
- * @format: the format to use
- *
- * Sets the format the downloader will download.
- *
- * By default, GDK_MEMORY_DEFAULT is set.
- *
- * Since: 4.10
- */
-void
-gdk_texture_downloader_set_format (GdkTextureDownloader *self,
-                                   GdkMemoryFormat       format)
-{
-  g_return_if_fail (self != NULL);
-
-  self->format = format;
-}
-
-/**
- * gdk_texture_downloader_get_format:
- * @self: a texture downloader
- *
- * Gets the format that the data will be downloaded in.
- *
- * Returns: The format of the download
- *
- * Since: 4.10
- **/
-GdkMemoryFormat
-gdk_texture_downloader_get_format (const GdkTextureDownloader *self)
-{
-  g_return_val_if_fail (self != NULL, GDK_MEMORY_DEFAULT);
-
-  return self->format;
-}
-
-/**
- * gdk_texture_downloader_download_into:
- * @self: a texture downloader
- * @data: (array): pointer to enough memory to be filled with the
- *   downloaded data of the texture
- * @stride: rowstride in bytes
- *
- * Downloads the @texture into local memory.
- *
- * Since: 4.10
- **/
-void
-gdk_texture_downloader_download_into (const GdkTextureDownloader *self,
-                                      guchar                     *data,
-                                      gsize                       stride)
-{
-  g_return_if_fail (self != NULL);
-  g_return_if_fail (data != NULL);
-  g_return_if_fail (stride >= gdk_texture_get_width (self->texture) * gdk_memory_format_bytes_per_pixel (self->format));
-
-  gdk_texture_do_download (self->texture, self->format, data, stride);
-}
-
-/**
- * gdk_texture_downloader_download_bytes:
- * @self: the downloader
- * @out_stride: (out): The stride of the resulting data in bytes.
- *
- * Downloads the given texture pixels into a `GBytes`. The rowstride will
- * be stored in the stride value.
- *
- * This function will abort if it tries to download a large texture and
- * fails to allocate memory. If you think that may happen, you should
- * handle memory allocation yourself and use
- * gdk_texture_downloader_download_into() once allocation succeeded.
- *
- * Returns: The downloaded pixels.
- *
- * Since: 4.10
- **/
-GBytes *
-gdk_texture_downloader_download_bytes (const GdkTextureDownloader *self,
-                                       gsize                      *out_stride)
-{
-  guchar *data;
-  gsize stride;
-
-  g_return_val_if_fail (self != NULL, NULL);
-  g_return_val_if_fail (out_stride != NULL, NULL);
-
-  if (GDK_IS_MEMORY_TEXTURE (self->texture) &&
-      gdk_texture_get_format (self->texture) == self->format)
-    {
-      GdkMemoryTexture *memtex = GDK_MEMORY_TEXTURE (self->texture);
-
-      return g_bytes_ref (gdk_memory_texture_get_bytes (memtex, out_stride));
-    }
-
-  stride = self->texture->width * gdk_memory_format_bytes_per_pixel (self->format);
-  data = g_malloc_n (stride, self->texture->height);
-
-  gdk_texture_do_download (self->texture, self->format, data, stride);
-
-  *out_stride = stride;
-  return g_bytes_new_take (data, stride * self->texture->height);
-}
-
@@ -1,69 +0,0 @@
-/* GTK - The GIMP Toolkit
- * Copyright (C) 2023 Benjamin Otte
- *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2 of the License, or (at your option) any later version.
- *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library. If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef __GTK_TEXTURE_DOWNLOADER_H__
-#define __GTK_TEXTURE_DOWNLOADER_H__
-
-#if !defined (__GDK_H_INSIDE__) && !defined (GTK_COMPILATION)
-#error "Only <gdk/gdk.h> can be included directly."
-#endif
-
-
-#include <gdk/gdkversionmacros.h>
-#include <gdk/gdkenums.h>
-#include <gdk/gdktypes.h>
-
-G_BEGIN_DECLS
-
-#define GDK_TYPE_TEXTURE_DOWNLOADER    (gdk_texture_downloader_get_type ())
-
-GDK_AVAILABLE_IN_4_10
-GType                   gdk_texture_downloader_get_type         (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_4_10
-GdkTextureDownloader *  gdk_texture_downloader_new              (GdkTexture             *texture);
-
-GDK_AVAILABLE_IN_4_10
-GdkTextureDownloader *  gdk_texture_downloader_copy             (const GdkTextureDownloader     *self);
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_free             (GdkTextureDownloader           *self);
-
-
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_set_texture      (GdkTextureDownloader           *self,
-                                                                 GdkTexture                     *texture);
-GDK_AVAILABLE_IN_4_10
-GdkTexture *            gdk_texture_downloader_get_texture      (const GdkTextureDownloader     *self);
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_set_format       (GdkTextureDownloader           *self,
-                                                                 GdkMemoryFormat                 format);
-GDK_AVAILABLE_IN_4_10
-GdkMemoryFormat         gdk_texture_downloader_get_format       (const GdkTextureDownloader     *self);
-
-
-GDK_AVAILABLE_IN_4_10
-void                    gdk_texture_downloader_download_into    (const GdkTextureDownloader     *self,
-                                                                 guchar                         *data,
-                                                                 gsize                           stride);
-GDK_AVAILABLE_IN_4_10
-GBytes *                gdk_texture_downloader_download_bytes   (const GdkTextureDownloader     *self,
-                                                                 gsize                          *out_stride);
-
-G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkTextureDownloader, gdk_texture_downloader_free)
-
-G_END_DECLS
-
-#endif /* __GTK_TEXTURE_DOWNLOADER_H__ */
@@ -1,41 +0,0 @@
-/* GTK - The GIMP Toolkit
- *
- * Copyright (C) 2023 Benjamin Otte
- *
- * 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/>.
- */
-
-
-#ifndef __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
-#define __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__
-
-#include "gdktexturedownloader.h"
-
-G_BEGIN_DECLS
-
-struct _GdkTextureDownloader
-{
-  /*< private >*/
-  GdkTexture *texture;
-  GdkMemoryFormat format;
-};
-
-void                    gdk_texture_downloader_init              (GdkTextureDownloader           *self,
-                                                                  GdkTexture                     *texture);
-void                    gdk_texture_downloader_finish            (GdkTextureDownloader           *self);
-
-
-G_END_DECLS
-
-#endif /* __GTK_TEXTURE_DOWNLOADER_PRIVATE_H__ */
@@ -43,6 +43,7 @@ void                    gdk_texture_do_download         (GdkTexture
                                                         GdkMemoryFormat         format,
                                                         guchar                 *data,
                                                         gsize                   stride);
+GdkMemoryFormat         gdk_texture_get_format          (GdkTexture             *self);
 gboolean                gdk_texture_set_render_data     (GdkTexture             *self,
                                                         gpointer                key,
                                                         gpointer                data,
@@ -77,7 +77,6 @@ typedef struct _GdkContentFormats     GdkContentFormats;
 typedef struct _GdkContentProvider    GdkContentProvider;
 typedef struct _GdkCursor             GdkCursor;
 typedef struct _GdkTexture            GdkTexture;
-typedef struct _GdkTextureDownloader  GdkTextureDownloader;
 typedef struct _GdkDevice             GdkDevice;
 typedef struct _GdkDrag               GdkDrag;
 typedef struct _GdkDrop               GdkDrop;
@@ -23,7 +23,7 @@

 #include <glib/gi18n-lib.h>
 #include "gdktexture.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdkmemorytextureprivate.h"

 #include "gdkprofilerprivate.h"

@@ -251,8 +251,7 @@ gdk_save_jpeg (GdkTexture *texture)
  guchar *data = NULL;
  gulong size = 0;
  guchar *input = NULL;
-  GdkTextureDownloader downloader;
-  GBytes *texbytes;
+  GdkMemoryTexture *memtex = NULL;
  const guchar *texdata;
  gsize texstride;
  guchar *row;
@@ -271,7 +270,7 @@ gdk_save_jpeg (GdkTexture *texture)
      free (data);
      g_free (input);
      jpeg_destroy_compress (&info);
-      g_clear_pointer (&texbytes, g_bytes_unref);
+      g_clear_object (&memtex);
      return NULL;
    }

@@ -290,11 +289,10 @@ gdk_save_jpeg (GdkTexture *texture)

  jpeg_mem_dest (&info, &data, &size);

-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, GDK_MEMORY_R8G8B8);
-  texbytes = gdk_texture_downloader_download_bytes (&downloader, &texstride);
-  gdk_texture_downloader_finish (&downloader);
-  texdata = g_bytes_get_data (texbytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture,
+                                            GDK_MEMORY_R8G8B8);
+  texdata = gdk_memory_texture_get_data (memtex);
+  texstride = gdk_memory_texture_get_stride (memtex);

  jpeg_start_compress (&info, TRUE);

@@ -306,7 +304,7 @@ gdk_save_jpeg (GdkTexture *texture)

  jpeg_finish_compress (&info);

-  g_bytes_unref (texbytes);
+  g_object_unref (memtex);
  g_free (input);
  jpeg_destroy_compress (&info);

@@ -21,9 +21,10 @@

 #include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
-#include "gdkmemorytexture.h"
+#include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdktexture.h"
+#include "gdktextureprivate.h"
 #include "gsk/gl/fp16private.h"
 #include <png.h>
 #include <stdio.h>
@@ -296,12 +297,11 @@ gdk_save_png (GdkTexture *texture)
  png_info *info;
  png_io io = { NULL, 0, 0 };
  int width, height;
-  int y;
-  GdkMemoryFormat format;
-  GdkTextureDownloader downloader;
-  GBytes *bytes;
  gsize stride;
  const guchar *data;
+  int y;
+  GdkMemoryTexture *memtex;
+  GdkMemoryFormat format;
  int png_format;
  int depth;

@@ -370,15 +370,11 @@ gdk_save_png (GdkTexture *texture)
      return NULL;
    }

-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, format);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
-  data = g_bytes_get_data (bytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture, format);

  if (sigsetjmp (png_jmpbuf (png), 1))
    {
-      g_bytes_unref (bytes);
+      g_object_unref (memtex);
      g_free (io.data);
      png_destroy_read_struct (&png, &info, NULL);
      return NULL;
@@ -398,6 +394,8 @@ gdk_save_png (GdkTexture *texture)
  png_set_swap (png);
 #endif

+  data = gdk_memory_texture_get_data (memtex);
+  stride = gdk_memory_texture_get_stride (memtex);
  for (y = 0; y < height; y++)
    png_write_row (png, data + y * stride);

@@ -405,7 +403,7 @@ gdk_save_png (GdkTexture *texture)

  png_destroy_write_struct (&png, &info);

-  g_bytes_unref (bytes);
+  g_object_unref (memtex);

  return g_bytes_new_take (io.data, io.size);
 }
@@ -21,9 +21,10 @@

 #include <glib/gi18n-lib.h>
 #include "gdkmemoryformatprivate.h"
-#include "gdkmemorytexture.h"
+#include "gdkmemorytextureprivate.h"
 #include "gdkprofilerprivate.h"
-#include "gdktexturedownloaderprivate.h"
+#include "gdktexture.h"
+#include "gdktextureprivate.h"

 #include <tiffio.h>

@@ -259,12 +260,11 @@ GBytes *
 gdk_save_tiff (GdkTexture *texture)
 {
  TIFF *tif;
-  int width, height;
-  gsize stride;
+  int width, height, stride;
  const guchar *line;
  const guchar *data;
-  GBytes *bytes, *result = NULL;
-  GdkTextureDownloader downloader;
+  GBytes *result = NULL;
+  GdkMemoryTexture *memtex;
  GdkMemoryFormat format;
  const FormatData *fdata = NULL;

@@ -292,11 +292,9 @@ gdk_save_tiff (GdkTexture *texture)
  TIFFSetField (tif, TIFFTAG_PHOTOMETRIC, PHOTOMETRIC_RGB);
  TIFFSetField (tif, TIFFTAG_PLANARCONFIG, PLANARCONFIG_CONTIG);

-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, fdata->format);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
-  data = g_bytes_get_data (bytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture, fdata->format);
+  data = gdk_memory_texture_get_data (memtex);
+  stride = gdk_memory_texture_get_stride (memtex);

  line = (const guchar *)data;
  for (int y = 0; y < height; y++)
@@ -304,7 +302,7 @@ gdk_save_tiff (GdkTexture *texture)
      if (TIFFWriteScanline (tif, (void *)line, y, 0) == -1)
        {
          TIFFClose (tif);
-          g_bytes_unref (bytes);
+          g_object_unref (memtex);
          return NULL;
        }

@@ -316,7 +314,7 @@ gdk_save_tiff (GdkTexture *texture)

  g_assert (result);

-  g_bytes_unref (bytes);
+  g_object_unref (memtex);

  return result;
 }
@@ -43,7 +43,6 @@ gdk_public_sources = files([
  'gdkseatdefault.c',
  'gdksnapshot.c',
  'gdktexture.c',
-  'gdktexturedownloader.c',
  'gdkvulkancontext.c',
  'gdksurface.c',
  'gdkpopuplayout.c',
@@ -96,7 +95,6 @@ gdk_public_headers = files([
  'gdkseat.h',
  'gdksnapshot.h',
  'gdktexture.h',
-  'gdktexturedownloader.h',
  'gdktypes.h',
  'gdkvulkancontext.h',
  'gdksurface.h',
@@ -87,7 +87,7 @@ gdk_wayland_app_launch_context_get_startup_notify_id (GAppLaunchContext *context
      xdg_activation_token_v1_commit (token);

      while (app_launch_data.token == NULL)
-        gdk_wayland_display_dispatch_queue (GDK_DISPLAY (display), event_queue);
+        wl_display_dispatch_queue (display->wl_display, event_queue);

      xdg_activation_token_v1_destroy (token);
      id = app_launch_data.token;
@@ -2694,17 +2694,3 @@ gdk_wayland_display_query_registry (GdkDisplay  *display,

  return FALSE;
 }
-
-void
-gdk_wayland_display_dispatch_queue (GdkDisplay            *display,
-                                    struct wl_event_queue *event_queue)
-{
-  GdkWaylandDisplay *display_wayland = GDK_WAYLAND_DISPLAY (display);
-
-  if (wl_display_dispatch_queue (display_wayland->wl_display, event_queue) == -1)
-    {
-      g_message ("Error %d (%s) dispatching to Wayland display.",
-                 errno, g_strerror (errno));
-      _exit (1);
-    }
-}
@@ -158,9 +158,6 @@ struct _GdkWaylandDisplayClass

 gboolean                gdk_wayland_display_prefers_ssd         (GdkDisplay *display);

-void gdk_wayland_display_dispatch_queue (GdkDisplay            *display,
-                                         struct wl_event_queue *event_queue);
-
 G_END_DECLS

 #endif  /* __GDK_WAYLAND_DISPLAY__ */
@@ -25,7 +25,6 @@

 #include "gdkdisplay-wayland.h"
 #include "gdksurface-wayland.h"
-#include "gdksurface-wayland-private.h"

 #include "gdkwaylanddisplay.h"
 #include "gdkwaylandglcontext.h"
@@ -61,17 +60,10 @@ gdk_wayland_gl_context_end_frame (GdkDrawContext *draw_context,
                                  cairo_region_t *painted)
 {
  GdkSurface *surface = gdk_draw_context_get_surface (draw_context);
-  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
-  int dx = impl->pending_buffer_offset_x;
-  int dy = impl->pending_buffer_offset_y;

  gdk_wayland_surface_sync (surface);
  gdk_wayland_surface_request_frame (surface);

-  if (wl_surface_get_version (impl->display_server.wl_surface) >=
-      WL_SURFACE_OFFSET_SINCE_VERSION)
-    wl_surface_offset (impl->display_server.wl_surface, dx, dy);
-
  GDK_DRAW_CONTEXT_CLASS (gdk_wayland_gl_context_parent_class)->end_frame (draw_context, painted);

  gdk_wayland_surface_notify_committed (surface);
@@ -1334,6 +1334,8 @@ gdk_wayland_surface_present_popup (GdkWaylandPopup *wayland_popup,
                                   GdkPopupLayout  *layout)
 {
  GdkSurface *surface = GDK_SURFACE (wayland_popup);
+  GdkWaylandDisplay *display_wayland =
+    GDK_WAYLAND_DISPLAY (gdk_surface_get_display (surface));
  GdkWaylandSurface *wayland_surface = GDK_WAYLAND_SURFACE (wayland_popup);

  if (!wayland_surface->mapped)
@@ -1386,10 +1388,7 @@ gdk_wayland_surface_present_popup (GdkWaylandPopup *wayland_popup,
    }

  while (wayland_popup->display_server.xdg_popup && !is_relayout_finished (surface))
-    {
-      gdk_wayland_display_dispatch_queue (surface->display,
-                                          wayland_surface->event_queue);
-    }
+    wl_display_dispatch_queue (display_wayland->wl_display, wayland_surface->event_queue);

  if (wayland_popup->display_server.xdg_popup)
    {
@@ -229,7 +229,7 @@ gdk_wayland_surface_update_size (GdkSurface *surface,

  if (impl->display_server.egl_window)
    wl_egl_window_resize (impl->display_server.egl_window, width * scale, height * scale, 0, 0);
-  if (impl->display_server.wl_surface && scale_changed)
+  if (impl->display_server.wl_surface)
    wl_surface_set_buffer_scale (impl->display_server.wl_surface, scale);

  gdk_surface_invalidate_rect (surface, NULL);
@@ -579,12 +579,33 @@ gdk_wayland_surface_attach_image (GdkSurface           *surface,
    }
 }

+static void
+gdk_wayland_surface_sync_offset (GdkSurface *surface)
+{
+  GdkWaylandSurface *impl = GDK_WAYLAND_SURFACE (surface);
+
+  if (wl_surface_get_version (impl->display_server.wl_surface) <
+      WL_SURFACE_OFFSET_SINCE_VERSION)
+    return;
+
+  if (impl->pending_buffer_offset_x == 0 &&
+      impl->pending_buffer_offset_y == 0)
+    return;
+
+  wl_surface_offset (impl->display_server.wl_surface,
+                     impl->pending_buffer_offset_x,
+                     impl->pending_buffer_offset_y);
+  impl->pending_buffer_offset_x = 0;
+  impl->pending_buffer_offset_y = 0;
+}
+
 void
 gdk_wayland_surface_sync (GdkSurface *surface)
 {
  gdk_wayland_surface_sync_shadow (surface);
  gdk_wayland_surface_sync_opaque_region (surface);
  gdk_wayland_surface_sync_input_region (surface);
+  gdk_wayland_surface_sync_offset (surface);
 }

 static gboolean
@@ -2119,10 +2119,7 @@ gdk_wayland_toplevel_focus (GdkToplevel *toplevel,
          xdg_activation_token_v1_commit (token);

          while (startup_id == NULL)
-            {
-              gdk_wayland_display_dispatch_queue (GDK_DISPLAY (display_wayland),
-                                                  event_queue);
-            }
+            wl_display_dispatch_queue (display_wayland->wl_display, event_queue);

          xdg_activation_token_v1_destroy (token);
          wl_event_queue_destroy (event_queue);
@@ -2066,10 +2066,19 @@ gdk_x11_device_manager_xi2_translate_event (GdkEventTranslator *translator,
            xev->detail != XINotifyInferior && xev->mode != XINotifyPassiveUngrab &&
            GDK_IS_TOPLEVEL (surface))
          {
-            GList *l;
+            if (gdk_x11_device_xi2_get_device_type ((GdkX11DeviceXI2 *) device) != GDK_X11_DEVICE_TYPE_LOGICAL)
+              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (source_device));
+            else
+              {
+                GList *physical_devices, *l;

-            for (l = device_manager->devices; l; l = l->next)
-              _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
+                physical_devices = gdk_device_list_physical_devices (source_device);
+
+                for (l = physical_devices; l; l = l->next)
+                  _gdk_device_xi2_reset_scroll_valuators (GDK_X11_DEVICE_XI2 (l->data));
+
+                g_list_free (physical_devices);
+              }
          }

        event = gdk_crossing_event_new (ev->evtype == XI_Enter
@@ -1912,7 +1912,7 @@ drag_grab (GdkDrag *drag)
  root = GDK_DISPLAY_XROOTWIN (display);
  seat = gdk_device_get_seat (gdk_drag_get_device (drag));

-  capabilities = GDK_SEAT_CAPABILITY_ALL_POINTING | GDK_SEAT_CAPABILITY_KEYBOARD;
+  capabilities = GDK_SEAT_CAPABILITY_ALL_POINTING;

  cursor = gdk_drag_get_cursor (drag, x11_drag->current_action);
  g_set_object (&x11_drag->cursor, cursor);
@@ -250,7 +250,6 @@ collect_reused_child_nodes (GskRenderer *renderer,
      /* Leaf nodes */

    case GSK_TEXTURE_NODE:
-    case GSK_TEXTURE_SCALE_NODE:
    case GSK_CAIRO_NODE:
    case GSK_COLOR_NODE:
    case GSK_BORDER_NODE:
@@ -270,7 +269,6 @@ collect_reused_child_nodes (GskRenderer *renderer,
    case GSK_BLEND_NODE:
    case GSK_CROSS_FADE_NODE:
    case GSK_BLUR_NODE:
-    case GSK_MASK_NODE:

    default:

@@ -847,8 +845,6 @@ gsk_broadway_renderer_add_node (GskRenderer *renderer,
      }
      break; /* Fallback */

-    case GSK_MASK_NODE:
-    case GSK_TEXTURE_SCALE_NODE:
    case GSK_TEXT_NODE:
    case GSK_RADIAL_GRADIENT_NODE:
    case GSK_REPEATING_LINEAR_GRADIENT_NODE:
@@ -27,8 +27,8 @@

 #include <gdk/gdkglcontextprivate.h>
 #include <gdk/gdkmemoryformatprivate.h>
+#include <gdk/gdkmemorytextureprivate.h>
 #include <gdk/gdkprofilerprivate.h>
-#include <gdk/gdktexturedownloaderprivate.h>
 #include <gsk/gskdebugprivate.h>
 #include <gsk/gskroundedrectprivate.h>

@@ -570,10 +570,7 @@ gsk_gl_command_queue_end_draw (GskGLCommandQueue *self)
  g_assert (self->batches.len > 0);

  if (will_ignore_batch (self))
-    {
-      self->in_draw = FALSE;
-      return;
-    }
+    return;

  batch = gsk_gl_command_batches_tail (&self->batches);

@@ -1359,8 +1356,7 @@ gsk_gl_command_queue_do_upload_texture (GskGLCommandQueue *self,
  GdkGLContext *context;
  const guchar *data;
  gsize stride;
-  GBytes *bytes;
-  GdkTextureDownloader downloader;
+  GdkMemoryTexture *memtex;
  GdkMemoryFormat data_format;
  int width, height;
  GLenum gl_internalformat;
@@ -1395,11 +1391,9 @@ gsk_gl_command_queue_do_upload_texture (GskGLCommandQueue *self,
        }
    }

-  gdk_texture_downloader_init (&downloader, texture);
-  gdk_texture_downloader_set_format (&downloader, data_format);
-  bytes = gdk_texture_downloader_download_bytes (&downloader, &stride);
-  gdk_texture_downloader_finish (&downloader);
-  data = g_bytes_get_data (bytes, NULL);
+  memtex = gdk_memory_texture_from_texture (texture, data_format);
+  data = gdk_memory_texture_get_data (memtex);
+  stride = gdk_memory_texture_get_stride (memtex);
  bpp = gdk_memory_format_bytes_per_pixel (data_format);

  glPixelStorei (GL_UNPACK_ALIGNMENT, gdk_memory_format_alignment (data_format));
@@ -1429,7 +1423,7 @@ gsk_gl_command_queue_do_upload_texture (GskGLCommandQueue *self,
    }
  glPixelStorei (GL_UNPACK_ALIGNMENT, 4);

-  g_bytes_unref (bytes);
+  g_object_unref (memtex);
 }

 int
@@ -1445,7 +1439,8 @@ gsk_gl_command_queue_upload_texture (GskGLCommandQueue *self,

  g_assert (GSK_IS_GL_COMMAND_QUEUE (self));
  g_assert (!GDK_IS_GL_TEXTURE (texture));
-  g_assert (mag_filter == GL_LINEAR || mag_filter == GL_NEAREST);
+  g_assert (min_filter == GL_LINEAR || min_filter == GL_NEAREST);
+  g_assert (mag_filter == GL_LINEAR || min_filter == GL_NEAREST);

  width = gdk_texture_get_width (texture);
  height = gdk_texture_get_height (texture);
@@ -1469,9 +1464,6 @@ gsk_gl_command_queue_upload_texture (GskGLCommandQueue *self,

  gsk_gl_command_queue_do_upload_texture (self, texture);

-  if (min_filter == GL_LINEAR_MIPMAP_LINEAR)
-    glGenerateMipmap (GL_TEXTURE_2D);
-
  /* Restore previous texture state if any */
  if (self->attachments->textures[0].id > 0)
    glBindTexture (self->attachments->textures[0].target,
@@ -35,6 +35,7 @@
 #include "gskgliconlibraryprivate.h"
 #include "gskglprogramprivate.h"
 #include "gskglshadowlibraryprivate.h"
+#include "gskgltextureprivate.h"
 #include "fp16private.h"

 #include <gdk/gdkglcontextprivate.h>
@@ -752,7 +753,7 @@ gsk_gl_driver_load_texture (GskGLDriver *self,
    {
      if ((t = gdk_texture_get_render_data (texture, self)))
        {
-          if (t->min_filter == min_filter && t->mag_filter == mag_filter && t->texture_id)
+          if (t->min_filter == min_filter && t->mag_filter == mag_filter)
            return t->texture_id;
        }

@@ -1194,10 +1195,6 @@ gsk_gl_driver_create_command_queue (GskGLDriver *self,
 void
 gsk_gl_driver_add_texture_slices (GskGLDriver        *self,
                                  GdkTexture         *texture,
-                                  int                 min_filter,
-                                  int                 mag_filter,
-                                  guint               min_cols,
-                                  guint               min_rows,
                                  GskGLTextureSlice **out_slices,
                                  guint              *out_n_slices)
 {
@@ -1219,37 +1216,31 @@ gsk_gl_driver_add_texture_slices (GskGLDriver        *self,

  /* XXX: Too much? */
  max_texture_size = self->command_queue->max_texture_size / 4;
+
  tex_width = texture->width;
  tex_height = texture->height;
-
-  cols = MAX ((texture->width / max_texture_size) + 1, min_cols);
-  rows = MAX ((texture->height / max_texture_size) + 1, min_rows);
-
-  n_slices = cols * rows;
+  cols = (texture->width / max_texture_size) + 1;
+  rows = (texture->height / max_texture_size) + 1;

  if ((t = gdk_texture_get_render_data (texture, self)))
    {
-      if (t->n_slices == n_slices)
-        {
-          *out_slices = t->slices;
-          *out_n_slices = t->n_slices;
-          return;
-        }
-
-      gdk_texture_clear_render_data (texture);
+      *out_slices = t->slices;
+      *out_n_slices = t->n_slices;
+      return;
    }

+  n_slices = cols * rows;
  slices = g_new0 (GskGLTextureSlice, n_slices);
  memtex = gdk_memory_texture_from_texture (texture,
                                            gdk_texture_get_format (texture));

-  for (guint col = 0; col < cols; col++)
+  for (guint col = 0; col < cols; col ++)
    {
-      int slice_width = col + 1 < cols ? tex_width / cols : tex_width - x;
+      int slice_width = MIN (max_texture_size, texture->width - x);

-      for (guint row = 0; row < rows; row++)
+      for (guint row = 0; row < rows; row ++)
        {
-          int slice_height = row + 1 < rows ? tex_height / rows : tex_height - y;
+          int slice_height = MIN (max_texture_size, texture->height - y);
          int slice_index = (col * rows) + row;
          GdkTexture *subtex;
          guint texture_id;
@@ -1259,7 +1250,7 @@ gsk_gl_driver_add_texture_slices (GskGLDriver        *self,
                                                      slice_width, slice_height);
          texture_id = gsk_gl_command_queue_upload_texture (self->command_queue,
                                                            subtex,
-                                                            min_filter, mag_filter);
+                                                            GL_NEAREST, GL_NEAREST);
          g_object_unref (subtex);

          slices[slice_index].rect.x = x;
@@ -177,10 +177,6 @@ GskGLTexture      * gsk_gl_driver_mark_texture_permanent (GskGLDriver         *s
                                                          guint                texture_id);
 void                gsk_gl_driver_add_texture_slices     (GskGLDriver         *self,
                                                          GdkTexture          *texture,
-                                                          int                  min_filter,
-                                                          int                  mag_filter,
-                                                          guint                min_cols,
-                                                          guint                min_rows,
                                                          GskGLTextureSlice  **out_slices,
                                                          guint               *out_n_slices);
 GskGLProgram      * gsk_gl_driver_lookup_shader          (GskGLDriver         *self,
@@ -232,10 +228,6 @@ gsk_gl_driver_lookup_texture (GskGLDriver         *self,
 static inline void
 gsk_gl_driver_slice_texture (GskGLDriver        *self,
                             GdkTexture         *texture,
-                             int                 min_filter,
-                             int                 mag_filter,
-                             guint               min_cols,
-                             guint               min_rows,
                             GskGLTextureSlice **out_slices,
                             guint              *out_n_slices)
 {
@@ -243,15 +235,12 @@ gsk_gl_driver_slice_texture (GskGLDriver        *self,

  if ((t = gdk_texture_get_render_data (texture, self)))
    {
-      if (min_cols == 0 && min_rows == 0)
-        {
-          *out_slices = t->slices;
-          *out_n_slices = t->n_slices;
-          return;
-        }
+      *out_slices = t->slices;
+      *out_n_slices = t->n_slices;
+      return;
    }

-  gsk_gl_driver_add_texture_slices (self, texture, min_filter, mag_filter, min_cols, min_rows, out_slices, out_n_slices);
+  gsk_gl_driver_add_texture_slices (self, texture, out_slices, out_n_slices);
 }

 G_END_DECLS
@@ -60,11 +60,6 @@ GSK_GL_DEFINE_PROGRAM (linear_gradient,
                       GSK_GL_ADD_UNIFORM (3, LINEAR_GRADIENT_POINTS, u_points)
                       GSK_GL_ADD_UNIFORM (4, LINEAR_GRADIENT_REPEAT, u_repeat))

-GSK_GL_DEFINE_PROGRAM (mask,
-                       GSK_GL_SHADER_SINGLE (GSK_GL_SHADER_RESOURCE ("mask.glsl")),
-                       GSK_GL_ADD_UNIFORM (1, MASK_SOURCE, u_mask)
-                       GSK_GL_ADD_UNIFORM (2, MASK_MODE, u_mode))
-
 GSK_GL_DEFINE_PROGRAM (outset_shadow,
                       GSK_GL_SHADER_SINGLE (GSK_GL_SHADER_RESOURCE ("outset_shadow.glsl")),
                       GSK_GL_ADD_UNIFORM (1, OUTSET_SHADOW_OUTLINE_RECT, u_outline_rect))
@@ -872,21 +872,6 @@ gsk_gl_render_job_transform_bounds (GskGLRenderJob        *job,
    }
 }

-static inline void
-gsk_gl_render_job_untransform_bounds (GskGLRenderJob        *job,
-                                      const graphene_rect_t *rect,
-                                      graphene_rect_t       *out_rect)
-{
-  GskTransform *transform;
-
-  transform = gsk_transform_invert (gsk_transform_ref (job->current_modelview->transform));
-
-  gsk_transform_transform_bounds (transform, rect, out_rect);
-
-  out_rect->origin.x -= job->offset_x;
-  out_rect->origin.y -= job->offset_y;
-}
-
 static inline void
 gsk_gl_render_job_transform_rounded_rect (GskGLRenderJob       *job,
                                          const GskRoundedRect *rect,
@@ -3292,60 +3277,6 @@ gsk_gl_render_job_visit_blend_node (GskGLRenderJob      *job,
  gsk_gl_render_job_end_draw (job);
 }

-static inline void
-gsk_gl_render_job_visit_mask_node (GskGLRenderJob      *job,
-                                   const GskRenderNode *node)
-{
-  const GskRenderNode *source = gsk_mask_node_get_source (node);
-  const GskRenderNode *mask = gsk_mask_node_get_mask (node);
-  GskGLRenderOffscreen source_offscreen = {0};
-  GskGLRenderOffscreen mask_offscreen = {0};
-
-  source_offscreen.bounds = &node->bounds;
-  source_offscreen.force_offscreen = TRUE;
-  source_offscreen.reset_clip = TRUE;
-
-  mask_offscreen.bounds = &node->bounds;
-  mask_offscreen.force_offscreen = TRUE;
-  mask_offscreen.reset_clip = TRUE;
-  mask_offscreen.do_not_cache = TRUE;
-
-  /* TODO: We create 2 textures here as big as the mask node, but both
-   * nodes might be a lot smaller than that.
-   */
-  if (!gsk_gl_render_job_visit_node_with_offscreen (job, source, &source_offscreen))
-    {
-      gsk_gl_render_job_visit_node (job, source);
-      return;
-    }
-
-  g_assert (source_offscreen.was_offscreen);
-
-  if (!gsk_gl_render_job_visit_node_with_offscreen (job, mask, &mask_offscreen))
-    {
-      return;
-    }
-
-  g_assert (mask_offscreen.was_offscreen);
-
-  gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, mask));
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_SHARED_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE0,
-                                      source_offscreen.texture_id);
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_MASK_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE1,
-                                      mask_offscreen.texture_id);
-  gsk_gl_program_set_uniform1i (job->current_program,
-                                UNIFORM_MASK_MODE, 0,
-                                gsk_mask_node_get_mask_mode (node));
-  gsk_gl_render_job_draw_offscreen_rect (job, &node->bounds);
-  gsk_gl_render_job_end_draw (job);
-}
-
 static inline void
 gsk_gl_render_job_visit_color_matrix_node (GskGLRenderJob      *job,
                                           const GskRenderNode *node)
@@ -3512,13 +3443,9 @@ gsk_gl_render_job_visit_gl_shader_node (GskGLRenderJob      *job,
 static void
 gsk_gl_render_job_upload_texture (GskGLRenderJob       *job,
                                  GdkTexture           *texture,
-                                  int                   min_filter,
-                                  int                   mag_filter,
                                  GskGLRenderOffscreen *offscreen)
 {
-  if (min_filter == GL_LINEAR &&
-      mag_filter == GL_LINEAR &&
-      gsk_gl_texture_library_can_cache ((GskGLTextureLibrary *)job->driver->icons_library,
+  if (gsk_gl_texture_library_can_cache ((GskGLTextureLibrary *)job->driver->icons_library,
                                        texture->width,
                                        texture->height) &&
      !GDK_IS_GL_TEXTURE (texture))
@@ -3531,16 +3458,16 @@ gsk_gl_render_job_upload_texture (GskGLRenderJob       *job,
    }
  else
    {
-      offscreen->texture_id = gsk_gl_driver_load_texture (job->driver, texture, min_filter, mag_filter);
+      offscreen->texture_id = gsk_gl_driver_load_texture (job->driver, texture, GL_LINEAR, GL_LINEAR);
      init_full_texture_region (offscreen);
    }
 }

 static inline void
-gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
-                                 GdkTexture            *texture,
-                                 const graphene_rect_t *bounds)
+gsk_gl_render_job_visit_texture_node (GskGLRenderJob      *job,
+                                      const GskRenderNode *node)
 {
+  GdkTexture *texture = gsk_texture_node_get_texture (node);
  int max_texture_size = job->command_queue->max_texture_size;

  if G_LIKELY (texture->width <= max_texture_size &&
@@ -3548,7 +3475,7 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
    {
      GskGLRenderOffscreen offscreen = {0};

-      gsk_gl_render_job_upload_texture (job, texture, GL_LINEAR, GL_LINEAR, &offscreen);
+      gsk_gl_render_job_upload_texture (job, texture, &offscreen);

      g_assert (offscreen.texture_id);
      g_assert (offscreen.was_offscreen == FALSE);
@@ -3559,21 +3486,21 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
                                          GL_TEXTURE_2D,
                                          GL_TEXTURE0,
                                          offscreen.texture_id);
-      gsk_gl_render_job_draw_offscreen (job, bounds, &offscreen);
+      gsk_gl_render_job_draw_offscreen (job, &node->bounds, &offscreen);
      gsk_gl_render_job_end_draw (job);
    }
  else
    {
-      float min_x = job->offset_x + bounds->origin.x;
-      float min_y = job->offset_y + bounds->origin.y;
-      float max_x = min_x + bounds->size.width;
-      float max_y = min_y + bounds->size.height;
+      float min_x = job->offset_x + node->bounds.origin.x;
+      float min_y = job->offset_y + node->bounds.origin.y;
+      float max_x = min_x + node->bounds.size.width;
+      float max_y = min_y + node->bounds.size.height;
      float scale_x = (max_x - min_x) / texture->width;
      float scale_y = (max_y - min_y) / texture->height;
      GskGLTextureSlice *slices = NULL;
      guint n_slices = 0;

-      gsk_gl_driver_slice_texture (job->driver, texture, GL_NEAREST, GL_NEAREST, 0, 0, &slices, &n_slices);
+      gsk_gl_driver_slice_texture (job->driver, texture, &slices, &n_slices);

      g_assert (slices != NULL);
      g_assert (n_slices > 0);
@@ -3608,122 +3535,6 @@ gsk_gl_render_job_visit_texture (GskGLRenderJob        *job,
    }
 }

-static inline void
-gsk_gl_render_job_visit_texture_node (GskGLRenderJob      *job,
-                                      const GskRenderNode *node)
-{
-  GdkTexture *texture = gsk_texture_node_get_texture (node);
-  const graphene_rect_t *bounds = &node->bounds;
-
-  gsk_gl_render_job_visit_texture (job, texture, bounds);
-}
-
-static inline void
-gsk_gl_render_job_visit_texture_scale_node (GskGLRenderJob      *job,
-                                            const GskRenderNode *node)
-{
-  GdkTexture *texture = gsk_texture_scale_node_get_texture (node);
-  const graphene_rect_t *bounds = &node->bounds;
-  GskScalingFilter scaling_filter = gsk_texture_scale_node_get_filter (node);
-  int min_filters[] = { GL_LINEAR, GL_NEAREST, GL_LINEAR_MIPMAP_LINEAR };
-  int mag_filters[] = { GL_LINEAR, GL_NEAREST, GL_LINEAR };
-  int min_filter = min_filters[scaling_filter];
-  int mag_filter = mag_filters[scaling_filter];
-  int max_texture_size = job->command_queue->max_texture_size;
-  graphene_rect_t clip_rect;
-  GskGLRenderTarget *render_target;
-  GskGLRenderOffscreen offscreen = {0};
-  graphene_rect_t viewport;
-  graphene_rect_t prev_viewport;
-  graphene_matrix_t prev_projection;
-  float prev_alpha;
-  guint prev_fbo;
-  guint texture_id;
-  float u0, u1, v0, v1;
-
-  gsk_gl_render_job_untransform_bounds (job, &job->current_clip->rect.bounds, &clip_rect);
-  if (!graphene_rect_intersection (bounds, &clip_rect, &clip_rect))
-    return;
-
-  if G_UNLIKELY (clip_rect.size.width > max_texture_size ||
-                 clip_rect.size.height > max_texture_size)
-    {
-      gsk_gl_render_job_visit_texture (job, texture, bounds);
-      return;
-    }
-
-  viewport = GRAPHENE_RECT_INIT (0, 0,
-                                 clip_rect.size.width,
-                                 clip_rect.size.height);
-
-  if (!gsk_gl_driver_create_render_target (job->driver,
-                                           (int) ceilf (clip_rect.size.width),
-                                           (int) ceilf (clip_rect.size.height),
-                                           get_target_format (job, node),
-                                           GL_LINEAR, GL_LINEAR,
-                                           &render_target))
-    {
-      gsk_gl_render_job_visit_texture (job, texture, bounds);
-      return;
-    }
-
-  gsk_gl_render_job_upload_texture (job, texture, min_filter, mag_filter, &offscreen);
-
-  g_assert (offscreen.texture_id);
-  g_assert (offscreen.was_offscreen == FALSE);
-
-  u0 = (clip_rect.origin.x - bounds->origin.x) / bounds->size.width;
-  v0 = (clip_rect.origin.y - bounds->origin.y) / bounds->size.height;
-  u1 = (clip_rect.origin.x + clip_rect.size.width - bounds->origin.x) / bounds->size.width;
-  v1 = (clip_rect.origin.y + clip_rect.size.height - bounds->origin.y) / bounds->size.height;
-
-  gsk_gl_render_job_set_viewport (job, &viewport, &prev_viewport);
-  gsk_gl_render_job_set_projection_from_rect (job, &viewport, &prev_projection);
-  gsk_gl_render_job_set_modelview (job, NULL);
-  prev_alpha = gsk_gl_render_job_set_alpha (job, 1.0f);
-  gsk_gl_render_job_push_clip (job, &GSK_ROUNDED_RECT_INIT_FROM_RECT (viewport));
-
-  prev_fbo = gsk_gl_command_queue_bind_framebuffer (job->command_queue, render_target->framebuffer_id);
-  gsk_gl_command_queue_clear (job->command_queue, 0, &viewport);
-
-  gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_SHARED_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE0,
-                                      offscreen.texture_id);
-  gsk_gl_render_job_draw_coords (job,
-                                 0, 0, clip_rect.size.width, clip_rect.size.height,
-                                 u0, v0, u1, v1,
-                                 (guint16[]) { FP16_ZERO, FP16_ZERO, FP16_ZERO, FP16_ZERO });
-  gsk_gl_render_job_end_draw (job);
-
-  gsk_gl_render_job_pop_clip (job);
-  gsk_gl_render_job_pop_modelview (job);
-  gsk_gl_render_job_set_viewport (job, &prev_viewport, NULL);
-  gsk_gl_render_job_set_projection (job, &prev_projection);
-  gsk_gl_render_job_set_alpha (job, prev_alpha);
-  gsk_gl_command_queue_bind_framebuffer (job->command_queue, prev_fbo);
-
-  texture_id = gsk_gl_driver_release_render_target (job->driver, render_target, FALSE);
-
-  gsk_gl_render_job_begin_draw (job, CHOOSE_PROGRAM (job, blit));
-  gsk_gl_program_set_uniform_texture (job->current_program,
-                                      UNIFORM_SHARED_SOURCE, 0,
-                                      GL_TEXTURE_2D,
-                                      GL_TEXTURE0,
-                                      texture_id);
-  gsk_gl_render_job_draw_coords (job,
-                                 job->offset_x + clip_rect.origin.x,
-                                 job->offset_y + clip_rect.origin.y,
-                                 job->offset_x + clip_rect.origin.x + clip_rect.size.width,
-                                 job->offset_y + clip_rect.origin.y + clip_rect.size.height,
-                                 0, clip_rect.size.width / ceilf (clip_rect.size.width),
-                                 clip_rect.size.height / ceilf (clip_rect.size.height), 0,
-                                 (guint16[]){ FP16_ZERO, FP16_ZERO, FP16_ZERO, FP16_ZERO } );
-  gsk_gl_render_job_end_draw (job);
-}
-
 static inline void
 gsk_gl_render_job_visit_repeat_node (GskGLRenderJob      *job,
                                     const GskRenderNode *node)
@@ -3909,10 +3720,6 @@ gsk_gl_render_job_visit_node (GskGLRenderJob      *job,
        gsk_gl_render_job_visit_as_fallback (job, node);
    break;

-    case GSK_MASK_NODE:
-      gsk_gl_render_job_visit_mask_node (job, node);
-    break;
-
    case GSK_OPACITY_NODE:
      gsk_gl_render_job_visit_opacity_node (job, node);
    break;
@@ -3955,10 +3762,6 @@ gsk_gl_render_job_visit_node (GskGLRenderJob      *job,
      gsk_gl_render_job_visit_texture_node (job, node);
    break;

-    case GSK_TEXTURE_SCALE_NODE:
-      gsk_gl_render_job_visit_texture_scale_node (job, node);
-    break;
-
    case GSK_TRANSFORM_NODE:
      gsk_gl_render_job_visit_transform_node (job, node);
    break;
@@ -4005,7 +3808,7 @@ gsk_gl_render_job_visit_node_with_offscreen (GskGLRenderJob       *job,
      offscreen->force_offscreen == FALSE)
    {
      GdkTexture *texture = gsk_texture_node_get_texture (node);
-      gsk_gl_render_job_upload_texture (job, texture, GL_LINEAR, GL_LINEAR, offscreen);
+      gsk_gl_render_job_upload_texture (job, texture, offscreen);
      g_assert (offscreen->was_offscreen == FALSE);
      return TRUE;
    }
@@ -112,8 +112,7 @@ gsk_gl_texture_library_real_compact (GskGLTextureLibrary *self,
            {
              if (!entry->accessed)
                {
-                  if (entry->texture)
-                    gsk_gl_driver_release_texture (self->driver, entry->texture);
+                  gsk_gl_driver_release_texture (self->driver, entry->texture);
                  g_hash_table_iter_remove (&iter);
                  dropped++;
                }
@@ -1,33 +0,0 @@
-// VERTEX_SHADER:
-// mask.glsl
-
-void main() {
-  gl_Position = u_projection * u_modelview * vec4(aPosition, 0.0, 1.0);
-
-  vUv = vec2(aUv.x, aUv.y);
-}
-
-// FRAGMENT_SHADER:
-// mask.glsl
-
-uniform int u_mode;
-uniform sampler2D u_mask;
-
-void main() {
-  vec4 source = GskTexture(u_source, vUv);
-  vec4 mask = GskTexture(u_mask, vUv);
-  float mask_value;
-
-  if (u_mode == 0)
-    mask_value = mask.a;
-  else if (u_mode == 1)
-    mask_value = 1.0 - mask.a;
-  else if (u_mode == 2)
-    mask_value = (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
-  else if (u_mode == 3)
-    mask_value = 1.0 - (0.2126 * mask.r + 0.7152 * mask.g + 0.0722 * mask.b) * mask.a;
-  else
-    mask_value = 0.0;
-
-  gskSetOutputColor(vec4 (source * mask_value));
-}
@@ -50,8 +50,6 @@
 * @GSK_BLUR_NODE: A node that applies a blur
 * @GSK_DEBUG_NODE: Debug information that does not affect the rendering
 * @GSK_GL_SHADER_NODE: A node that uses OpenGL fragment shaders to render
- * @GSK_TEXTURE_SCALE_NODE: A node drawing a `GdkTexture` scaled and filtered (Since: 4.10)
- * @GSK_MASK_NODE: A node that masks one child with another (Since: 4.10)
 
 * The type of a node determines what the node is rendering.
 */
@@ -81,9 +79,7 @@ typedef enum {
  GSK_TEXT_NODE,
  GSK_BLUR_NODE,
  GSK_DEBUG_NODE,
-  GSK_GL_SHADER_NODE,
-  GSK_TEXTURE_SCALE_NODE,
-  GSK_MASK_NODE
+  GSK_GL_SHADER_NODE
 } GskRenderNodeType;

 /**
@@ -255,25 +251,5 @@ typedef enum
  GSK_GL_UNIFORM_TYPE_VEC4,
 } GskGLUniformType;

-/**
- * GskMaskMode:
- * @GSK_MASK_MODE_ALPHA: Use the alpha channel of the mask
- * @GSK_MASK_MODE_INVERTED_ALPHA: Use the inverted alpha channel of the mask
- * @GSK_MASK_MODE_LUMINANCE: Use the luminance of the mask,
- *     multiplied by mask alpha
- * @GSK_MASK_MODE_INVERTED_LUMINANCE: Use the inverted luminance of the mask,
- *     multiplied by mask alpha
- *
- * The mask modes available for mask nodes.
- *
- * Since: 4.10
- */
-typedef enum
-{
-  GSK_MASK_MODE_ALPHA,
-  GSK_MASK_MODE_INVERTED_ALPHA,
-  GSK_MASK_MODE_LUMINANCE,
-  GSK_MASK_MODE_INVERTED_LUMINANCE
-} GskMaskMode;

 #endif /* __GSK_TYPES_H__ */
@@ -142,7 +142,6 @@ GskRenderNode *         gsk_render_node_deserialize             (GBytes
 #define GSK_TYPE_DEBUG_NODE                     (gsk_debug_node_get_type())
 #define GSK_TYPE_COLOR_NODE                     (gsk_color_node_get_type())
 #define GSK_TYPE_TEXTURE_NODE                   (gsk_texture_node_get_type())
-#define GSK_TYPE_TEXTURE_SCALE_NODE             (gsk_texture_scale_node_get_type())
 #define GSK_TYPE_LINEAR_GRADIENT_NODE           (gsk_linear_gradient_node_get_type())
 #define GSK_TYPE_REPEATING_LINEAR_GRADIENT_NODE (gsk_repeating_linear_gradient_node_get_type())
 #define GSK_TYPE_RADIAL_GRADIENT_NODE           (gsk_radial_gradient_node_get_type())
@@ -164,13 +163,11 @@ GskRenderNode *         gsk_render_node_deserialize             (GBytes
 #define GSK_TYPE_CROSS_FADE_NODE                (gsk_cross_fade_node_get_type())
 #define GSK_TYPE_TEXT_NODE                      (gsk_text_node_get_type())
 #define GSK_TYPE_BLUR_NODE                      (gsk_blur_node_get_type())
-#define GSK_TYPE_MASK_NODE                      (gsk_mask_node_get_type())
 #define GSK_TYPE_GL_SHADER_NODE                 (gsk_gl_shader_node_get_type())

 typedef struct _GskDebugNode                    GskDebugNode;
 typedef struct _GskColorNode                    GskColorNode;
 typedef struct _GskTextureNode                  GskTextureNode;
-typedef struct _GskTextureScaleNode             GskTextureScaleNode;
 typedef struct _GskLinearGradientNode           GskLinearGradientNode;
 typedef struct _GskRepeatingLinearGradientNode  GskRepeatingLinearGradientNode;
 typedef struct _GskRadialGradientNode           GskRadialGradientNode;
@@ -192,7 +189,6 @@ typedef struct _GskBlendNode                    GskBlendNode;
 typedef struct _GskCrossFadeNode                GskCrossFadeNode;
 typedef struct _GskTextNode                     GskTextNode;
 typedef struct _GskBlurNode                     GskBlurNode;
-typedef struct _GskMaskNode                     GskMaskNode;
 typedef struct _GskGLShaderNode                 GskGLShaderNode;

 GDK_AVAILABLE_IN_ALL
@@ -221,17 +217,6 @@ GskRenderNode *         gsk_texture_node_new                    (GdkTexture
 GDK_AVAILABLE_IN_ALL
 GdkTexture *            gsk_texture_node_get_texture            (const GskRenderNode      *node) G_GNUC_PURE;

-GDK_AVAILABLE_IN_4_10
-GType                   gsk_texture_scale_node_get_type         (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_4_10
-GskRenderNode *         gsk_texture_scale_node_new              (GdkTexture               *texture,
-                                                                 const graphene_rect_t    *bounds,
-                                                                 GskScalingFilter          filter);
-GDK_AVAILABLE_IN_4_10
-GdkTexture *            gsk_texture_scale_node_get_texture      (const GskRenderNode      *node) G_GNUC_PURE;
-GDK_AVAILABLE_IN_4_10
-GskScalingFilter        gsk_texture_scale_node_get_filter       (const GskRenderNode      *node) G_GNUC_PURE;
-
 GDK_AVAILABLE_IN_ALL
 GType                   gsk_linear_gradient_node_get_type           (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
@@ -531,21 +516,8 @@ GskRenderNode *         gsk_blur_node_get_child                 (const GskRender
 GDK_AVAILABLE_IN_ALL
 float                   gsk_blur_node_get_radius                (const GskRenderNode      *node) G_GNUC_PURE;

-GDK_AVAILABLE_IN_4_10
-GType                  gsk_mask_node_get_type                   (void) G_GNUC_CONST;
-GDK_AVAILABLE_IN_4_10
-GskRenderNode *        gsk_mask_node_new                        (GskRenderNode            *source,
-                                                                 GskRenderNode            *mask,
-                                                                 GskMaskMode               mask_mode);
-GDK_AVAILABLE_IN_4_10
-GskRenderNode *        gsk_mask_node_get_source                 (const GskRenderNode      *node);
-GDK_AVAILABLE_IN_4_10
-GskRenderNode *        gsk_mask_node_get_mask                   (const GskRenderNode      *node);
-GDK_AVAILABLE_IN_4_10
-GskMaskMode            gsk_mask_node_get_mask_mode              (const GskRenderNode      *node);
-
 GDK_AVAILABLE_IN_ALL
-GType                   gsk_gl_shader_node_get_type             (void) G_GNUC_CONST;
+GType                   gsk_gl_shader_node_get_type              (void) G_GNUC_CONST;
 GDK_AVAILABLE_IN_ALL
 GskRenderNode *         gsk_gl_shader_node_new                  (GskGLShader              *shader,
                                                                 const graphene_rect_t    *bounds,
@@ -58,17 +58,7 @@ rectangle_init_from_graphene (cairo_rectangle_int_t *cairo,
  cairo->height = ceilf (graphene->origin.y + graphene->size.height) - cairo->y;
 }

-static void
-_graphene_rect_init_from_clip_extents (graphene_rect_t *rect,
-                                       cairo_t         *cr)
-{
-  double x1c, y1c, x2c, y2c;
-
-  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
-  graphene_rect_init (rect, x1c, y1c, x2c - x1c, y2c - y1c);
-}
-
-/* {{{ GSK_COLOR_NODE */
+/*** GSK_COLOR_NODE ***/

 /**
 * GskColorNode:
@@ -157,8 +147,7 @@ gsk_color_node_new (const GdkRGBA         *rgba,
  return node;
 }

-/* }}} */
-/* {{{ GSK_LINEAR_GRADIENT_NODE */
+/*** GSK_LINEAR_GRADIENT_NODE ***/

 /**
 * GskRepeatingLinearGradientNode:
@@ -431,8 +420,7 @@ gsk_linear_gradient_node_get_color_stops (const GskRenderNode *node,
  return self->stops;
 }

-/* }}} */
-/* {{{ GSK_RADIAL_GRADIENT_NODE */
+/*** GSK_RADIAL_GRADIENT_NODE ***/

 /**
 * GskRepeatingRadialGradientNode:
@@ -802,8 +790,7 @@ gsk_radial_gradient_node_get_end (const GskRenderNode *node)
  return self->end;
 }

-/* }}} */
-/* {{{ GSK_CONIC_GRADIENT_NODE */
+/*** GSK_CONIC_GRADIENT_NODE ***/

 /**
 * GskConicGradientNode:
@@ -1160,8 +1147,7 @@ gsk_conic_gradient_node_get_angle (const GskRenderNode *node)
  return self->angle;
 }

-/* }}} */
-/* {{{ GSK_BORDER_NODE */
+/*** GSK_BORDER_NODE ***/

 /**
 * GskBorderNode:
@@ -1473,8 +1459,7 @@ gsk_border_node_get_uniform_color (const GskRenderNode *self)
  return node->uniform_color;
 }

-/* }}} */
-/* {{{ GSK_TEXTURE_NODE */
+/*** GSK_TEXTURE_NODE ***/

 /**
 * GskTextureNode:
@@ -1591,201 +1576,7 @@ gsk_texture_node_new (GdkTexture            *texture,
  return node;
 }

-/* }}} */
-/* {{{ GSK_TEXTURE_SCALE_NODE */
-
-/**
- * GskTextureScaleNode:
- *
- * A render node for a `GdkTexture`.
- *
- * Since: 4.10
- */
-struct _GskTextureScaleNode
-{
-  GskRenderNode render_node;
-
-  GdkTexture *texture;
-  GskScalingFilter filter;
-};
-
-static void
-gsk_texture_scale_node_finalize (GskRenderNode *node)
-{
-  GskTextureScaleNode *self = (GskTextureScaleNode *) node;
-  GskRenderNodeClass *parent_class = g_type_class_peek (g_type_parent (GSK_TYPE_TEXTURE_SCALE_NODE));
-
-  g_clear_object (&self->texture);
-
-  parent_class->finalize (node);
-}
-
-static void
-gsk_texture_scale_node_draw (GskRenderNode *node,
-                             cairo_t       *cr)
-{
-  GskTextureScaleNode *self = (GskTextureScaleNode *) node;
-  cairo_surface_t *surface;
-  cairo_pattern_t *pattern;
-  cairo_matrix_t matrix;
-  cairo_filter_t filters[] = {
-    CAIRO_FILTER_BILINEAR,
-    CAIRO_FILTER_NEAREST,
-    CAIRO_FILTER_GOOD,
-  };
-  cairo_t *cr2;
-  cairo_surface_t *surface2;
-  graphene_rect_t clip_rect;
-
-  /* Make sure we draw the minimum region by using the clip */
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (clip_rect.size.width <= 0 || clip_rect.size.height <= 0)
-    return;
-
-  surface2 = cairo_image_surface_create (CAIRO_FORMAT_ARGB32,
-                                         (int) ceilf (clip_rect.size.width),
-                                         (int) ceilf (clip_rect.size.height));
-  cairo_surface_set_device_offset (surface2, -clip_rect.origin.x, -clip_rect.origin.y);
-  cr2 = cairo_create (surface2);
-
-  surface = gdk_texture_download_surface (self->texture);
-  pattern = cairo_pattern_create_for_surface (surface);
-  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
-
-  cairo_matrix_init_scale (&matrix,
-                           gdk_texture_get_width (self->texture) / node->bounds.size.width,
-                           gdk_texture_get_height (self->texture) / node->bounds.size.height);
-  cairo_pattern_set_matrix (pattern, &matrix);
-  cairo_pattern_set_filter (pattern, filters[self->filter]);
-
-  cairo_set_source (cr2, pattern);
-  cairo_pattern_destroy (pattern);
-  cairo_surface_destroy (surface);
-
-  cairo_rectangle (cr2, 0, 0, node->bounds.size.width, node->bounds.size.height);
-  cairo_fill (cr2);
-
-  cairo_destroy (cr2);
-
-  cairo_save (cr);
-
-  pattern = cairo_pattern_create_for_surface (surface2);
-  cairo_pattern_set_extend (pattern, CAIRO_EXTEND_PAD);
-
-  cairo_matrix_init_identity (&matrix);
-  cairo_matrix_translate (&matrix,
-                          -node->bounds.origin.x,
-                          -node->bounds.origin.y);
-  cairo_pattern_set_matrix (pattern, &matrix);
-  cairo_set_source (cr, pattern);
-  cairo_pattern_destroy (pattern);
-  cairo_surface_destroy (surface2);
-
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_fill (cr);
-
-  cairo_restore (cr);
-}
-
-static void
-gsk_texture_scale_node_diff (GskRenderNode  *node1,
-                             GskRenderNode  *node2,
-                             cairo_region_t *region)
-{
-  GskTextureScaleNode *self1 = (GskTextureScaleNode *) node1;
-  GskTextureScaleNode *self2 = (GskTextureScaleNode *) node2;
-
-  if (graphene_rect_equal (&node1->bounds, &node2->bounds) &&
-      self1->texture == self2->texture &&
-      self1->filter == self2->filter)
-    return;
-
-  gsk_render_node_diff_impossible (node1, node2, region);
-}
-
-/**
- * gsk_texture_scale_node_get_texture:
- * @node: (type GskTextureScaleNode): a `GskRenderNode` of type %GSK_TEXTURE_SCALE_NODE
- *
- * Retrieves the `GdkTexture` used when creating this `GskRenderNode`.
- *
- * Returns: (transfer none): the `GdkTexture`
- *
- * Since: 4.10
- */
-GdkTexture *
-gsk_texture_scale_node_get_texture (const GskRenderNode *node)
-{
-  const GskTextureScaleNode *self = (const GskTextureScaleNode *) node;
-
-  return self->texture;
-}
-
-/**
- * gsk_texture_scale_node_get_filter:
- * @node: (type GskTextureScaleNode): a `GskRenderNode` of type %GSK_TEXTURE_SCALE_NODE
- *
- * Retrieves the `GskScalingFilter` used when creating this `GskRenderNode`.
- *
- * Returns: (transfer none): the `GskScalingFilter`
- *
- * Since: 4.10
- */
-GskScalingFilter
-gsk_texture_scale_node_get_filter (const GskRenderNode *node)
-{
-  const GskTextureScaleNode *self = (const GskTextureScaleNode *) node;
-
-  return self->filter;
-}
-
-/**
- * gsk_texture_scale_node_new:
- * @texture: the texture to scale
- * @bounds: the size of the texture to scale to
- * @filter: how to scale the texture
- *
- * Creates a node that scales the texture to the size given by the
- * bounds and the filter and then places it at the bounds' position.
- *
- * This node is intended for tight control over scaling applied
- * to a texture, such as in image editors and requires the
- * application to be aware of the whole render tree as further
- * transforms may be applied that conflict with the desired effect
- * of this node.
- *
- * Returns: (transfer full) (type GskTextureScaleNode): A new `GskRenderNode`
- *
- * Since: 4.10
- */
-GskRenderNode *
-gsk_texture_scale_node_new (GdkTexture            *texture,
-                            const graphene_rect_t *bounds,
-                            GskScalingFilter       filter)
-{
-  GskTextureScaleNode *self;
-  GskRenderNode *node;
-
-  g_return_val_if_fail (GDK_IS_TEXTURE (texture), NULL);
-  g_return_val_if_fail (bounds != NULL, NULL);
-
-  self = gsk_render_node_alloc (GSK_TEXTURE_SCALE_NODE);
-  node = (GskRenderNode *) self;
-  node->offscreen_for_opacity = FALSE;
-
-  self->texture = g_object_ref (texture);
-  graphene_rect_init_from_rect (&node->bounds, bounds);
-  self->filter = filter;
-
-  node->prefers_high_depth = gdk_memory_format_prefers_high_depth (gdk_texture_get_format (texture));
-
-  return node;
-}
-
-/* }}} */
-/* {{{ GSK_INSET_SHADOW_NODE */
+/*** GSK_INSET_SHADOW_NODE ***/

 /**
 * GskInsetShadowNode:
@@ -2088,15 +1879,15 @@ gsk_inset_shadow_node_draw (GskRenderNode *node,
  GskInsetShadowNode *self = (GskInsetShadowNode *) node;
  GskRoundedRect box, clip_box;
  int clip_radius;
-  graphene_rect_t clip_rect;
+  double x1c, y1c, x2c, y2c;
  double blur_radius;

  /* We don't need to draw invisible shadows */
  if (gdk_rgba_is_clear (&self->color))
    return;

-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (!gsk_rounded_rect_intersects_rect (&self->outline, &clip_rect))
+  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
+  if (!gsk_rounded_rect_intersects_rect (&self->outline, &GRAPHENE_RECT_INIT (x1c, y1c, x2c - x1c, y2c - y1c)))
    return;

  blur_radius = self->blur_radius / 2;
@@ -2341,8 +2132,7 @@ gsk_inset_shadow_node_get_blur_radius (const GskRenderNode *node)
  return self->blur_radius;
 }

-/* }}} */
-/* {{{ GSK_OUTSET_SHADOW_NODE */
+/*** GSK_OUTSET_SHADOW_NODE ***/

 /**
 * GskOutsetShadowNode:
@@ -2384,7 +2174,7 @@ gsk_outset_shadow_node_draw (GskRenderNode *node,
  GskOutsetShadowNode *self = (GskOutsetShadowNode *) node;
  GskRoundedRect box, clip_box;
  int clip_radius;
-  graphene_rect_t clip_rect;
+  double x1c, y1c, x2c, y2c;
  float top, right, bottom, left;
  double blur_radius;

@@ -2392,8 +2182,8 @@ gsk_outset_shadow_node_draw (GskRenderNode *node,
  if (gdk_rgba_is_clear (&self->color))
    return;

-  _graphene_rect_init_from_clip_extents (&clip_rect, cr);
-  if (!gsk_rounded_rect_intersects_rect (&self->outline, &clip_rect))
+  cairo_clip_extents (cr, &x1c, &y1c, &x2c, &y2c);
+  if (gsk_rounded_rect_contains_rect (&self->outline, &GRAPHENE_RECT_INIT (x1c, y1c, x2c - x1c, y2c - y1c)))
    return;

  blur_radius = self->blur_radius / 2;
@@ -2648,8 +2438,7 @@ gsk_outset_shadow_node_get_blur_radius (const GskRenderNode *node)
  return self->blur_radius;
 }

-/* }}} */
-/* {{{ GSK_CAIRO_NODE */
+/*** GSK_CAIRO_NODE ***/

 /**
 * GskCairoNode:
@@ -2787,8 +2576,7 @@ gsk_cairo_node_get_draw_context (GskRenderNode *node)
  return res;
 }

-/* }}} */
-/* {{{ GSK_CONTAINER_NODE */
+/**** GSK_CONTAINER_NODE ***/

 /**
 * GskContainerNode:
@@ -3047,8 +2835,7 @@ gsk_container_node_is_disjoint (const GskRenderNode *node)
  return self->disjoint;
 }

-/* }}} */
-/* {{{ GSK_TRANSFORM_NODE */
+/*** GSK_TRANSFORM_NODE ***/

 /**
 * GskTransformNode:
@@ -3271,8 +3058,7 @@ gsk_transform_node_get_translate (const GskRenderNode *node,
  *dy = self->dy;
 }

-/* }}} */
-/* {{{ GSK_OPACITY_NODE */
+/*** GSK_OPACITY_NODE ***/

 /**
 * GskOpacityNode:
@@ -3399,8 +3185,7 @@ gsk_opacity_node_get_opacity (const GskRenderNode *node)
  return self->opacity;
 }

-/* }}} */
-/* {{{ GSK_COLOR_MATRIX_NODE */
+/*** GSK_COLOR_MATRIX_NODE ***/

 /**
 * GskColorMatrixNode:
@@ -3428,18 +3213,29 @@ gsk_color_matrix_node_finalize (GskRenderNode *node)
 }

 static void
-apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,
-                               const graphene_matrix_t *color_matrix,
-                               const graphene_vec4_t   *color_offset,
-                               gboolean                 multiply_alpha)
+gsk_color_matrix_node_draw (GskRenderNode *node,
+                            cairo_t       *cr)
 {
+  GskColorMatrixNode *self = (GskColorMatrixNode *) node;
+  cairo_pattern_t *pattern;
  cairo_surface_t *surface, *image_surface;
+  graphene_vec4_t pixel;
+  guint32* pixel_data;
  guchar *data;
  gsize x, y, width, height, stride;
  float alpha;
-  graphene_vec4_t pixel;
-  guint32* pixel_data;

+  cairo_save (cr);
+
+  /* clip so the push_group() creates a smaller surface */
+  gsk_cairo_rectangle (cr, &node->bounds);
+  cairo_clip (cr);
+
+  cairo_push_group (cr);
+
+  gsk_render_node_draw (self->child, cr);
+
+  pattern = cairo_pop_group (cr);
  cairo_pattern_get_surface (pattern, &surface);
  image_surface = cairo_surface_map_to_image (surface, NULL);

@@ -3466,20 +3262,12 @@ apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,
                                  ((pixel_data[x] >>  8) & 0xFF) / (255.0 * alpha),
                                  ( pixel_data[x]        & 0xFF) / (255.0 * alpha),
                                  alpha);
-              graphene_matrix_transform_vec4 (color_matrix, &pixel, &pixel);
+              graphene_matrix_transform_vec4 (&self->color_matrix, &pixel, &pixel);
            }

-          if (multiply_alpha)
-            graphene_vec4_init (&pixel,
-                                graphene_vec4_get_x (&pixel),
-                                graphene_vec4_get_y (&pixel),
-                                graphene_vec4_get_z (&pixel),
-                                alpha * graphene_vec4_get_w (&pixel));
-
-          graphene_vec4_add (&pixel, color_offset, &pixel);
+          graphene_vec4_add (&pixel, &self->color_offset, &pixel);

          alpha = graphene_vec4_get_w (&pixel);
-
          if (alpha > 0.0)
            {
              alpha = MIN (alpha, 1.0);
@@ -3498,28 +3286,6 @@ apply_color_matrix_to_pattern (cairo_pattern_t         *pattern,

  cairo_surface_mark_dirty (image_surface);
  cairo_surface_unmap_image (surface, image_surface);
-}
-
-static void
-gsk_color_matrix_node_draw (GskRenderNode *node,
-                            cairo_t       *cr)
-{
-  GskColorMatrixNode *self = (GskColorMatrixNode *) node;
-  cairo_pattern_t *pattern;
-
-  cairo_save (cr);
-
-  /* clip so the push_group() creates a smaller surface */
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-
-  cairo_push_group (cr);
-
-  gsk_render_node_draw (self->child, cr);
-
-  pattern = cairo_pop_group (cr);
-
-  apply_color_matrix_to_pattern (pattern, &self->color_matrix, &self->color_offset, FALSE);

  cairo_set_source (cr, pattern);
  cairo_paint (cr);
@@ -3640,8 +3406,7 @@ gsk_color_matrix_node_get_color_offset (const GskRenderNode *node)
  return &self->color_offset;
 }

-/* }}} */
-/* {{{ GSK_REPEAT_NODE */
+/*** GSK_REPEAT_NODE ***/

 /**
 * GskRepeatNode:
@@ -3777,8 +3542,7 @@ gsk_repeat_node_get_child_bounds (const GskRenderNode *node)
  return &self->child_bounds;
 }

-/* }}} */
-/* {{{ GSK_CLIP_NODE */
+/*** GSK_CLIP_NODE ***/

 /**
 * GskClipNode:
@@ -3912,8 +3676,7 @@ gsk_clip_node_get_clip (const GskRenderNode *node)
  return &self->clip;
 }

-/* }}} */
-/* {{{ GSK_ROUNDED_CLIP_NODE */
+/*** GSK_ROUNDED_CLIP_NODE ***/

 /**
 * GskRoundedClipNode:
@@ -4047,8 +3810,7 @@ gsk_rounded_clip_node_get_clip (const GskRenderNode *node)
  return &self->clip;
 }

-/* }}} */
-/* {{{ GSK_SHADOW_NODE */
+/*** GSK_SHADOW_NODE ***/

 /**
 * GskShadowNode:
@@ -4288,8 +4050,7 @@ gsk_shadow_node_get_n_shadows (const GskRenderNode *node)
  return self->n_shadows;
 }

-/* }}} */
-/* {{{ GSK_BLEND_NODE */
+/*** GSK_BLEND_NODE ***/

 /**
 * GskBlendNode:
@@ -4483,8 +4244,7 @@ gsk_blend_node_get_blend_mode (const GskRenderNode *node)
  return self->blend_mode;
 }

-/* }}} */
-/* {{{ GSK_CROSS_FADE_NODE */
+/*** GSK_CROSS_FADE_NODE ***/

 /**
 * GskCrossFadeNode:
@@ -4635,8 +4395,7 @@ gsk_cross_fade_node_get_progress (const GskRenderNode *node)
  return self->progress;
 }

-/* }}} */
-/* {{{ GSK_TEXT_NODE */
+/*** GSK_TEXT_NODE ***/

 /**
 * GskTextNode:
@@ -4901,8 +4660,7 @@ gsk_text_node_get_offset (const GskRenderNode *node)
  return &self->offset;
 }

-/* }}} */
-/* {{{ GSK_BLUR_NODE */
+/*** GSK_BLUR_NODE ***/

 /**
 * GskBlurNode:
@@ -5221,201 +4979,7 @@ gsk_blur_node_get_radius (const GskRenderNode *node)
  return self->radius;
 }

-/* }}} */
-/* {{{ GSK_MASK_NODE */
-
-/**
- * GskMaskNode:
- *
- * A render node masking one child node with another.
- *
- * Since: 4.10
- */
-typedef struct _GskMaskNode GskMaskNode;
-
-struct _GskMaskNode
-{
-  GskRenderNode render_node;
-
-  GskRenderNode *mask;
-  GskRenderNode *source;
-  GskMaskMode mask_mode;
-};
-
-static void
-gsk_mask_node_finalize (GskRenderNode *node)
-{
-  GskMaskNode *self = (GskMaskNode *) node;
-
-  gsk_render_node_unref (self->source);
-  gsk_render_node_unref (self->mask);
-}
-
-static void
-gsk_mask_node_draw (GskRenderNode *node,
-                    cairo_t       *cr)
-{
-  GskMaskNode *self = (GskMaskNode *) node;
-  cairo_pattern_t *mask_pattern;
-  graphene_matrix_t color_matrix;
-  graphene_vec4_t color_offset;
-
-  cairo_push_group (cr);
-  gsk_render_node_draw (self->source, cr);
-  cairo_pop_group_to_source (cr);
-
-  cairo_push_group (cr);
-  gsk_render_node_draw (self->mask, cr);
-  mask_pattern = cairo_pop_group (cr);
-
-  switch (self->mask_mode)
-    {
-    case GSK_MASK_MODE_ALPHA:
-      break;
-    case GSK_MASK_MODE_INVERTED_ALPHA:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, 0,
-                                                                 0, 1, 0, 0,
-                                                                 0, 0, 1, 0,
-                                                                 0, 0, 0, -1 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 1);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, FALSE);
-      break;
-    case GSK_MASK_MODE_LUMINANCE:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, 0.2126,
-                                                                 0, 1, 0, 0.7152,
-                                                                 0, 0, 1, 0.0722,
-                                                                 0, 0, 0, 0 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 0);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, TRUE);
-      break;
-    case GSK_MASK_MODE_INVERTED_LUMINANCE:
-      graphene_matrix_init_from_float (&color_matrix, (float[]){ 1, 0, 0, -0.2126,
-                                                                 0, 1, 0, -0.7152,
-                                                                 0, 0, 1, -0.0722,
-                                                                 0, 0, 0,  0 });
-      graphene_vec4_init (&color_offset, 0, 0, 0, 1);
-      apply_color_matrix_to_pattern (mask_pattern, &color_matrix, &color_offset, TRUE);
-      break;
-    default:
-      g_assert_not_reached ();
-    }
-
-  gsk_cairo_rectangle (cr, &node->bounds);
-  cairo_clip (cr);
-
-  cairo_mask (cr, mask_pattern);
-}
-
-static void
-gsk_mask_node_diff (GskRenderNode  *node1,
-                    GskRenderNode  *node2,
-                    cairo_region_t *region)
-{
-  GskMaskNode *self1 = (GskMaskNode *) node1;
-  GskMaskNode *self2 = (GskMaskNode *) node2;
-
-  gsk_render_node_diff (self1->source, self2->source, region);
-  gsk_render_node_diff (self1->mask, self2->mask, region);
-}
-
-/**
- * gsk_mask_node_new:
- * @source: The source node to be drawn
- * @mask: The node to be used as mask
- * @mask_mode: The mask mode to use
- *
- * Creates a `GskRenderNode` that will mask a given node by another.
- *
- * The @mask_mode determines how the 'mask values' are derived from
- * the colors of the @mask. Applying the mask consists of multiplying
- * the 'mask value' with the alpha of the source.
- *
- * Returns: (transfer full) (type GskMaskNode): A new `GskRenderNode`
- *
- * Since: 4.10
- */
-GskRenderNode *
-gsk_mask_node_new (GskRenderNode *source,
-                   GskRenderNode *mask,
-                   GskMaskMode    mask_mode)
-{
-  GskMaskNode *self;
-
-  g_return_val_if_fail (GSK_IS_RENDER_NODE (source), NULL);
-  g_return_val_if_fail (GSK_IS_RENDER_NODE (mask), NULL);
-
-  self = gsk_render_node_alloc (GSK_MASK_NODE);
-  self->source = gsk_render_node_ref (source);
-  self->mask = gsk_render_node_ref (mask);
-  self->mask_mode = mask_mode;
-
-  self->render_node.bounds = source->bounds;
-
-  self->render_node.prefers_high_depth = gsk_render_node_prefers_high_depth (source);
-
-  return &self->render_node;
-}
-
-/**
- * gsk_mask_node_get_source:
- * @node: (type GskMaskNode): a mask `GskRenderNode`
- *
- * Retrieves the source `GskRenderNode` child of the @node.
- *
- * Returns: (transfer none): the source child node
- *
- * Since: 4.10
- */
-GskRenderNode *
-gsk_mask_node_get_source (const GskRenderNode *node)
-{
-  const GskMaskNode *self = (const GskMaskNode *) node;
-
-  g_return_val_if_fail (GSK_IS_RENDER_NODE_TYPE (node, GSK_MASK_NODE), NULL);
-
-  return self->source;
-}
-
-/**
- * gsk_mask_node_get_mask:
- * @node: (type GskMaskNode): a mask `GskRenderNode`
- *
- * Retrieves the mask `GskRenderNode` child of the @node.
- *
- * Returns: (transfer none): the mask child node
- *
- * Since: 4.10
- */
-GskRenderNode *
-gsk_mask_node_get_mask (const GskRenderNode *node)
-{
-  const GskMaskNode *self = (const GskMaskNode *) node;
-
-  g_return_val_if_fail (GSK_IS_RENDER_NODE_TYPE (node, GSK_MASK_NODE), NULL);
-
-  return self->mask;
-}
-
-/**
- * gsk_mask_node_get_mask_mode:
- * @node: (type GskMaskNode): a blending `GskRenderNode`
- *
- * Retrieves the mask mode used by @node.
- *
- * Returns: the mask mode
- *
- * Since: 4.10
- */
-GskMaskMode
-gsk_mask_node_get_mask_mode (const GskRenderNode *node)
-{
-  const GskMaskNode *self = (const GskMaskNode *) node;
-
-  return self->mask_mode;
-}
-
-/* }}} */
-/* {{{ GSK_DEBUG_NODE */
+/*** GSK_DEBUG_NODE ***/

 /**
 * GskDebugNode:
@@ -5540,8 +5104,7 @@ gsk_debug_node_get_message (const GskRenderNode *node)
  return self->message;
 }

-/* }}} */
-/* {{{ GSK_GL_SHADER_NODE */
+/*** GSK_GL_SHADER_NODE ***/

 /**
 * GskGLShaderNode:
@@ -5746,8 +5309,6 @@ gsk_gl_shader_node_get_args (const GskRenderNode *node)
  return self->args;
 }

-/* }}} */
-
 GType gsk_render_node_types[GSK_RENDER_NODE_TYPE_N_TYPES];

 #ifndef I_
@@ -5772,7 +5333,6 @@ GSK_DEFINE_RENDER_NODE_TYPE (gsk_repeating_radial_gradient_node, GSK_REPEATING_R
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_conic_gradient_node, GSK_CONIC_GRADIENT_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_border_node, GSK_BORDER_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_texture_node, GSK_TEXTURE_NODE)
-GSK_DEFINE_RENDER_NODE_TYPE (gsk_texture_scale_node, GSK_TEXTURE_SCALE_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_inset_shadow_node, GSK_INSET_SHADOW_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_outset_shadow_node, GSK_OUTSET_SHADOW_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_transform_node, GSK_TRANSFORM_NODE)
@@ -5786,7 +5346,6 @@ GSK_DEFINE_RENDER_NODE_TYPE (gsk_blend_node, GSK_BLEND_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_cross_fade_node, GSK_CROSS_FADE_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_text_node, GSK_TEXT_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_blur_node, GSK_BLUR_NODE)
-GSK_DEFINE_RENDER_NODE_TYPE (gsk_mask_node, GSK_MASK_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_gl_shader_node, GSK_GL_SHADER_NODE)
 GSK_DEFINE_RENDER_NODE_TYPE (gsk_debug_node, GSK_DEBUG_NODE)

@@ -5953,22 +5512,6 @@ gsk_render_node_init_types_once (void)
    gsk_render_node_types[GSK_TEXTURE_NODE] = node_type;
  }

-  {
-    const GskRenderNodeTypeInfo node_info =
-    {
-      GSK_TEXTURE_SCALE_NODE,
-      sizeof (GskTextureScaleNode),
-      NULL,
-      gsk_texture_scale_node_finalize,
-      gsk_texture_scale_node_draw,
-      NULL,
-      gsk_texture_scale_node_diff,
-    };
-
-    GType node_type = gsk_render_node_type_register_static (I_("GskTextureScaleNode"), &node_info);
-    gsk_render_node_types[GSK_TEXTURE_SCALE_NODE] = node_type;
-  }
-
  {
    const GskRenderNodeTypeInfo node_info =
    {
@@ -6177,22 +5720,6 @@ gsk_render_node_init_types_once (void)
    gsk_render_node_types[GSK_BLUR_NODE] = node_type;
  }

-  {
-    const GskRenderNodeTypeInfo node_info =
-    {
-      GSK_MASK_NODE,
-      sizeof (GskMaskNode),
-      NULL,
-      gsk_mask_node_finalize,
-      gsk_mask_node_draw,
-      NULL,
-      gsk_mask_node_diff,
-    };
-
-    GType node_type = gsk_render_node_type_register_static (I_("GskMaskNode"), &node_info);
-    gsk_render_node_types[GSK_MASK_NODE] = node_type;
-  }
-
  {
    const GskRenderNodeTypeInfo node_info =
    {
@@ -6357,5 +5884,3 @@ gsk_render_node_init_types (void)
      g_once_init_leave (&register_types__volatile, initialized);
    }
 }
-
-/* vim:set foldmethod=marker expandtab: */
@@ -600,34 +600,6 @@ clear_shadows (gpointer inout_shadows)
  g_array_set_size (*(GArray **) inout_shadows, 0);
 }

-static const struct
-{
-  GskScalingFilter filter;
-  const char *name;
-} scaling_filters[] = {
-  { GSK_SCALING_FILTER_LINEAR, "linear" },
-  { GSK_SCALING_FILTER_NEAREST, "nearest" },
-  { GSK_SCALING_FILTER_TRILINEAR, "trilinear" },
-};
-
-static gboolean
-parse_scaling_filter (GtkCssParser *parser,
-                      gpointer      out_filter)
-{
-  for (unsigned int i = 0; i < G_N_ELEMENTS (scaling_filters); i++)
-    {
-      if (gtk_css_parser_try_ident (parser, scaling_filters[i].name))
-        {
-          *(GskScalingFilter *) out_filter = scaling_filters[i].filter;
-          return TRUE;
-        }
-    }
-
-  gtk_css_parser_error_syntax (parser, "Not a valid scaling filter.");
-
-  return FALSE;
-}
-
 static const struct
 {
  GskBlendMode mode;
@@ -651,18 +623,6 @@ static const struct
  { GSK_BLEND_MODE_LUMINOSITY, "luminosity" }
 };

-static const char *
-get_blend_mode_name (GskBlendMode mode)
-{
-  for (unsigned int i = 0; i < G_N_ELEMENTS (blend_modes); i++)
-    {
-      if (blend_modes[i].mode == mode)
-        return blend_modes[i].name;
-    }
-
-  return NULL;
-}
-
 static gboolean
 parse_blend_mode (GtkCssParser *parser,
                  gpointer      out_mode)
@@ -678,51 +638,6 @@ parse_blend_mode (GtkCssParser *parser,
        }
    }

-  gtk_css_parser_error_syntax (parser, "Not a valid blend mode.");
-
-  return FALSE;
-}
-
-static const struct
-{
-  GskMaskMode mode;
-  const char *name;
-} mask_modes[] = {
-  { GSK_MASK_MODE_ALPHA, "alpha" },
-  { GSK_MASK_MODE_INVERTED_ALPHA, "inverted-alpha" },
-  { GSK_MASK_MODE_LUMINANCE, "luminance" },
-  { GSK_MASK_MODE_INVERTED_LUMINANCE, "inverted-luminance" },
-};
-
-static const char *
-get_mask_mode_name (GskMaskMode mode)
-{
-  for (unsigned int i = 0; i < G_N_ELEMENTS (mask_modes); i++)
-    {
-      if (mask_modes[i].mode == mode)
-        return mask_modes[i].name;
-    }
-
-  return NULL;
-}
-
-static gboolean
-parse_mask_mode (GtkCssParser *parser,
-                 gpointer      out_mode)
-{
-  guint i;
-
-  for (i = 0; i < G_N_ELEMENTS (mask_modes); i++)
-    {
-      if (gtk_css_parser_try_ident (parser, mask_modes[i].name))
-        {
-          *(GskMaskMode *) out_mode = mask_modes[i].mode;
-          return TRUE;
-        }
-    }
-
-  gtk_css_parser_error_syntax (parser, "Not a valid mask mode.");
-
  return FALSE;
 }

@@ -1435,33 +1350,6 @@ parse_glshader_node (GtkCssParser *parser)
  return node;
 }

-static GskRenderNode *
-parse_mask_node (GtkCssParser *parser)
-{
-  GskRenderNode *source = NULL;
-  GskRenderNode *mask = NULL;
-  GskMaskMode mode = GSK_MASK_MODE_ALPHA;
-  const Declaration declarations[] = {
-    { "mode", parse_mask_mode, NULL, &mode },
-    { "source", parse_node, clear_node, &source },
-    { "mask", parse_node, clear_node, &mask },
-  };
-  GskRenderNode *result;
-
-  parse_declarations (parser, declarations, G_N_ELEMENTS(declarations));
-  if (source == NULL)
-    source = create_default_render_node ();
-  if (mask == NULL)
-    mask = gsk_color_node_new (&GDK_RGBA("AAFF00"), &GRAPHENE_RECT_INIT (0, 0, 50, 50));
-
-  result = gsk_mask_node_new (source, mask, mode);
-
-  gsk_render_node_unref (source);
-  gsk_render_node_unref (mask);
-
-  return result;
-}
-
 static GskRenderNode *
 parse_border_node (GtkCssParser *parser)
 {
@@ -1501,30 +1389,6 @@ parse_texture_node (GtkCssParser *parser)
  return node;
 }

-static GskRenderNode *
-parse_texture_scale_node (GtkCssParser *parser)
-{
-  graphene_rect_t bounds = GRAPHENE_RECT_INIT (0, 0, 50, 50);
-  GdkTexture *texture = NULL;
-  GskScalingFilter filter = GSK_SCALING_FILTER_LINEAR;
-  const Declaration declarations[] = {
-    { "bounds", parse_rect, NULL, &bounds },
-    { "texture", parse_texture, clear_texture, &texture },
-    { "filter", parse_scaling_filter, NULL, &filter }
-  };
-  GskRenderNode *node;
-
-  parse_declarations (parser, declarations, G_N_ELEMENTS (declarations));
-
-  if (texture == NULL)
-    texture = create_default_texture ();
-
-  node = gsk_texture_scale_node_new (texture, &bounds, filter);
-  g_object_unref (texture);
-
-  return node;
-}
-
 static GskRenderNode *
 parse_cairo_node (GtkCssParser *parser)
 {
@@ -1997,10 +1861,8 @@ parse_node (GtkCssParser *parser,
    { "shadow", parse_shadow_node },
    { "text", parse_text_node },
    { "texture", parse_texture_node },
-    { "texture-scale", parse_texture_scale_node },
    { "transform", parse_transform_node },
    { "glshader", parse_glshader_node },
-    { "mask", parse_mask_node },
  };
  GskRenderNode **node_p = out_node;
  guint i;
@@ -2895,73 +2757,6 @@ render_node_print (Printer       *p,
      }
      break;

-    case GSK_TEXTURE_SCALE_NODE:
-      {
-        GdkTexture *texture = gsk_texture_scale_node_get_texture (node);
-        GskScalingFilter filter = gsk_texture_scale_node_get_filter (node);
-        GBytes *bytes;
-
-        start_node (p, "texture-scale");
-        append_rect_param (p, "bounds", &node->bounds);
-
-        if (filter != GSK_SCALING_FILTER_LINEAR)
-          {
-            _indent (p);
-            for (unsigned int i = 0; i < G_N_ELEMENTS (scaling_filters); i++)
-              {
-                if (scaling_filters[i].filter == filter)
-                  {
-                    g_string_append_printf (p->str, "filter: %s;\n", scaling_filters[i].name);
-                    break;
-                  }
-              }
-          }
-        _indent (p);
-
-        switch (gdk_texture_get_format (texture))
-          {
-          case GDK_MEMORY_B8G8R8A8_PREMULTIPLIED:
-          case GDK_MEMORY_A8R8G8B8_PREMULTIPLIED:
-          case GDK_MEMORY_R8G8B8A8_PREMULTIPLIED:
-          case GDK_MEMORY_B8G8R8A8:
-          case GDK_MEMORY_A8R8G8B8:
-          case GDK_MEMORY_R8G8B8A8:
-          case GDK_MEMORY_A8B8G8R8:
-          case GDK_MEMORY_R8G8B8:
-          case GDK_MEMORY_B8G8R8:
-          case GDK_MEMORY_R16G16B16:
-          case GDK_MEMORY_R16G16B16A16_PREMULTIPLIED:
-          case GDK_MEMORY_R16G16B16A16:
-            bytes = gdk_texture_save_to_png_bytes (texture);
-            g_string_append (p->str, "texture: url(\"data:image/png;base64,");
-            break;
-
-          case GDK_MEMORY_R16G16B16_FLOAT:
-          case GDK_MEMORY_R16G16B16A16_FLOAT_PREMULTIPLIED:
-          case GDK_MEMORY_R16G16B16A16_FLOAT:
-          case GDK_MEMORY_R32G32B32_FLOAT:
-          case GDK_MEMORY_R32G32B32A32_FLOAT_PREMULTIPLIED:
-          case GDK_MEMORY_R32G32B32A32_FLOAT:
-            bytes = gdk_texture_save_to_tiff_bytes (texture);
-            g_string_append (p->str, "texture: url(\"data:image/tiff;base64,");
-            break;
-
-          case GDK_MEMORY_N_FORMATS:
-          default:
-            g_assert_not_reached ();
-          }
-
-        b64 = base64_encode_with_linebreaks (g_bytes_get_data (bytes, NULL),
-                                             g_bytes_get_size (bytes));
-        append_escaping_newlines (p->str, b64);
-        g_free (b64);
-        g_string_append (p->str, "\");\n");
-        end_node (p);
-
-        g_bytes_unref (bytes);
-      }
-      break;
-
    case GSK_TEXT_NODE:
      {
        const graphene_point_t *offset = gsk_text_node_get_offset (node);
@@ -3164,13 +2959,21 @@ render_node_print (Printer       *p,
    case GSK_BLEND_NODE:
      {
        GskBlendMode mode = gsk_blend_node_get_blend_mode (node);
+        guint i;

        start_node (p, "blend");

        if (mode != GSK_BLEND_MODE_DEFAULT)
          {
            _indent (p);
-            g_string_append_printf (p->str, "mode: %s;\n", get_blend_mode_name (mode));
+            for (i = 0; i < G_N_ELEMENTS (blend_modes); i++)
+              {
+                if (blend_modes[i].mode == mode)
+                  {
+                    g_string_append_printf (p->str, "mode: %s;\n", blend_modes[i].name);
+                    break;
+                  }
+              }
          }
        append_node_param (p, "bottom", gsk_blend_node_get_bottom_child (node));
        append_node_param (p, "top", gsk_blend_node_get_top_child (node));
@@ -3179,24 +2982,6 @@ render_node_print (Printer       *p,
      }
      break;

-    case GSK_MASK_NODE:
-      {
-        GskMaskMode mode = gsk_mask_node_get_mask_mode (node);
-
-        start_node (p, "mask");
-
-        if (mode != GSK_MASK_MODE_ALPHA)
-          {
-            _indent (p);
-            g_string_append_printf (p->str, "mode: %s;\n", get_mask_mode_name (mode));
-          }
-        append_node_param (p, "source", gsk_mask_node_get_source (node));
-        append_node_param (p, "mask", gsk_mask_node_get_mask (node));
-
-        end_node (p);
-      }
-      break;
-
    case GSK_NOT_A_RENDER_NODE:
      g_assert_not_reached ();
      break;
@@ -13,7 +13,7 @@ typedef struct _GskRenderNodeClass GskRenderNodeClass;
 * We don't add an "n-types" value to avoid having to handle
 * it in every single switch.
 */
-#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_MASK_NODE + 1)
+#define GSK_RENDER_NODE_TYPE_N_TYPES    (GSK_GL_SHADER_NODE + 1)

 extern GType gsk_render_node_types[];

@@ -19,7 +19,6 @@ gsk_private_gl_shaders = [
  'gl/resources/repeat.glsl',
  'gl/resources/custom.glsl',
  'gl/resources/filled_border.glsl',
-  'gl/resources/mask.glsl',
 ]

 gsk_public_sources = files([
@@ -440,9 +440,6 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
      g_array_append_val (self->render_ops, op);
      return;

-    case GSK_TEXTURE_SCALE_NODE:
-      goto fallback;
-
    case GSK_COLOR_NODE:
      if (gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds))
        pipeline_type = GSK_VULKAN_PIPELINE_COLOR;
@@ -504,9 +501,6 @@ gsk_vulkan_render_pass_add_node (GskVulkanRenderPass           *self,
      g_array_append_val (self->render_ops, op);
      return;

-    case GSK_MASK_NODE:
-      goto fallback;
-
    case GSK_COLOR_MATRIX_NODE:
      if (gsk_vulkan_clip_contains_rect (&constants->clip, &node->bounds))
        pipeline_type = GSK_VULKAN_PIPELINE_COLOR_MATRIX;
@@ -158,12 +158,9 @@ component_handle_method (GDBusConnection       *connection,
        }
      else
        {
-          GtkATContext *context = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
-          GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (context);
+          GtkAtSpiContext *ctx = GTK_AT_SPI_CONTEXT (gtk_accessible_get_at_context (GTK_ACCESSIBLE (child)));

          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (ctx)));
-
-          g_object_unref (context);
        }
    }
  else if (g_strcmp0 (method_name, "GetExtents") == 0)
@@ -246,7 +246,7 @@ collect_states (GtkAtSpiContext    *self,
        case GTK_ACCESSIBLE_INVALID_TRUE:
        case GTK_ACCESSIBLE_INVALID_GRAMMAR:
        case GTK_ACCESSIBLE_INVALID_SPELLING:
-          set_atspi_state (&states, ATSPI_STATE_INVALID_ENTRY);
+          set_atspi_state (&states, ATSPI_STATE_INVALID);
          break;
        case GTK_ACCESSIBLE_INVALID_FALSE:
        default:
@@ -282,34 +282,6 @@ collect_states (GtkAtSpiContext    *self,
        }
    }

-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_REQUIRED))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_REQUIRED);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_REQUIRED);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_MULTI_SELECTABLE);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_MULTISELECTABLE);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_HAS_POPUP);
-      if (gtk_boolean_accessible_value_get (value))
-        set_atspi_state (&states, ATSPI_STATE_HAS_POPUP);
-    }
-
-  if (gtk_at_context_has_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE))
-    {
-      value = gtk_at_context_get_accessible_property (ctx, GTK_ACCESSIBLE_PROPERTY_AUTOCOMPLETE);
-      if (gtk_autocomplete_accessible_value_get (value) != GTK_ACCESSIBLE_AUTOCOMPLETE_NONE)
-        set_atspi_state (&states, ATSPI_STATE_SUPPORTS_AUTOCOMPLETION);
-    }
-
  g_variant_builder_add (builder, "u", (guint32) (states & 0xffffffff));
  g_variant_builder_add (builder, "u", (guint32) (states >> 32));
 }
@@ -327,12 +299,11 @@ collect_relations (GtkAtSpiContext *self,
    { GTK_ACCESSIBLE_RELATION_LABELLED_BY, ATSPI_RELATION_LABELLED_BY },
    { GTK_ACCESSIBLE_RELATION_CONTROLS, ATSPI_RELATION_CONTROLLER_FOR },
    { GTK_ACCESSIBLE_RELATION_DESCRIBED_BY, ATSPI_RELATION_DESCRIBED_BY },
-    { GTK_ACCESSIBLE_RELATION_DETAILS, ATSPI_RELATION_DETAILS },
-    { GTK_ACCESSIBLE_RELATION_ERROR_MESSAGE, ATSPI_RELATION_ERROR_MESSAGE},
    { GTK_ACCESSIBLE_RELATION_FLOW_TO, ATSPI_RELATION_FLOWS_TO},
  };
  GtkAccessibleValue *value;
  GList *list, *l;
+  GtkATContext *target_ctx;
  int i;

  for (i = 0; i < G_N_ELEMENTS (map); i++)
@@ -347,16 +318,13 @@ collect_relations (GtkAtSpiContext *self,

      for (l = list; l; l = l->next)
        {
-          GtkATContext *target_ctx =
-            gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));
+          target_ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (l->data));

          /* Realize the ATContext of the target, so we can ask for its ref */
          gtk_at_context_realize (target_ctx);

          g_variant_builder_add (&b, "@(so)",
                                 gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (target_ctx)));
-
-          g_object_unref (target_ctx);
        }

      g_variant_builder_add (builder, "(ua(so))", map[i].s, &b);
@@ -368,17 +336,17 @@ static int
 get_index_in (GtkAccessible *parent,
              GtkAccessible *child)
 {
+  GtkAccessible *candidate;
+  guint res;
+
  if (parent == NULL)
    return -1;

-  guint res = 0;
-  GtkAccessible *candidate;
+  res = 0;
  for (candidate = gtk_accessible_get_first_accessible_child (parent);
       candidate != NULL;
       candidate = gtk_accessible_get_next_accessible_sibling (candidate))
    {
-      g_object_unref (candidate);
-
      if (candidate == child)
        return res;

@@ -397,13 +365,7 @@ get_index_in_parent (GtkAccessible *accessible)
  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);

  if (parent != NULL)
-    {
-      int res = get_index_in (parent, accessible);
-
-      g_object_unref (parent);
-
-      return res;
-    }
+    return get_index_in (parent, accessible);

  return -1;
 }
@@ -439,6 +401,7 @@ static GVariant *
 get_parent_context_ref (GtkAccessible *accessible)
 {
  GVariant *res = NULL;
+
  GtkAccessible *parent = gtk_accessible_get_accessible_parent (accessible);

  if (parent == NULL)
@@ -447,19 +410,13 @@ get_parent_context_ref (GtkAccessible *accessible)
      GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);

      res = gtk_at_spi_root_to_ref (self->root);
-
-      g_object_unref (context);
    }
  else
    {
      GtkATContext *parent_context = gtk_accessible_get_at_context (parent);
-
      gtk_at_context_realize (parent_context);

      res = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (parent_context));
-
-      g_object_unref (parent_context);
-      g_object_unref (parent);
    }

  if (res == NULL)
@@ -540,32 +497,31 @@ handle_accessible_method (GDBusConnection       *connection,
    {
      GtkATContext *context = NULL;
      GtkAccessible *accessible;
-      GtkAccessible *child = NULL;
      int idx, presentable_idx;

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

      accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));

-      presentable_idx = 0;
+      GtkAccessible *child;

+      presentable_idx = 0;
      for (child = gtk_accessible_get_first_accessible_child (accessible);
           child != NULL;
           child = gtk_accessible_get_next_accessible_sibling (child))
        {
-          g_object_unref (child);
-
          if (!gtk_accessible_should_present (child))
-            continue;
+              continue;

          if (presentable_idx == idx)
            break;
+          presentable_idx++;

-          presentable_idx += 1;
        }
-
-      if (child != NULL)
-        context = gtk_accessible_get_at_context (child);
+      if (child)
+        {
+          context = gtk_accessible_get_at_context (child);
+        }

      if (context == NULL)
        {
@@ -580,23 +536,20 @@ handle_accessible_method (GDBusConnection       *connection,
      gtk_at_context_realize (context);

      GVariant *ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
-      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", ref));

-      g_object_unref (context);
+      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", ref));
    }
  else if (g_strcmp0 (method_name, "GetChildren") == 0)
    {
      GVariantBuilder builder = G_VARIANT_BUILDER_INIT (G_VARIANT_TYPE ("a(so)"));

      GtkAccessible *accessible = gtk_at_context_get_accessible (GTK_AT_CONTEXT (self));
-      GtkAccessible *child = NULL;

+      GtkAccessible *child;
      for (child = gtk_accessible_get_first_accessible_child (accessible);
           child != NULL;
           child = gtk_accessible_get_next_accessible_sibling (child))
-        {
-          g_object_unref (child);
-
+      {
          if (!gtk_accessible_should_present (child))
            continue;

@@ -609,8 +562,6 @@ handle_accessible_method (GDBusConnection       *connection,

          if (ref != NULL)
            g_variant_builder_add (&builder, "@(so)", ref);
-
-          g_object_unref (context);
        }

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
@@ -790,13 +741,8 @@ emit_property_changed (GtkAtSpiContext *self,
                       const char      *name,
                       GVariant        *value)
 {
-  GVariant *value_owned = g_variant_ref_sink (value);
-
  if (self->connection == NULL)
-    {
-      g_variant_unref (value_owned);
-      return;
-    }
+    return;

  g_dbus_connection_emit_signal (self->connection,
                                 NULL,
@@ -804,9 +750,8 @@ emit_property_changed (GtkAtSpiContext *self,
                                 "org.a11y.atspi.Event.Object",
                                 "PropertyChange",
                                 g_variant_new ("(siiva{sv})",
-                                                name, 0, 0, value_owned, NULL),
+                                                name, 0, 0, value, NULL),
                                 NULL);
-  g_variant_unref (value_owned);
 }

 static void
@@ -905,6 +850,8 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,

  if (changed_states & GTK_ACCESSIBLE_STATE_CHANGE_HIDDEN)
    {
+      GtkAccessible *parent;
+      GtkATContext *context;
      GtkAccessibleChildChange change;

      value = gtk_accessible_attribute_set_get_value (states, GTK_ACCESSIBLE_STATE_HIDDEN);
@@ -920,15 +867,10 @@ gtk_at_spi_context_state_change (GtkATContext                *ctx,
        }
      else
        {
-          GtkAccessible *parent =
-            gtk_accessible_get_accessible_parent (accessible);
-          GtkATContext *context =
-            gtk_accessible_get_at_context (parent);
+          parent = gtk_accessible_get_accessible_parent (accessible);

+          context = gtk_accessible_get_at_context (parent);
          gtk_at_context_child_changed (context, change, accessible);
-
-          g_object_unref (context);
-          g_object_unref (parent);
        }
    }

@@ -1177,18 +1119,9 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
  int idx = 0;

  if (parent == NULL)
-    {
-      idx = -1;
-    }
+    idx = -1;
  else if (parent == accessible)
-    {
-      idx = get_index_in (accessible, child);
-      g_object_unref (parent);
-    }
-  else
-    {
-      g_object_unref (parent);
-    }
+    idx = get_index_in (accessible, child);

  if (change & GTK_ACCESSIBLE_CHILD_CHANGE_ADDED)
    emit_children_changed (self,
@@ -1200,8 +1133,6 @@ gtk_at_spi_context_child_change (GtkATContext             *ctx,
                           GTK_AT_SPI_CONTEXT (child_context),
                           idx,
                           GTK_ACCESSIBLE_CHILD_STATE_REMOVED);
-
-  g_object_unref (child_context);
 }
 /* }}} */
 /* {{{ D-Bus Registration */
@@ -1463,6 +1394,14 @@ gtk_at_spi_context_unrealize (GtkATContext *context)
  g_clear_object (&self->root);
 }

+static const char *
+gtk_at_spi_context_get_dbus_object_path (GtkATContext *context)
+{
+  GtkAtSpiContext *self = GTK_AT_SPI_CONTEXT (context);
+
+  return self->context_path;
+}
+
 static void
 gtk_at_spi_context_class_init (GtkAtSpiContextClass *klass)
 {
@@ -1478,6 +1417,7 @@ gtk_at_spi_context_class_init (GtkAtSpiContextClass *klass)
  context_class->platform_change = gtk_at_spi_context_platform_change;
  context_class->bounds_change = gtk_at_spi_context_bounds_change;
  context_class->child_change = gtk_at_spi_context_child_change;
+  context_class->get_dbus_object_path = gtk_at_spi_context_get_dbus_object_path;
 }

 static void
@@ -1770,16 +1710,15 @@ gtk_at_spi_context_get_child_count (GtkAtSpiContext *self)
  int n_children = 0;

  GtkAccessible *child = NULL;
+
  for (child = gtk_accessible_get_first_accessible_child (accessible);
       child != NULL;
       child = gtk_accessible_get_next_accessible_sibling (child))
    {
-      g_object_unref (child);
-
      if (!gtk_accessible_should_present (child))
        continue;

-      n_children += 1;
+      n_children++;
    }

  return n_children;
@@ -225,10 +225,6 @@ typedef enum {
  ATSPI_RELATION_PARENT_WINDOW_OF,
  ATSPI_RELATION_DESCRIPTION_FOR,
  ATSPI_RELATION_DESCRIBED_BY,
-  ATSPI_RELATION_DETAILS,
-  ATSPI_RELATION_DETAILS_FOR,
-  ATSPI_RELATION_ERROR_MESSAGE,
-  ATSPI_RELATION_ERROR_FOR,
  ATSPI_RELATION_LAST_DEFINED,
 } AtspiRelationType;

@@ -314,8 +314,6 @@ handle_accessible_method (GDBusConnection       *connection,
      const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("((so))", name, path));
-
-      g_object_unref (context);
    }
  else if (g_strcmp0 (method_name, "GetChildren") == 0)
    {
@@ -336,8 +334,6 @@ handle_accessible_method (GDBusConnection       *connection,
          const char *path = gtk_at_spi_context_get_context_path (GTK_AT_SPI_CONTEXT (context));

          g_variant_builder_add (&builder, "(so)", name, path);
-
-          g_object_unref (context);
        }

      g_dbus_method_invocation_return_value (invocation, g_variant_new ("(a(so))", &builder));
@@ -457,8 +453,6 @@ gtk_at_spi_root_child_changed (GtkAtSpiRoot             *self,
      GtkATContext *context = gtk_accessible_get_at_context (child);

      window_ref = gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (context));
-
-      g_object_unref (context);
    }

  switch (change)
@@ -94,9 +94,7 @@ listbox_handle_method (GDBusConnection       *connection,
      else
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
-          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -273,8 +271,7 @@ listview_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+              g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -498,9 +495,7 @@ flowbox_handle_method (GDBusConnection       *connection,
      else
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (counter.child));
-          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+          g_dbus_method_invocation_return_value (invocation, g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -766,8 +761,7 @@ stackswitcher_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+               g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -897,8 +891,7 @@ notebook_handle_method (GDBusConnection       *connection,
        {
          GtkATContext *ctx = gtk_accessible_get_at_context (GTK_ACCESSIBLE (child));
          g_dbus_method_invocation_return_value (invocation,
-            g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
-          g_object_unref (ctx);
+               g_variant_new ("(@(so))", gtk_at_spi_context_to_ref (GTK_AT_SPI_CONTEXT (ctx))));
        }
    }
  else if (g_strcmp0 (method_name, "SelectChild") == 0)
@@ -169,7 +169,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_OPTION_PANE;

    case GTK_ACCESSIBLE_ROLE_PRESENTATION:
-      return ATSPI_ROLE_FILLER;
+      return ATSPI_ROLE_SECTION;

    case GTK_ACCESSIBLE_ROLE_PROGRESS_BAR:
      return ATSPI_ROLE_PROGRESS_BAR;
@@ -205,7 +205,7 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
      return ATSPI_ROLE_ENTRY;

    case GTK_ACCESSIBLE_ROLE_SECTION:
-      return ATSPI_ROLE_SECTION;
+      return ATSPI_ROLE_FILLER;

    case GTK_ACCESSIBLE_ROLE_SECTION_HEAD:
      return ATSPI_ROLE_FILLER;
@@ -273,8 +273,6 @@ gtk_accessible_role_to_atspi_role (GtkAccessibleRole role)
    case GTK_ACCESSIBLE_ROLE_WINDOW:
      return ATSPI_ROLE_FRAME;

-    case GTK_ACCESSIBLE_ROLE_TOGGLE_BUTTON:
-      return ATSPI_ROLE_TOGGLE_BUTTON;
    default:
      break;
    }
@@ -60,16 +60,12 @@
 *
 * `GtkAssistant` has a single CSS node with the name window and style
 * class .assistant.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */

 /**
 * GtkAssistantPage:
 *
 * `GtkAssistantPage` is an auxiliary object used by `GtkAssistant.
- *
- * Deprecated: 4.10: This object will be removed in GTK 5
 */

 #include "config.h"
@@ -279,8 +275,6 @@ gtk_assistant_page_class_init (GtkAssistantPageClass *class)
   * GtkAssistantPage:page-type:
   *
   * The type of the assistant page.
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   CHILD_PROP_PAGE_TYPE,
@@ -293,8 +287,6 @@ gtk_assistant_page_class_init (GtkAssistantPageClass *class)
   * GtkAssistantPage:title:
   *
   * The title of the page.
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   CHILD_PROP_PAGE_TITLE,
@@ -309,8 +301,6 @@ gtk_assistant_page_class_init (GtkAssistantPageClass *class)
   *
   * GTK uses this information to control the sensitivity
   * of the navigation buttons.
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   CHILD_PROP_PAGE_COMPLETE,
@@ -322,8 +312,6 @@ gtk_assistant_page_class_init (GtkAssistantPageClass *class)
   * GtkAssistantPage:child:
   *
   * The child widget.
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   CHILD_PROP_CHILD,
@@ -530,8 +518,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   * @assistant: the `GtkAssistant`
   *
   * Emitted when then the cancel button is clicked.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  signals[CANCEL] =
    g_signal_new (I_("cancel"),
@@ -552,8 +538,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   *
   * A handler for this signal can do any preparations which are
   * necessary before showing @page.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  signals[PREPARE] =
    g_signal_new (I_("prepare"),
@@ -579,8 +563,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   * %GTK_ASSISTANT_PAGE_PROGRESS after the confirmation page and handle
   * this operation within the [signal@Gtk.Assistant::prepare] signal of
   * the progress page.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  signals[APPLY] =
    g_signal_new (I_("apply"),
@@ -598,8 +580,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   * Emitted either when the close button of a summary page is clicked,
   * or when the apply button in the last page in the flow (of type
   * %GTK_ASSISTANT_PAGE_CONFIRM) is clicked.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  signals[CLOSE] =
    g_signal_new (I_("close"),
@@ -615,8 +595,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   * @assistant: the `GtkAssistant`
   *
   * The action signal for the Escape binding.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  signals[ESCAPE] =
    g_signal_new_class_handler (I_("escape"),
@@ -640,8 +618,6 @@ gtk_assistant_class_init (GtkAssistantClass *class)
   *
   * For technical reasons, this property is declared as an integer
   * property, but you should only set it to %TRUE or %FALSE.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class,
                                   PROP_USE_HEADER_BAR,
@@ -1459,8 +1435,6 @@ gtk_assistant_close_request (GtkWindow *window)
 * Creates a new `GtkAssistant`.
 *
 * Returns: a newly created `GtkAssistant`
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkWidget*
 gtk_assistant_new (void)
@@ -1481,8 +1455,6 @@ gtk_assistant_new (void)
 * Returns: The index (starting from 0) of the current
 *   page in the @assistant, or -1 if the @assistant has no pages,
 *   or no current page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 int
 gtk_assistant_get_current_page (GtkAssistant *assistant)
@@ -1508,8 +1480,6 @@ gtk_assistant_get_current_page (GtkAssistant *assistant)
 * Note that this will only be necessary in custom buttons,
 * as the @assistant flow can be set with
 * gtk_assistant_set_forward_page_func().
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_set_current_page (GtkAssistant *assistant,
@@ -1555,8 +1525,6 @@ gtk_assistant_set_current_page (GtkAssistant *assistant,
 *
 * This function is for use when creating pages of the
 * %GTK_ASSISTANT_PAGE_CUSTOM type.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_next_page (GtkAssistant *assistant)
@@ -1580,8 +1548,6 @@ gtk_assistant_next_page (GtkAssistant *assistant)
 *
 * This function is for use when creating pages of the
 * %GTK_ASSISTANT_PAGE_CUSTOM type.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_previous_page (GtkAssistant *assistant)
@@ -1615,8 +1581,6 @@ gtk_assistant_previous_page (GtkAssistant *assistant)
 * Returns the number of pages in the @assistant
 *
 * Returns: the number of pages in the @assistant
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 int
 gtk_assistant_get_n_pages (GtkAssistant *assistant)
@@ -1636,8 +1600,6 @@ gtk_assistant_get_n_pages (GtkAssistant *assistant)
 *
 * Returns: (nullable) (transfer none): the child widget, or %NULL
 *   if @page_num is out of bounds
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkWidget*
 gtk_assistant_get_nth_page (GtkAssistant *assistant,
@@ -1670,8 +1632,6 @@ gtk_assistant_get_nth_page (GtkAssistant *assistant,
 * Prepends a page to the @assistant.
 *
 * Returns: the index (starting at 0) of the inserted page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 int
 gtk_assistant_prepend_page (GtkAssistant *assistant,
@@ -1691,8 +1651,6 @@ gtk_assistant_prepend_page (GtkAssistant *assistant,
 * Appends a page to the @assistant.
 *
 * Returns: the index (starting at 0) of the inserted page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 int
 gtk_assistant_append_page (GtkAssistant *assistant,
@@ -1714,8 +1672,6 @@ gtk_assistant_append_page (GtkAssistant *assistant,
 * Inserts a page in the @assistant at a given position.
 *
 * Returns: the index (starting from 0) of the inserted page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 int
 gtk_assistant_insert_page (GtkAssistant *assistant,
@@ -1814,8 +1770,6 @@ gtk_assistant_add_page (GtkAssistant *assistant,
 *   or -1 to remove the last page
 *
 * Removes the @page_num’s page from @assistant.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_remove_page (GtkAssistant *assistant,
@@ -1851,8 +1805,6 @@ gtk_assistant_remove_page (GtkAssistant *assistant,
 * Setting @page_func to %NULL will make the assistant to
 * use the default forward function, which just goes to the
 * next visible page.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_set_forward_page_func (GtkAssistant         *assistant,
@@ -1901,8 +1853,6 @@ add_to_action_area (GtkAssistant *assistant,
 * @child: a `GtkWidget`
 *
 * Adds a widget to the action area of a `GtkAssistant`.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_add_action_widget (GtkAssistant *assistant,
@@ -1931,8 +1881,6 @@ gtk_assistant_add_action_widget (GtkAssistant *assistant,
 * @child: a `GtkWidget`
 *
 * Removes a widget from the action area of a `GtkAssistant`.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_remove_action_widget (GtkAssistant *assistant,
@@ -1962,8 +1910,6 @@ gtk_assistant_remove_action_widget (GtkAssistant *assistant,
 *
 * The title is displayed in the header area of the assistant
 * when @page is the current page.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_set_page_title (GtkAssistant *assistant,
@@ -1993,8 +1939,6 @@ gtk_assistant_set_page_title (GtkAssistant *assistant,
 * Gets the title for @page.
 *
 * Returns: the title for @page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 const char *
 gtk_assistant_get_page_title (GtkAssistant *assistant,
@@ -2024,8 +1968,6 @@ gtk_assistant_get_page_title (GtkAssistant *assistant,
 * Sets the page type for @page.
 *
 * The page type determines the page behavior in the @assistant.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_set_page_type (GtkAssistant         *assistant,
@@ -2055,8 +1997,6 @@ gtk_assistant_set_page_type (GtkAssistant         *assistant,
 * Gets the page type of @page.
 *
 * Returns: the page type of @page
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkAssistantPageType
 gtk_assistant_get_page_type (GtkAssistant *assistant,
@@ -2087,8 +2027,6 @@ gtk_assistant_get_page_type (GtkAssistant *assistant,
 *
 * This will make @assistant update the buttons state
 * to be able to continue the task.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_set_page_complete (GtkAssistant *assistant,
@@ -2118,8 +2056,6 @@ gtk_assistant_set_page_complete (GtkAssistant *assistant,
 * Gets whether @page is complete.
 *
 * Returns: %TRUE if @page is complete.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 gboolean
 gtk_assistant_get_page_complete (GtkAssistant *assistant,
@@ -2153,8 +2089,6 @@ gtk_assistant_get_page_complete (GtkAssistant *assistant,
 * One situation where it can be necessary to call this
 * function is when changing a value on the current page
 * affects the future page flow of the assistant.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_update_buttons_state (GtkAssistant *assistant)
@@ -2178,8 +2112,6 @@ gtk_assistant_update_buttons_state (GtkAssistant *assistant)
 * or undone. For example, showing a progress page to track
 * a long-running, unreversible operation after the user has
 * clicked apply on a confirmation page.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_assistant_commit (GtkAssistant *assistant)
@@ -2257,8 +2189,6 @@ gtk_assistant_buildable_custom_finished (GtkBuildable *buildable,
 * Returns the `GtkAssistantPage` object for @child.
 *
 * Returns: (transfer none): the `GtkAssistantPage` for @child
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkAssistantPage *
 gtk_assistant_get_page (GtkAssistant *assistant,
@@ -2275,8 +2205,6 @@ gtk_assistant_get_page (GtkAssistant *assistant,
 * Returns the child to which @page belongs.
 *
 * Returns: (transfer none): the child to which @page belongs
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkWidget *
 gtk_assistant_page_get_child (GtkAssistantPage *page)
@@ -2388,8 +2316,6 @@ gtk_assistant_pages_new (GtkAssistant *assistant)
 * Gets a list model of the assistant pages.
 *
 * Returns: (transfer full) (attributes element-type=GtkAssistantPage): A list model of the pages.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GListModel *
 gtk_assistant_get_pages (GtkAssistant *assistant)
@@ -34,8 +34,6 @@
 * same context which was used to request sizes for a given `GtkTreeModel`
 * row also be used for the same row when calling other `GtkCellArea` APIs
 * such as gtk_cell_area_render() and gtk_cell_area_event().
- *
- * Deprecated: 4.10: This object will be removed in GTK 5
 */

 #include "config.h"
@@ -109,8 +107,6 @@ gtk_cell_area_context_class_init (GtkCellAreaContextClass *class)
   * GtkCellAreaContext:area:
   *
   * The `GtkCellArea` this context was created by
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   PROP_CELL_AREA,
@@ -124,8 +120,6 @@ gtk_cell_area_context_class_init (GtkCellAreaContextClass *class)
   * The minimum width for the `GtkCellArea` in this context
   * for all `GtkTreeModel` rows that this context was requested
   * for using gtk_cell_area_get_preferred_width().
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   PROP_MIN_WIDTH,
@@ -139,8 +133,6 @@ gtk_cell_area_context_class_init (GtkCellAreaContextClass *class)
   * The natural width for the `GtkCellArea` in this context
   * for all `GtkTreeModel` rows that this context was requested
   * for using gtk_cell_area_get_preferred_width().
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   PROP_NAT_WIDTH,
@@ -154,8 +146,6 @@ gtk_cell_area_context_class_init (GtkCellAreaContextClass *class)
   * The minimum height for the `GtkCellArea` in this context
   * for all `GtkTreeModel` rows that this context was requested
   * for using gtk_cell_area_get_preferred_height().
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   PROP_MIN_HEIGHT,
@@ -169,8 +159,6 @@ gtk_cell_area_context_class_init (GtkCellAreaContextClass *class)
   * The natural height for the `GtkCellArea` in this context
   * for all `GtkTreeModel` rows that this context was requested
   * for using gtk_cell_area_get_preferred_height().
-   *
-   * Deprecated: 4.10: This object will be removed in GTK 5
   */
  g_object_class_install_property (object_class,
                                   PROP_NAT_HEIGHT,
@@ -321,7 +309,7 @@ gtk_cell_area_context_real_allocate (GtkCellAreaContext *context,
 *
 * Returns: (transfer none): the `GtkCellArea` this context was created by.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 GtkCellArea *
 gtk_cell_area_context_get_area (GtkCellAreaContext *context)
@@ -360,7 +348,7 @@ gtk_cell_area_context_get_area (GtkCellAreaContext *context)
 * of all the displayed row heights using
 * gtk_cell_area_get_preferred_height_for_width().
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_reset (GtkCellAreaContext *context)
@@ -389,7 +377,7 @@ gtk_cell_area_context_reset (GtkCellAreaContext *context)
 * rows. This is generally the case for `GtkTreeView` when
 * `GtkTreeView:fixed-height-mode` is enabled.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_allocate (GtkCellAreaContext *context,
@@ -413,7 +401,7 @@ gtk_cell_area_context_allocate (GtkCellAreaContext *context,
 * After gtk_cell_area_context_reset() is called and/or before ever
 * requesting the size of a `GtkCellArea`, the returned values are 0.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context,
@@ -443,7 +431,7 @@ gtk_cell_area_context_get_preferred_width (GtkCellAreaContext *context,
 * After gtk_cell_area_context_reset() is called and/or before ever
 * requesting the size of a `GtkCellArea`, the returned values are 0.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context,
@@ -474,7 +462,7 @@ gtk_cell_area_context_get_preferred_height (GtkCellAreaContext *context,
 * After gtk_cell_area_context_reset() is called and/or before ever
 * requesting the size of a `GtkCellArea`, the returned values are -1.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *context,
@@ -504,7 +492,7 @@ gtk_cell_area_context_get_preferred_height_for_width (GtkCellAreaContext *contex
 * After gtk_cell_area_context_reset() is called and/or before ever
 * requesting the size of a `GtkCellArea`, the returned values are -1.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *context,
@@ -533,7 +521,7 @@ gtk_cell_area_context_get_preferred_width_for_height (GtkCellAreaContext *contex
 * context was recently reset with gtk_cell_area_context_reset(),
 * the returned value will be -1.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_get_allocation (GtkCellAreaContext *context,
@@ -565,7 +553,7 @@ gtk_cell_area_context_get_allocation (GtkCellAreaContext *context,
 * progressively push the requested width over a series of
 * gtk_cell_area_get_preferred_width() requests.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_push_preferred_width (GtkCellAreaContext *context,
@@ -609,7 +597,7 @@ gtk_cell_area_context_push_preferred_width (GtkCellAreaContext *context,
 * progressively push the requested height over a series of
 * gtk_cell_area_get_preferred_height() requests.
 *
- * Deprecated: 4.10: This object will be removed in GTK 5
+ * Deprecated: 4.10
 */
 void
 gtk_cell_area_context_push_preferred_height (GtkCellAreaContext *context,
@@ -20,6 +20,7 @@
 #include "gtkcellrendererpixbuf.h"

 #include "gtkiconhelperprivate.h"
+#include "gtkicontheme.h"
 #include "gtkprivate.h"
 #include "gtksnapshot.h"
 #include "gtkstylecontextprivate.h"
@@ -70,8 +70,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 * [property@Gtk.LockButton:tooltip-lock],
 * [property@Gtk.LockButton:tooltip-unlock] and
 * [property@Gtk.LockButton:tooltip-not-authorized] properties.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */

 struct _GtkLockButton
@@ -273,8 +271,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:permission: (attributes org.gtk.Property.get=gtk_lock_button_get_permission org.gtk.Property.set=gtk_lock_button_set_permission)
   *
   * The `GPermission object controlling this button.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_PERMISSION,
    g_param_spec_object ("permission", NULL, NULL,
@@ -286,8 +282,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:text-lock:
   *
   * The text to display when prompting the user to lock.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_TEXT_LOCK,
    g_param_spec_string ("text-lock", NULL, NULL,
@@ -300,8 +294,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:text-unlock:
   *
   * The text to display when prompting the user to unlock.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_TEXT_UNLOCK,
    g_param_spec_string ("text-unlock", NULL, NULL,
@@ -314,8 +306,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:tooltip-lock:
   *
   * The tooltip to display when prompting the user to lock.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_TOOLTIP_LOCK,
    g_param_spec_string ("tooltip-lock", NULL, NULL,
@@ -328,8 +318,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:tooltip-unlock:
   *
   * The tooltip to display when prompting the user to unlock.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_TOOLTIP_UNLOCK,
    g_param_spec_string ("tooltip-unlock", NULL, NULL,
@@ -342,8 +330,6 @@ gtk_lock_button_class_init (GtkLockButtonClass *klass)
   * GtkLockButton:tooltip-not-authorized:
   *
   * The tooltip to display when the user cannot obtain authorization.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  g_object_class_install_property (gobject_class, PROP_TOOLTIP_NOT_AUTHORIZED,
    g_param_spec_string ("tooltip-not-authorized", NULL, NULL,
@@ -525,8 +511,6 @@ gtk_lock_button_clicked (GtkButton *widget)
 * Creates a new lock button which reflects the @permission.
 *
 * Returns: a new `GtkLockButton`
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkWidget *
 gtk_lock_button_new (GPermission *permission)
@@ -543,8 +527,6 @@ gtk_lock_button_new (GPermission *permission)
 * Obtains the `GPermission` object that controls @button.
 *
 * Returns: (transfer none) (nullable): the `GPermission` of @button
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GPermission *
 gtk_lock_button_get_permission (GtkLockButton *button)
@@ -560,8 +542,6 @@ gtk_lock_button_get_permission (GtkLockButton *button)
 * @permission: (nullable): a `GPermission` object
 *
 * Sets the `GPermission` object that controls @button.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_lock_button_set_permission (GtkLockButton *button,
@@ -77,8 +77,6 @@ G_GNUC_BEGIN_IGNORE_DEPRECATIONS
 * ## CSS node
 *
 * `GtkStatusbar` has a single CSS node with name `statusbar`.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */

 typedef struct _GtkStatusbarMsg GtkStatusbarMsg;
@@ -169,8 +167,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
   * @text: the message that was pushed
   *
   * Emitted whenever a new message gets pushed onto a statusbar's stack.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  statusbar_signals[SIGNAL_TEXT_PUSHED] =
    g_signal_new (I_("text-pushed"),
@@ -190,8 +186,6 @@ gtk_statusbar_class_init (GtkStatusbarClass *class)
   * @text: the message that was just popped
   *
   * Emitted whenever a new message is popped off a statusbar's stack.
-   *
-   * Deprecated: 4.10: This widget will be removed in GTK 5
   */
  statusbar_signals[SIGNAL_TEXT_POPPED] =
    g_signal_new (I_("text-popped"),
@@ -231,8 +225,6 @@ gtk_statusbar_init (GtkStatusbar *statusbar)
 * Creates a new `GtkStatusbar` ready for messages.
 *
 * Returns: the new `GtkStatusbar`
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 GtkWidget*
 gtk_statusbar_new (void)
@@ -265,8 +257,6 @@ gtk_statusbar_update (GtkStatusbar *statusbar,
 * Note that the description is not shown in the UI.
 *
 * Returns: an integer id
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 guint
 gtk_statusbar_get_context_id (GtkStatusbar *statusbar,
@@ -327,8 +317,6 @@ gtk_statusbar_msg_free (GtkStatusbarMsg *msg)
 *
 * Returns: a message id that can be used with
 *   [method@Gtk.Statusbar.remove].
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 guint
 gtk_statusbar_push (GtkStatusbar *statusbar,
@@ -363,8 +351,6 @@ gtk_statusbar_push (GtkStatusbar *statusbar,
 * Note that this may not change the displayed message,
 * if the message at the top of the stack has a different
 * context id.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_statusbar_pop (GtkStatusbar *statusbar,
@@ -409,8 +395,6 @@ gtk_statusbar_pop (GtkStatusbar *statusbar,
 *
 * Forces the removal of a message from a statusbar’s stack.
 * The exact @context_id and @message_id must be specified.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_statusbar_remove (GtkStatusbar *statusbar,
@@ -459,8 +443,6 @@ gtk_statusbar_remove (GtkStatusbar *statusbar,
 *
 * Forces the removal of all messages from a statusbar's
 * stack with the exact @context_id.
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 void
 gtk_statusbar_remove_all (GtkStatusbar *statusbar,
@@ -517,8 +499,6 @@ gtk_statusbar_remove_all (GtkStatusbar *statusbar,
 * Retrieves the contents of the label in `GtkStatusbar`.
 *
 * Returns: (transfer none): the contents of the statusbar
- *
- * Deprecated: 4.10: This widget will be removed in GTK 5
 */
 const char *
 gtk_statusbar_get_message (GtkStatusbar *statusbar)
@@ -49,7 +49,6 @@ gtk_deprecated_sources = [
  'deprecated/gtktreepopover.c',
  'deprecated/gtktreeview.c',
  'deprecated/gtktreeviewcolumn.c',
-  'deprecated/gtkvolumebutton.c',
 ]

 gtk_deprecated_headers = [
@@ -107,5 +106,4 @@ gtk_deprecated_headers = [
  'deprecated/gtktreestore.h',
  'deprecated/gtktreeview.h',
  'deprecated/gtktreeviewcolumn.h',
-  'deprecated/gtkvolumebutton.h',
 ]
@@ -71,7 +71,7 @@ for f in funcs:
    file_output += ['#ifdef GDK_WINDOWING_WIN32']
    file_output += ['*tp++ = {0}();'.format(f)]
    file_output += ['#endif']
-  elif f.startswith('gdk_macos'):
+  elif f.startswith('gdk_quartz'):
    file_output += ['#ifdef GDK_WINDOWING_MACOS']
    file_output += ['*tp++ = {0}();'.format(f)]
    file_output += ['#endif']
@@ -26,7 +26,7 @@
 #include <string.h>
 #include <glib/gstdio.h>

-#include "gtkopenuriportal.h"
+#include "gopenuriportal.h"
 #include "xdp-dbus.h"
 #include "gtkwindowprivate.h"
 #include "gtkprivate.h"
@@ -43,7 +43,7 @@
 #endif


-static GtkXdpOpenURI *openuri;
+static GXdpOpenURI *openuri;

 static gboolean
 init_openuri_portal (void)
@@ -57,10 +57,10 @@ init_openuri_portal (void)

      if (connection != NULL)
        {
-          openuri = gtk_xdp_open_uri_proxy_new_sync (connection, 0,
-                                                     PORTAL_BUS_NAME,
-                                                     PORTAL_OBJECT_PATH,
-                                                     NULL, &error);
+          openuri = gxdp_open_uri_proxy_new_sync (connection, 0,
+                                                  PORTAL_BUS_NAME,
+                                                  PORTAL_OBJECT_PATH,
+                                                  NULL, &error);
          if (openuri == NULL)
            {
              g_warning ("Cannot create OpenURI portal proxy: %s", error->message);
@@ -83,7 +83,7 @@ init_openuri_portal (void)
 }

 gboolean
-gtk_openuri_portal_is_available (void)
+g_openuri_portal_is_available (void)
 {
  return init_openuri_portal ();
 }
@@ -169,7 +169,7 @@ open_call_done (GObject      *source,
                GAsyncResult *result,
                gpointer      user_data)
 {
-  GtkXdpOpenURI *portal = GTK_XDP_OPEN_URI (source);
+  GXdpOpenURI *portal = GXDP_OPEN_URI (source);
  GTask *task = user_data;
  OpenUriData *data = g_task_get_task_data (task);
  GError *error = NULL;
@@ -179,13 +179,13 @@ open_call_done (GObject      *source,
  switch (data->call)
    {
    case OPEN_FILE:
-      res = gtk_xdp_open_uri_call_open_file_finish (portal, &path, NULL, result, &error);
+      res = gxdp_open_uri_call_open_file_finish (portal, &path, NULL, result, &error);
      break;
    case OPEN_FOLDER:
-      res = gtk_xdp_open_uri_call_open_directory_finish (portal, &path, NULL, result, &error);
+      res = gxdp_open_uri_call_open_directory_finish (portal, &path, NULL, result, &error);
      break;
    case OPEN_URI:
-      res = gtk_xdp_open_uri_call_open_uri_finish (portal, &path, result, &error);
+      res = gxdp_open_uri_call_open_uri_finish (portal, &path, result, &error);
      break;
    default:
      g_assert_not_reached ();
@@ -341,7 +341,7 @@ open_uri (OpenUriData         *data,
      if (open_folder)
        {
          data->call = OPEN_FOLDER;
-          gtk_xdp_open_uri_call_open_directory (openuri,
+          gxdp_open_uri_call_open_directory (openuri,
                                             parent_window ? parent_window : "",
                                             g_variant_new ("h", fd_id),
                                             opts,
@@ -353,7 +353,7 @@ open_uri (OpenUriData         *data,
      else
        {
          data->call = OPEN_FILE;
-          gtk_xdp_open_uri_call_open_file (openuri,
+          gxdp_open_uri_call_open_file (openuri,
                                        parent_window ? parent_window : "",
                                        g_variant_new ("h", fd_id),
                                        opts,
@@ -373,7 +373,7 @@ open_uri (OpenUriData         *data,
        uri = g_file_get_uri (file);

      data->call = OPEN_URI;
-      gtk_xdp_open_uri_call_open_uri (openuri,
+      gxdp_open_uri_call_open_uri (openuri,
                                   parent_window ? parent_window : "",
                                   uri ? uri : data->uri,
                                   opts,
@@ -441,12 +441,12 @@ window_handle_exported (GtkWindow  *window,
 }

 void
-gtk_openuri_portal_open_async (GFile               *file,
-                               gboolean             open_folder,
-                               GtkWindow           *parent,
-                               GCancellable        *cancellable,
-                               GAsyncReadyCallback  callback,
-                               gpointer             user_data)
+g_openuri_portal_open_async (GFile               *file,
+                             gboolean             open_folder,
+                             GtkWindow           *parent,
+                             GCancellable        *cancellable,
+                             GAsyncReadyCallback  callback,
+                             gpointer             user_data)
 {
  OpenUriData *data;

@@ -465,27 +465,27 @@ gtk_openuri_portal_open_async (GFile               *file,
  data->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
  data->task = g_task_new (parent, cancellable, callback, user_data);
  g_task_set_check_cancellable (data->task, FALSE);
-  g_task_set_source_tag (data->task, gtk_openuri_portal_open_async);
+  g_task_set_source_tag (data->task, g_openuri_portal_open_async);

  if (!parent || !gtk_window_export_handle (parent, window_handle_exported, data))
    window_handle_exported (parent, NULL, data);
 }

 gboolean
-gtk_openuri_portal_open_finish (GAsyncResult  *result,
-                                GError       **error)
+g_openuri_portal_open_finish (GAsyncResult  *result,
+                              GError       **error)
 {
-  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gtk_openuri_portal_open_async, FALSE);
+  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == g_openuri_portal_open_async, FALSE);

  return g_task_propagate_boolean (G_TASK (result), error);
 }

 void
-gtk_openuri_portal_open_uri_async (const char          *uri,
-                                   GtkWindow           *parent,
-                                   GCancellable        *cancellable,
-                                   GAsyncReadyCallback  callback,
-                                   gpointer             user_data)
+g_openuri_portal_open_uri_async (const char          *uri,
+                                 GtkWindow           *parent,
+                                 GCancellable        *cancellable,
+                                 GAsyncReadyCallback  callback,
+                                 gpointer             user_data)
 {
  OpenUriData *data;

@@ -503,17 +503,17 @@ gtk_openuri_portal_open_uri_async (const char          *uri,
  data->cancellable = cancellable ? g_object_ref (cancellable) : NULL;
  data->task = g_task_new (parent, cancellable, callback, user_data);
  g_task_set_check_cancellable (data->task, FALSE);
-  g_task_set_source_tag (data->task, gtk_openuri_portal_open_uri_async);
+  g_task_set_source_tag (data->task, g_openuri_portal_open_uri_async);

  if (!parent || !gtk_window_export_handle (parent, window_handle_exported, data))
    window_handle_exported (parent, NULL, data);
 }

 gboolean
-gtk_openuri_portal_open_uri_finish (GAsyncResult  *result,
-                                    GError       **error)
+g_openuri_portal_open_uri_finish (GAsyncResult  *result,
+                                  GError       **error)
 {
-  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == gtk_openuri_portal_open_uri_async, FALSE);
+  g_return_val_if_fail (g_task_get_source_tag (G_TASK (result)) == g_openuri_portal_open_uri_async, FALSE);

  return g_task_propagate_boolean (G_TASK (result), error);
 }
@@ -0,0 +1,52 @@
+/* GIO - GLib Input, Output and Streaming Library
+ *
+ * Copyright 2017 Red Hat, Inc.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ *
+ * 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/>.
+ */
+
+#ifndef __G_OPEN_URI_PORTAL_H__
+
+#include "gtkwindow.h"
+#include <glib.h>
+#include <gio/gio.h>
+
+G_BEGIN_DECLS
+
+gboolean g_openuri_portal_is_available (void);
+
+void     g_openuri_portal_open_async   (GFile               *file,
+                                        gboolean             open_folder,
+                                        GtkWindow           *window,
+                                        GCancellable        *cancellable,
+                                        GAsyncReadyCallback  callback,
+                                        gpointer             user_data);
+
+gboolean g_openuri_portal_open_finish  (GAsyncResult        *result,
+                                        GError             **error);
+
+void     g_openuri_portal_open_uri_async  (const char          *uri,
+                                           GtkWindow           *window,
+                                           GCancellable        *cancellable,
+                                           GAsyncReadyCallback  callback,
+                                           gpointer             user_data);
+
+gboolean g_openuri_portal_open_uri_finish (GAsyncResult        *result,
+                                           GError             **error);
+
+G_END_DECLS
+
+#endif
@@ -290,7 +290,7 @@
 #include <gtk/gtkversion.h>
 #include <gtk/gtkvideo.h>
 #include <gtk/gtkviewport.h>
-#include <gtk/deprecated/gtkvolumebutton.h>
+#include <gtk/gtkvolumebutton.h>
 #include <gtk/gtkwidget.h>
 #include <gtk/gtkwidgetpaintable.h>
 #include <gtk/gtkwindow.h>
@@ -36,15 +36,22 @@
 #include "gtkbutton.h"
 #include "gtkgrid.h"
 #include "gtkbox.h"
+#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
 #include "gtkmarshalers.h"
 #include "gtkstack.h"
+#include "gtkorientable.h"
+#include "gtkscrolledwindow.h"
 #include "gtktextview.h"
+#include "gtkmain.h"
+#include "gtktogglebutton.h"
 #include "gtktypebuiltins.h"
 #include "gtkstack.h"
+#include "gtkstackswitcher.h"
 #include "gtksettings.h"
 #include "gtkurilauncher.h"
+#include "gtkheaderbar.h"
 #include "gtkprivate.h"
 #include <glib/gi18n-lib.h>
 #include "gtkeventcontrollermotion.h"
@@ -45,11 +45,6 @@
 * [vfunc@Gtk.Accessible.get_next_accessible_sibling] virtual functions.
 * Note that you can not create a top-level accessible object as of now,
 * which means that you must always have a parent accessible object.
- * Also note that when an accessible object does not correspond to a widget,
- * and it has children, whose implementation you don't control,
- * it is necessary to ensure the correct shape of the a11y tree
- * by calling [method@Gtk.Accessible.set_accessible_parent] and
- * updating the sibling by [method@Gtk.Accessible.update_next_accessible_sibling].
 */

 #include "config.h"
@@ -91,11 +86,9 @@ gtk_accessible_default_init (GtkAccessibleInterface *iface)
 * gtk_accessible_get_at_context:
 * @self: a `GtkAccessible`
 *
- * Retrieves the accessible implementation for the given `GtkAccessible`.
+ * Retrieves the `GtkATContext` for the given `GtkAccessible`.
 *
- * Returns: (transfer full): the accessible implementation object
- *
- * Since: 4.10
+ * Returns: (transfer none): the `GtkATContext`
 */
 GtkATContext *
 gtk_accessible_get_at_context (GtkAccessible *self)
@@ -109,11 +102,11 @@ gtk_accessible_get_at_context (GtkAccessible *self)
 * gtk_accessible_get_accessible_parent:
 * @self: a `GtkAccessible`
 *
- * Retrieves the accessible parent for an accessible object.
+ * Retrieves the accessible accessible for an accessible object
 *
- * This function returns `NULL` for top level widgets.
+ * This function returns `NULL` for top level widgets
 *
- * Returns: (transfer full) (nullable): the accessible parent
+ * Returns: (transfer none) (nullable): the accessible parent
 *
 * Since: 4.10
 */
@@ -122,97 +115,7 @@ gtk_accessible_get_accessible_parent (GtkAccessible *self)
 {
  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);

-  GtkATContext *context;
-  GtkAccessible *parent = NULL;
-
-  context = gtk_accessible_get_at_context (self);
-  if (context != NULL)
-    {
-      parent = gtk_at_context_get_accessible_parent (context);
-      g_object_unref (context);
-    }
-
-  if (parent != NULL)
-    return g_object_ref (parent);
-  else
-    return GTK_ACCESSIBLE_GET_IFACE (self)->get_accessible_parent (self);
-}
-
-/**
- * gtk_accessible_set_accessible_parent:
- * @self: an accessible object
- * @parent: (nullable): the parent accessible object
- * @next_sibling: (nullable): the sibling accessible object
- *
- * Sets the parent and sibling of an accessible object.
- *
- * This function is meant to be used by accessible implementations that are
- * not part of the widget hierarchy, and but act as a logical bridge between
- * widgets. For instance, if a widget creates an object that holds metadata
- * for each child, and you want that object to implement the `GtkAccessible`
- * interface, you will use this function to ensure that the parent of each
- * child widget is the metadata object, and the parent of each metadata
- * object is the container widget.
- *
- * Since: 4.10
- */
-void
-gtk_accessible_set_accessible_parent (GtkAccessible *self,
-                                      GtkAccessible *parent,
-                                      GtkAccessible *next_sibling)
-{
-  g_return_if_fail (GTK_IS_ACCESSIBLE (self));
-  g_return_if_fail (parent == NULL || GTK_IS_ACCESSIBLE (parent));
-  g_return_if_fail (next_sibling == NULL || GTK_IS_ACCESSIBLE (parent));
-
-  GtkATContext *context;
-
-  context = gtk_accessible_get_at_context (self);
-  if (context != NULL)
-    {
-      gtk_at_context_set_accessible_parent (context, parent);
-      gtk_at_context_set_next_accessible_sibling (context, next_sibling);
-      g_object_unref (context);
-    }
-}
-
-/**
- * gtk_accessible_update_next_accessible_sibling:
- * @self: a `GtkAccessible`
- * @new_sibling: (nullable): the new next accessible sibling to set
- *
- * Updates the next accessible sibling of @self.
- *
- * That might be useful when a new child of a custom `GtkAccessible`
- * is created, and it needs to be linked to a previous child.
- *
- * Since: 4.10
- */
-void
-gtk_accessible_update_next_accessible_sibling (GtkAccessible *self,
-                                               GtkAccessible *new_sibling)
-{
-  GtkATContext *context;
-  GtkAccessible *parent;
-
-  g_return_if_fail (GTK_IS_ACCESSIBLE (self));
-
-  context = gtk_accessible_get_at_context (self);
-  if (context == NULL)
-    return;
-
-  parent = gtk_at_context_get_accessible_parent (context);
-  if (parent == NULL)
-    {
-      g_object_unref (context);
-      g_critical ("Failed to update next accessible sibling: no parent accessible set for this accessible");
-      return;
-    }
-
-  gtk_at_context_set_next_accessible_sibling (context, new_sibling);
-
-  g_object_unref (parent);
-  g_object_unref (context);
+  return GTK_ACCESSIBLE_GET_IFACE (self)->get_accessible_parent (self);
 }

 /**
@@ -221,7 +124,7 @@ gtk_accessible_update_next_accessible_sibling (GtkAccessible *self,
 *
 * Retrieves the first accessible child of an accessible object.
 *
- * Returns: (transfer full) (nullable): the first accessible child
+ * Returns: (transfer none) (nullable): the first accessible child
 *
 * since: 4.10
 */
@@ -239,7 +142,7 @@ gtk_accessible_get_first_accessible_child (GtkAccessible *self)
 *
 * Retrieves the next accessible sibling of an accessible object
 *
- * Returns: (transfer full) (nullable): the next accessible sibling
+ * Returns: (transfer none) (nullable): the next accessible sibling
 *
 * since: 4.10
 */
@@ -248,26 +151,7 @@ gtk_accessible_get_next_accessible_sibling (GtkAccessible *self)
 {
  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), NULL);

-  GtkATContext *context;
-
-  context = gtk_accessible_get_at_context (self);
-  if (context != NULL)
-    {
-      GtkAccessible *sibling = NULL;
-
-      if (gtk_at_context_get_accessible_parent (context) != NULL)
-        {
-          sibling = gtk_at_context_get_next_accessible_sibling (context);
-          if (sibling != NULL)
-            sibling = g_object_ref (sibling);
-        }
-
-      g_object_unref (context);
-
-      return sibling;
-    }
-  else
-    return GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
+  return GTK_ACCESSIBLE_GET_IFACE (self)->get_next_accessible_sibling (self);
 }

 /**
@@ -281,21 +165,13 @@ gtk_accessible_get_next_accessible_sibling (GtkAccessible *self)
 GtkAccessibleRole
 gtk_accessible_get_accessible_role (GtkAccessible *self)
 {
-  GtkAccessibleRole role = GTK_ACCESSIBLE_ROLE_NONE;
+  GtkAccessibleRole role;

  g_return_val_if_fail (GTK_IS_ACCESSIBLE (self), GTK_ACCESSIBLE_ROLE_NONE);

  GtkATContext *context = gtk_accessible_get_at_context (self);
-  if (context != NULL)
-    {
-      if (gtk_at_context_is_realized (context))
-        role = gtk_at_context_get_accessible_role (context);
-
-      g_object_unref (context);
-
-      if (role != GTK_ACCESSIBLE_ROLE_NONE)
-        return role;
-    }
+  if (context != NULL && gtk_at_context_is_realized (context))
+    return gtk_at_context_get_accessible_role (context);

  g_object_get (G_OBJECT (self), "accessible-role", &role, NULL);

@@ -369,8 +245,6 @@ gtk_accessible_update_state (GtkAccessible      *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -424,7 +298,6 @@ gtk_accessible_update_state_value (GtkAccessible      *self,
    }

  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -448,7 +321,6 @@ gtk_accessible_reset_state (GtkAccessible      *self,

  gtk_at_context_set_accessible_state (context, state, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -520,8 +392,6 @@ gtk_accessible_update_property (GtkAccessible         *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -575,7 +445,6 @@ gtk_accessible_update_property_value (GtkAccessible         *self,
    }

  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -599,7 +468,6 @@ gtk_accessible_reset_property (GtkAccessible         *self,

  gtk_at_context_set_accessible_property (context, property, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -671,8 +539,6 @@ gtk_accessible_update_relation (GtkAccessible         *self,

 out:
  va_end (args);
-
-  g_object_unref (context);
 }

 /**
@@ -701,8 +567,6 @@ gtk_accessible_update_relation_value (GtkAccessible         *self,
  g_return_if_fail (n_relations > 0);

  context = gtk_accessible_get_at_context (self);
-  if (context == NULL)
-    return;

  for (int i = 0; i < n_relations; i++)
    {
@@ -721,14 +585,15 @@ gtk_accessible_update_relation_value (GtkAccessible         *self,
          break;
        }

-      gtk_at_context_set_accessible_relation (context, relation, real_value);
+      if (context)
+        gtk_at_context_set_accessible_relation (context, relation, real_value);

      if (real_value != NULL)
        gtk_accessible_value_unref (real_value);
    }

-  gtk_at_context_update (context);
-  g_object_unref (context);
+  if (context)
+    gtk_at_context_update (context);
 }

 /**
@@ -752,7 +617,6 @@ gtk_accessible_reset_relation (GtkAccessible         *self,

  gtk_at_context_set_accessible_relation (context, relation, NULL);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 static const char *role_names[] = {
@@ -913,22 +777,13 @@ gtk_accessible_platform_changed (GtkAccessible               *self,

  /* propagate changes up from ignored widgets */
  if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    {
-      GtkAccessible *parent = gtk_accessible_get_accessible_parent (self);
-
-      if (parent != NULL)
-        {
-          context = gtk_accessible_get_at_context (parent);
-          g_object_unref (parent);
-        }
-    }
+    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));

  if (context == NULL)
    return;

  gtk_at_context_platform_changed (context, change);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }

 /**
@@ -982,7 +837,6 @@ gtk_accessible_bounds_changed (GtkAccessible *self)
    return;

  gtk_at_context_bounds_changed (context);
-  g_object_unref (context);
 }

 /**
@@ -1035,7 +889,6 @@ gtk_accessible_should_present (GtkAccessible *self)
 {
  GtkAccessibleRole role;
  GtkATContext *context;
-  gboolean res = TRUE;

  if (GTK_IS_WIDGET (self) &&
      !gtk_widget_get_visible (GTK_WIDGET (self)))
@@ -1056,12 +909,10 @@ gtk_accessible_should_present (GtkAccessible *self)

      value = gtk_at_context_get_accessible_state (context, GTK_ACCESSIBLE_STATE_HIDDEN);
      if (gtk_boolean_accessible_value_get (value))
-        res = FALSE;
+        return FALSE;
    }

-  g_object_unref (context);
-
-  return res;
+  return TRUE;
 }

 void
@@ -1075,24 +926,15 @@ gtk_accessible_update_children (GtkAccessible           *self,
      gtk_widget_get_root (GTK_WIDGET (self)) == NULL)
    return;

+  context = gtk_accessible_get_at_context (self);
+
  /* propagate changes up from ignored widgets */
  if (gtk_accessible_get_accessible_role (self) == GTK_ACCESSIBLE_ROLE_NONE)
-    {
-      GtkAccessible *parent = gtk_accessible_get_accessible_parent (self);
-
-      context = gtk_accessible_get_at_context (parent);
-
-      g_object_unref (parent);
-    }
-  else
-    {
-      context = gtk_accessible_get_at_context (self);
-    }
+    context = gtk_accessible_get_at_context (gtk_accessible_get_accessible_parent (self));

  if (context == NULL)
    return;

  gtk_at_context_child_changed (context, 1 << state, child);
  gtk_at_context_update (context);
-  g_object_unref (context);
 }
@@ -73,7 +73,7 @@ struct _GtkAccessibleInterface
   * Retrieves the platform-specific accessibility context for the
   * accessible implementation.
   *
-   * Returns: (transfer full) (nullable): the accessibility context
+   * Returns: (transfer none) (nullable): the accessibility context
   *
   * Since: 4.10
   */
@@ -101,7 +101,7 @@ struct _GtkAccessibleInterface
   *
   * This virtual function should return `NULL` for top level objects.
   *
-   * Returns: (nullable) (transfer full): the accessible parent
+   * Returns: (nullable) (transfer none): the accessible parent
   *
   * Since: 4.10
   */
@@ -113,7 +113,7 @@ struct _GtkAccessibleInterface
   *
   * Retrieves the first accessible child of an accessible object.
   *
-   * Returns: (transfer full) (nullable): an accessible object
+   * Returns: (transfer none) (nullable): an accessible object
   *
   * Since: 4.10
   */
@@ -125,7 +125,7 @@ struct _GtkAccessibleInterface
   *
   * Retrieves the next accessible sibling of an accessible object.
   *
-   * Returns: (transfer full) (nullable): an accessible object
+   * Returns: (transfer none) (nullable): an accessible object
   *
   * Since: 4.10
   */
@@ -164,20 +164,11 @@ gboolean gtk_accessible_get_platform_state (GtkAccessible              *self,
 GDK_AVAILABLE_IN_4_10
 GtkAccessible * gtk_accessible_get_accessible_parent (GtkAccessible *self);

-GDK_AVAILABLE_IN_4_10
-void gtk_accessible_set_accessible_parent (GtkAccessible *self,
-                                           GtkAccessible *parent,
-                                           GtkAccessible *next_sibling);
-
 GDK_AVAILABLE_IN_4_10
 GtkAccessible * gtk_accessible_get_first_accessible_child (GtkAccessible *self);

 GDK_AVAILABLE_IN_4_10
 GtkAccessible * gtk_accessible_get_next_accessible_sibling (GtkAccessible *self);
-GDK_AVAILABLE_IN_4_10
-void gtk_accessible_update_next_accessible_sibling (GtkAccessible *self,
-                                                    GtkAccessible *new_sibling);
-

 GDK_AVAILABLE_IN_4_10
 gboolean gtk_accessible_get_bounds (GtkAccessible *self,
@@ -23,6 +23,10 @@
 #include "gtkapplication.h"
 #include "gdkprofilerprivate.h"

+#ifdef G_OS_UNIX
+#include <gio/gunixfdlist.h>
+#endif
+
 #include <stdlib.h>

 #ifdef HAVE_UNISTD_H
@@ -32,8 +36,10 @@
 #include "gtkapplicationprivate.h"
 #include "gtkmarshalers.h"
 #include "gtkmain.h"
+#include "gtkrecentmanager.h"
 #include "gtkicontheme.h"
 #include "gtkbuilder.h"
+#include "gtkshortcutswindow.h"
 #include "gtkprivate.h"

 /* NB: please do not add backend-specific GDK headers here.  This should
@@ -24,11 +24,16 @@
 #include "gtkapplicationprivate.h"
 #include "gtkwidgetprivate.h"
 #include "gtkwindowprivate.h"
+#include "gtkheaderbar.h"
 #include "gtkpopovermenubar.h"
 #include "gtksettings.h"
 #include "gtkshortcutswindowprivate.h"
 #include "gtktooltipprivate.h"

+#if defined(HAVE_GIO_UNIX) && !defined(__APPLE__)
+#include <gio/gdesktopappinfo.h>
+#endif
+
 /**
 * GtkApplicationWindow:
 *
@@ -85,20 +85,6 @@ gtk_at_context_dispose (GObject *gobject)

  gtk_at_context_unrealize (self);

-  if (self->accessible_parent != NULL)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (self->accessible_parent),
-                                    (gpointer *) &self->accessible_parent);
-      self->accessible_parent = NULL;
-    }
-
-  if (self->next_accessible_sibling != NULL)
-    {
-      g_object_remove_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                    (gpointer *) &self->next_accessible_sibling);
-      self->next_accessible_sibling = NULL;
-    }
-
  G_OBJECT_CLASS (gtk_at_context_parent_class)->dispose (gobject);
 }

@@ -461,91 +447,6 @@ gtk_at_context_get_accessible_role (GtkATContext *self)
  return self->accessible_role;
 }

-/*< private >
- * gtk_at_context_get_accessible_parent:
- * @self: a `GtkAtContext`
- *
- * Retrieves the parent accessible object of the given `GtkAtContext`.
- *
- * Returns: (nullable) (transfer none): the parent accessible object, or `NULL` if not set.
- */
-GtkAccessible *
-gtk_at_context_get_accessible_parent (GtkATContext *self)
-{
-  g_return_val_if_fail (GTK_IS_AT_CONTEXT (self), NULL);
-
-  return self->accessible_parent;
-}
-
-/*< private >
- * gtk_at_context_set_accessible_parent:
- * @self: a `GtkAtContext`
- * @parent: (nullable): the parent `GtkAccessible` to set
- *
- * Sets the parent accessible object of the given `GtkAtContext`.
- */
-void
-gtk_at_context_set_accessible_parent (GtkATContext *self,
-                                      GtkAccessible *parent)
-{
-  g_return_if_fail (GTK_IS_AT_CONTEXT (self));
-
-  if (self->accessible_parent != parent)
-    {
-      if (self->accessible_parent != NULL)
-        g_object_remove_weak_pointer (G_OBJECT (self->accessible_parent),
-                                      (gpointer *) &self->accessible_parent);
-
-      self->accessible_parent = parent;
-      if (self->accessible_parent != NULL)
-        g_object_add_weak_pointer (G_OBJECT (self->accessible_parent),
-                                   (gpointer *) &self->accessible_parent);
-    }
-}
-
-/*< private >
- * gtk_at_context_get_next_accessible_sibling:
- * @self: a `GtkAtContext`
- *
- * Retrieves the next accessible sibling of the given `GtkAtContext`.
- *
- * Returns: (nullable) (transfer none): the next accessible sibling.
- */
-GtkAccessible *
-gtk_at_context_get_next_accessible_sibling (GtkATContext *self)
-{
-  g_return_val_if_fail (GTK_IS_AT_CONTEXT (self), NULL);
-
-  return self->next_accessible_sibling;
-}
-
-/*< private >
- * gtk_at_context_set_next_accessible_sibling:
- * @self: a `GtkAtContext`
- * @sibling: (nullable): the next accessible sibling
- *
- * Sets the next accessible sibling object of the given `GtkAtContext`.
- */
-void
-gtk_at_context_set_next_accessible_sibling (GtkATContext *self,
-                                            GtkAccessible *sibling)
-{
-  g_return_if_fail (GTK_IS_AT_CONTEXT (self));
-
-  if (self->next_accessible_sibling != sibling)
-    {
-      if (self->next_accessible_sibling != NULL)
-        g_object_remove_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                      (gpointer *) &self->next_accessible_sibling);
-
-      self->next_accessible_sibling = sibling;
-
-      if (self->next_accessible_sibling != NULL)
-        g_object_add_weak_pointer (G_OBJECT (self->next_accessible_sibling),
-                                   (gpointer *) &self->next_accessible_sibling);
-    }
-}
-
 /*< private >
 * gtk_at_context_set_display:
 * @self: a `GtkATContext`
@@ -1028,8 +929,6 @@ gtk_at_context_get_name_accumulate (GtkATContext *self,
          GtkATContext *rel_context = gtk_accessible_get_at_context (rel);

          gtk_at_context_get_name_accumulate (rel_context, names, FALSE);
-
-          g_object_unref (rel_context);
        }
    }

@@ -1102,8 +1001,6 @@ gtk_at_context_get_description_accumulate (GtkATContext *self,
          GtkATContext *rel_context = gtk_accessible_get_at_context (rel);

          gtk_at_context_get_description_accumulate (rel_context, labels, FALSE);
-
-          g_object_unref (rel_context);
        }
    }

@@ -1255,3 +1152,37 @@ gtk_at_context_child_changed (GtkATContext             *self,

  GTK_AT_CONTEXT_GET_CLASS (self)->child_change (self, change, child);
 }
+
+/**
+ * gtk_at_context_get_dbus_object_path:
+ * @self: an accessibility context
+ *
+ * Returns the D-Bus object path of the accessibility context.
+ *
+ * If the accessibility context uses a D-Bus transport, the return value is
+ * the path at which you will be able to find the object.
+ *
+ * This function returns `NULL` if the accessibility context is unrealized,
+ * or it does not use D-Bus, or if the accessibility support has been
+ * disabled.
+ *
+ * Returns: (nullable) (transfer none): the D-Bus object path of the
+ *   accessibility context
+ *
+ * Since: 4.10
+ */
+const char *
+gtk_at_context_get_dbus_object_path (GtkATContext *self)
+{
+  g_return_val_if_fail (GTK_IS_AT_CONTEXT (self), NULL);
+
+  if (!self->realized)
+    return FALSE;
+
+  GtkATContextClass *klass = GTK_AT_CONTEXT_GET_CLASS (self);
+
+  if (klass->get_dbus_object_path != NULL)
+    return klass->get_dbus_object_path (self);
+  else
+    return NULL;
+}
@@ -45,4 +45,7 @@ GtkATContext *          gtk_at_context_create                   (GtkAccessibleRo
                                                                 GtkAccessible     *accessible,
                                                                 GdkDisplay        *display);

+GDK_AVAILABLE_IN_4_10
+const char *            gtk_at_context_get_dbus_object_path     (GtkATContext      *self);
+
 G_END_DECLS
@@ -87,8 +87,6 @@ struct _GtkATContext

  GtkAccessibleRole accessible_role;
  GtkAccessible *accessible;
-  GtkAccessible *accessible_parent;
-  GtkAccessible *next_accessible_sibling;
  GdkDisplay *display;

  GtkAccessibleAttributeSet *states;
@@ -126,6 +124,8 @@ struct _GtkATContextClass

  void (* realize)       (GtkATContext *self);
  void (* unrealize)     (GtkATContext *self);
+
+  const char * (* get_dbus_object_path) (GtkATContext *self);
 };

 GtkATContext *          gtk_at_context_clone                    (GtkATContext          *self,
@@ -181,15 +181,4 @@ const char *    gtk_accessible_property_get_attribute_name      (GtkAccessiblePr
 const char *    gtk_accessible_relation_get_attribute_name      (GtkAccessibleRelation relation);
 const char *    gtk_accessible_state_get_attribute_name         (GtkAccessibleState    state);

-GtkAccessible *
-gtk_at_context_get_accessible_parent (GtkATContext *self);
-void
-gtk_at_context_set_accessible_parent (GtkATContext *self,
-                                      GtkAccessible *parent);
-GtkAccessible *
-gtk_at_context_get_next_accessible_sibling (GtkATContext *self);
-void
-gtk_at_context_set_next_accessible_sibling (GtkATContext *self,
-                                            GtkAccessible *sibling);
-
 G_END_DECLS
@@ -67,6 +67,7 @@
 #include "gtkorientable.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
+#include "gtksizerequest.h"
 #include "gtkwidgetprivate.h"


@@ -216,10 +216,13 @@
 #include "gtkdebug.h"
 #include "gtkexpression.h"
 #include "gtkmain.h"
+#include "gtkicontheme.h"
 #include "gtkprivate.h"
 #include "gtkshortcutactionprivate.h"
 #include "gtkshortcuttrigger.h"
+#include "gtktestutils.h"
 #include "gtktypebuiltins.h"
+#include "gtkicontheme.h"
 #include "gtkiconthemeprivate.h"
 #include "gtkdebug.h"

@@ -1608,7 +1608,6 @@ create_subparser (GObject       *object,
  subparser->object = object;
  subparser->child = child;
  subparser->tagname = g_strdup (element_name);
-  subparser->level = 1;
  subparser->start = element_name;
  subparser->parser = g_memdup2 (parser, sizeof (GtkBuildableParser));
  subparser->data = user_data;
@@ -1639,8 +1638,6 @@ subparser_start (GtkBuildableParseContext  *context,

  if (subparser->start)
    {
-      subparser->level++;
-
      if (subparser->parser->start_element)
        subparser->parser->start_element (context,
                                          element_name, names, values,
@@ -1656,8 +1653,6 @@ subparser_end (GtkBuildableParseContext  *context,
               ParserData                *data,
               GError                   **error)
 {
-  data->subparser->level--;
-
  if (data->subparser->parser->end_element)
    data->subparser->parser->end_element (context, element_name,
                                          data->subparser->data, error);
@@ -1665,11 +1660,9 @@ subparser_end (GtkBuildableParseContext  *context,
  if (*error)
    return;

-  if (data->subparser->level > 0)
+  if (strcmp (data->subparser->start, element_name) != 0)
    return;

-  g_assert (strcmp (data->subparser->start, element_name) == 0);
-
  gtk_buildable_custom_tag_end (GTK_BUILDABLE (data->subparser->object),
                                data->builder,
                                data->subparser->child,
@@ -165,7 +165,6 @@ struct _GtkBuildableParseContext {
 typedef struct {
  GtkBuildableParser *parser;
  char *tagname;
-  int level;
  const char *start;
  gpointer data;
  GObject *object;
@@ -19,7 +19,7 @@
 * Modified by the GTK+ Team and others 1997-2001.  See the AUTHORS
 * file for a list of people on the GTK+ Team.  See the ChangeLog
 * files for a list of changes.  These files are distributed with
- * GTK+ at ftp://ftp.gtk.org/pub/gtk/.
+ * GTK+ at ftp://ftp.gtk.org/pub/gtk/. 
 */

 /**
@@ -63,11 +63,13 @@

 #include "gtkactionhelperprivate.h"
 #include "gtkbuildable.h"
+#include "gtkcheckbutton.h"
 #include "gtkgestureclick.h"
 #include "gtkeventcontrollerkey.h"
 #include "gtkbinlayout.h"
 #include "gtkimage.h"
 #include "gtklabel.h"
+#include "gtkmain.h"
 #include "gtkmarshalers.h"
 #include "gtkprivate.h"
 #include "gtktypebuiltins.h"
@@ -637,7 +639,7 @@ gtk_button_new_with_label (const char *label)

 /**
 * gtk_button_new_from_icon_name:
- * @icon_name: an icon name
+ * @icon_name: (nullable): an icon name
 *
 * Creates a new button containing an icon from the current icon theme.
 *
@@ -828,6 +830,8 @@ gtk_button_set_label (GtkButton   *button,
          gtk_label_set_use_underline (GTK_LABEL (child), priv->use_underline);
          gtk_label_set_mnemonic_widget (GTK_LABEL (child), GTK_WIDGET (button));
        }
+      if (GTK_IS_CHECK_BUTTON (button))
+        gtk_label_set_xalign (GTK_LABEL (child), 0.0);

      gtk_button_set_child (button,  child);
    }
@@ -965,6 +969,10 @@ gtk_button_set_icon_name (GtkButton  *button,
      gtk_image_set_from_icon_name (GTK_IMAGE (priv->child), icon_name);
    }

+  gtk_accessible_update_relation (GTK_ACCESSIBLE (button),
+                                  GTK_ACCESSIBLE_RELATION_LABELLED_BY, priv->child, NULL,
+                                  -1);
+
  gtk_button_set_child_type (button, ICON_CHILD);
  g_object_notify_by_pspec (G_OBJECT (button), props[PROP_ICON_NAME]);
 }
@@ -114,6 +114,7 @@
 #include "gtkeventcontrollerfocus.h"
 #include "gtkdragsource.h"
 #include "gtknative.h"
+#include "gtkicontheme.h"
 #include "gtkdragicon.h"
 #include "gtkbutton.h"
 #include "gtkbox.h"
@@ -29,6 +29,7 @@
 #include "gtkactionhelperprivate.h"
 #include "gtkboxlayout.h"
 #include "gtkbuiltiniconprivate.h"
+#include "gtkcssnumbervalueprivate.h"
 #include "gtkgestureclick.h"
 #include <glib/gi18n-lib.h>
 #include "gtklabel.h"
@@ -36,6 +37,7 @@
 #include "gtkshortcuttrigger.h"
 #include "gtkcssnodeprivate.h"
 #include "gtkwidgetprivate.h"
+#include "gtkmodelbuttonprivate.h"

 /**
 * GtkCheckButton:
@@ -26,6 +26,7 @@
 #include "gtkgesturelongpress.h"
 #include "gtkgestureclick.h"
 #include "gtkgesturesingle.h"
+#include "gtkicontheme.h"
 #include "gtkimage.h"
 #include <glib/gi18n-lib.h>
 #include "gtkmain.h"
@@ -477,8 +477,6 @@ gtk_column_view_dispose (GObject *object)
 {
  GtkColumnView *self = GTK_COLUMN_VIEW (object);

-  gtk_column_view_sorter_clear (GTK_COLUMN_VIEW_SORTER (self->sorter));
-
  while (g_list_model_get_n_items (G_LIST_MODEL (self->columns)) > 0)
    {
      GtkColumnViewColumn *column = g_list_model_get_item (G_LIST_MODEL (self->columns), 0);
@@ -23,6 +23,7 @@
 #include "gtkcssimageprivate.h"
 #include "gtkcsspalettevalueprivate.h"
 #include "gtkcsscolorvalueprivate.h"
+#include "gtkiconthemeprivate.h"
 #include "gdkpixbufutilsprivate.h"

 #include "gtkstyleproviderprivate.h"
--- a/Show More
+++ b/Show More