mirror of
https://github.com/electron/electron.git
synced 2026-04-10 03:01:51 -04:00
* chore: bump chromium in DEPS to 102.0.4975.0 * chore: bump chromium in DEPS to 102.0.4977.0 * chore: bump chromium in DEPS to 102.0.4979.0 * chore: bump chromium in DEPS to 102.0.4981.0 * chore: bump chromium in DEPS to 102.0.4983.0 * chore: bump chromium in DEPS to 102.0.4985.0 * chore: bump chromium in DEPS to 102.0.4987.0 * chore: bump chromium in DEPS to 102.0.4989.0 * chore: bump chromium in DEPS to 102.0.4991.0 * chore: bump chromium in DEPS to 102.0.4993.0 * chore: bump chromium in DEPS to 102.0.4995.0 * chore: bump chromium in DEPS to 102.0.4997.0 * chore: bump chromium in DEPS to 102.0.4999.0 * chore: bump chromium in DEPS to 102.0.5001.0 * chore: bump chromium in DEPS to 102.0.5003.0 * chore: bump chromium in DEPS to 102.0.5005.0 * chore: bump chromium in DEPS to 102.0.5005.3 * chore: bump chromium to 102.0.4989.0 (main) (#33557) * chore: bump chromium in DEPS to 102.0.4975.0 * chore: bump chromium in DEPS to 102.0.4977.0 * chore: update patches * Remove parameter of OnGpuProcessCrashed() https://chromium-review.googlesource.com/c/chromium/src/+/3543396 * hid: Add exclusionFilters option to requestDevice https://chromium-review.googlesource.com/c/chromium/src/+/3478175 * chore: bump chromium in DEPS to 102.0.4979.0 * chore: bump chromium in DEPS to 102.0.4981.0 * chore: update patches * Deny notification/push permission for documents in non-standard StoragePartitions https://chromium-review.googlesource.com/c/chromium/src/+/3257305 * Improve FrameTreeNode tracking in URLLoaderNetworkContext https://chromium-review.googlesource.com/c/chromium/src/+/3341866 * fixup! Remove parameter of OnGpuProcessCrashed() * chore: fix lint * Reland "Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome" https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * chore: bump chromium in DEPS to 102.0.4983.0 * Ensure EyeDropperView does not access a destroyed window https://chromium-review.googlesource.com/c/chromium/src/+/3561542 * ci: don't delete dawn .git directory 83901: Adds a generated file with the dawn git hash encoded at build time. | https://dawn-review.googlesource.com/c/dawn/+/83901 * ci: update Windows toolchain 3550827: New toolchain for Windows 10 20348 SDK | https://chromium-review.googlesource.com/c/chromium/src/+/3550827 * chore: bump chromium in DEPS to 102.0.4985.0 * chore: update patches * chore: bump chromium in DEPS to 102.0.4987.0 * chore: update patches * 3563432: codehealth: remove uses of DictionaryValue in cbui/webui https://chromium-review.googlesource.com/c/chromium/src/+/3563432 * chore: update patches after rebase * Use gfx::Insets[F]::TLBR() and gfx::Insets[F]::VH() in the rest of Chrome https://chromium-review.googlesource.com/c/chromium/src/+/3554236 * 3565724: Preserve "proper method names" as-is in error.stack. https://chromium-review.googlesource.com/c/v8/v8/+/3565724 * chore: bump chromium in DEPS to 102.0.4989.0 * chore: update patches * fixup ci: don't delete dawn .git directory for Windows * 3560843: Remove multi-parameter version of gfx::Rect[F]::Inset() https://chromium-review.googlesource.com/c/chromium/src/+/3560843 * 3572711: Remove unused IDS_PDF_TOOLTIP_ROTATE_CW resource. https://chromium-review.googlesource.com/c/chromium/src/+/3572711 * 3572926: Reland "[Sysroot] Switch to Debian Bullseye stable" https://chromium-review.googlesource.com/c/chromium/src/+/3572926 * build: fixup sysroots with electron specific dependencies * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * fixup 3565724: Preserve "proper method names" as-is in error.stack. * fixup Remove multi-parameter version of gfx::Rect[F]::Inset() * test: add spec for navigator.hid.requestDevice({ exclusionFilters: [...] } * fixup 3565724: Preserve "proper method names" as-is in error.stack. * ci: use python3 to get the windows toolchain profile 3525960: Explicitly run everything with python3 | https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3525960 * chore: add diagnostic logging * fix: try calling process.crash() * chore: remove logging Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: deepak1556 <hop2deep@gmail.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org> Co-authored-by: PatchUp <73610968+patchup[bot]@users.noreply.github.com> Co-authored-by: Shelley Vohr <shelley.vohr@gmail.com> (cherry picked from commit59dd17f2cf) * chore: update patches after rebase * chore: bump chromium in DEPS to 102.0.5005.3 * Revert "chore: bump chromium in DEPS to 102.0.5005.3" This reverts commit958cfb2aff. Co-authored-by: electron-roller[bot] <84116207+electron-roller[bot]@users.noreply.github.com> Co-authored-by: John Kleinschmidt <jkleinsc@electronjs.org>
53 lines
1.4 KiB
Diff
53 lines
1.4 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::GetLibGtk public
|
|
|
|
Allows embedders to get a handle to the gtk library
|
|
already loaded in the process.
|
|
|
|
diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
|
|
index 0ed04582106639911d9a4e0284ff880be9c3bc74..bfda81b08be52406048be9b96d2de59223d56ee7 100644
|
|
--- a/ui/gtk/gtk_compat.cc
|
|
+++ b/ui/gtk/gtk_compat.cc
|
|
@@ -86,12 +86,6 @@ void* GetLibGtk4(bool check = true) {
|
|
return libgtk4;
|
|
}
|
|
|
|
-void* GetLibGtk() {
|
|
- if (GtkCheckVersion(4))
|
|
- return GetLibGtk4();
|
|
- return GetLibGtk3();
|
|
-}
|
|
-
|
|
bool LoadGtk3() {
|
|
if (!GetLibGtk3(false))
|
|
return false;
|
|
@@ -134,6 +128,12 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
|
|
|
|
} // namespace
|
|
|
|
+void* GetLibGtk() {
|
|
+ if (GtkCheckVersion(4))
|
|
+ return GetLibGtk4();
|
|
+ return GetLibGtk3();
|
|
+}
|
|
+
|
|
bool LoadGtk() {
|
|
static bool loaded = LoadGtkImpl();
|
|
return loaded;
|
|
diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
|
|
index 72981270fe26579211afcaf3c596a412f69f5fac..b5dbfde5b011d57d26960d245e0dc61cac9341e4 100644
|
|
--- a/ui/gtk/gtk_compat.h
|
|
+++ b/ui/gtk/gtk_compat.h
|
|
@@ -37,6 +37,9 @@ using SkColor = uint32_t;
|
|
|
|
namespace gtk {
|
|
|
|
+// Get handle to the currently loaded gtk library in the process.
|
|
+void* GetLibGtk();
|
|
+
|
|
// Loads libgtk and related libraries and returns true on success.
|
|
bool LoadGtk();
|
|
|