From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: deepak1556 Date: Thu, 7 Apr 2022 20:30:16 +0900 Subject: Make gtk::GetLibGdkPixbuf public Allows embedders to get a handle to the gdk_pixbuf library already loaded in the process. diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc index 946eb3eef6b0c546ace65de0c7f14b4642208090..9c9a35d439602ea3612ed648931990ec224c8799 100644 --- a/ui/gtk/gtk_compat.cc +++ b/ui/gtk/gtk_compat.cc @@ -70,11 +70,6 @@ void* GetLibGio() { return libgio; } -void* GetLibGdkPixbuf() { - static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0"); - return libgdk_pixbuf; -} - void* GetLibGdk3() { static void* libgdk3 = DlOpen("libgdk-3.so.0"); return libgdk3; @@ -170,6 +165,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) { } // namespace +void* GetLibGdkPixbuf() { + static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0"); + return libgdk_pixbuf; +} + bool LoadGtk() { static bool loaded = LoadGtkImpl(); return loaded; diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h index 19f73cc179d82a3729c5fe37883460ac05f4d0c3..17aa0b95bd6158ed02c03095c1687185a057fe62 100644 --- a/ui/gtk/gtk_compat.h +++ b/ui/gtk/gtk_compat.h @@ -41,6 +41,9 @@ using SkColor = uint32_t; namespace gtk { +// Get handle to the currently loaded gdk_pixbuf library in the process. +void* GetLibGdkPixbuf(); + // Loads libgtk and related libraries and returns true on success. bool LoadGtk();