9d3696e4b3
* chore: bump chromium in DEPS to 136.0.7103.25 * chore: update patches --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: deepak1556 <hop2deep@gmail.com>
|
|
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 f28cf275db0205186fe6143b7e1550b6c30a4435..346992e202c507eeac454d657507e1bd336175fc 100644
|
|
--- a/ui/gtk/gtk_compat.cc
|
|
+++ b/ui/gtk/gtk_compat.cc
|
|
@@ -69,11 +69,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;
|
|
@@ -150,6 +145,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();
|
|
|