From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: deepak1556 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();