b0c11371e0* chore: bump chromium in DEPS to 136.0.7056.0 * chore: update mas_avoid_private_macos_api_usage.patch.patch no manual changes; patch applied with fuzz * chore: update fix_adapt_exclusive_access_for_electron_needs.patch patch applied manually due to context shear 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble | https://chromium-review.googlesource.com/c/chromium/src/+/6319958 * chore: update feat_allow_usage_of_sccontentsharingpicker_on_supported_platforms.patch no manual changes; patch applied with fuzz 6311876: Expose captured surface resolution for MacOS | https://chromium-review.googlesource.com/c/chromium/src/+/6311876 * chore: e patches all * 6319958: [FS] Replace GURL with url::Origin for Excluisve Access Bubble | https://chromium-review.googlesource.com/c/chromium/src/+/6319958 * 6326673: views: Delete the single-parameter Widget::InitParams constructor. | https://chromium-review.googlesource.com/c/chromium/src/+/6326673 * https://chromium-review.googlesource.com/c/chromium/src/+/6331102 * 6331102: [A11yPerformance] Rename AXMode::kScreenReader to kExtendedProperties | https://chromium-review.googlesource.com/c/chromium/src/+/6331102 Sync with shell/browser/ui/webui/accessibility_ui.cc to upstream chrome/browser/accessibility/accessibility_ui.cc changes in 4af8657 * chore: bump Chromium 136.0.7058.1 (#45933) chore: bump chromium in DEPS to 136.0.7058.1 --------- Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr <charles@charleskerr.com>
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 d6ac3233de3165d2be3e5d4fb3e221dca8b8d415..4f15069af07b7adc3e3c45e67e23ec8525668c21 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();
|
|
|