[gtk/widgetfactory-async-load: 2/4] Revert "Add delayed loading for textures"




commit 1430142ad8d6af5151410751761caf5981fde2f8
Author: Matthias Clasen <mclasen redhat com>
Date:   Tue Sep 21 23:09:40 2021 -0400

    Revert "Add delayed loading for textures"
    
    This reverts commit 4a89cfe2c938512c4580d3697cc08a64e41f5f36.

 gtk/gdkpixbufutils.c   |  14 ++--
 gtk/gtkloader.c        | 186 -------------------------------------------------
 gtk/gtkloaderprivate.h |  35 ----------
 gtk/meson.build        |   1 -
 4 files changed, 7 insertions(+), 229 deletions(-)
---
diff --git a/gtk/gdkpixbufutils.c b/gtk/gdkpixbufutils.c
index 59c87a97e9..df8c542deb 100644
--- a/gtk/gdkpixbufutils.c
+++ b/gtk/gdkpixbufutils.c
@@ -580,7 +580,7 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
                                      int     scale_factor)
 {
   LoaderData loader_data;
-  GdkPaintable *inner;
+  GdkTexture *texture;
   GdkPaintable *paintable;
 
   loader_data.scale_factor = scale_factor;
@@ -588,8 +588,8 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
   if (gdk_texture_can_load (bytes))
     {
       /* We know these formats can't be scaled */
-      inner = GDK_PAINTABLE (gdk_texture_new_from_bytes (bytes, NULL));
-      if (inner == NULL)
+      texture = gdk_texture_new_from_bytes (bytes, NULL);
+      if (texture == NULL)
         return NULL;
     }
   else
@@ -608,16 +608,16 @@ gdk_paintable_new_from_bytes_scaled (GBytes *bytes,
       if (!success)
         return NULL;
 
-      inner = GDK_PAINTABLE (gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader)));
+      texture = gdk_texture_new_for_pixbuf (gdk_pixbuf_loader_get_pixbuf (loader));
       g_object_unref (loader);
     }
 
   if (loader_data.scale_factor != 1)
-    paintable = gtk_scaler_new (inner, loader_data.scale_factor);
+    paintable = gtk_scaler_new (GDK_PAINTABLE (texture), loader_data.scale_factor);
   else
-    paintable = g_object_ref ((GdkPaintable *)inner);
+    paintable = g_object_ref ((GdkPaintable *)texture);
 
-  g_object_unref (inner);
+  g_object_unref (texture);
 
   return paintable;
 }
diff --git a/gtk/meson.build b/gtk/meson.build
index 747096a7d4..bc097fdd6f 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -116,7 +116,6 @@ gtk_private_sources = files([
   'gtkiconhelper.c',
   'gtkjoinedmenu.c',
   'gtkkineticscrolling.c',
-  'gtkloader.c',
   'gtkmagnifier.c',
   'gtkmenusectionbox.c',
   'gtkmenutracker.c',


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]