| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 | 
					
						
							|  |  |  | From: deepak1556 <hop2deep@gmail.com> | 
					
						
							|  |  |  | Date: Thu, 7 Apr 2022 20:30:16 +0900 | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | Subject: Make gtk::GetLibGdkPixbuf public | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | 
 | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | Allows embedders to get a handle to the gdk_pixbuf | 
					
						
							|  |  |  | library already loaded in the process. | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | 
 | 
					
						
							|  |  |  | diff --git a/ui/gtk/gtk_compat.cc b/ui/gtk/gtk_compat.cc
 | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | index 3a4b856ec5c2f5c3ede6e8f6db7858498b737702..e410998c4197c98947d2e1ad8bebe12c70379358 100644
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | --- a/ui/gtk/gtk_compat.cc
 | 
					
						
							|  |  |  | +++ b/ui/gtk/gtk_compat.cc
 | 
					
						
							| 
									
										
										
										
											2022-06-19 17:42:30 -07:00
										 |  |  | @@ -66,11 +66,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; | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | @@ -134,6 +129,11 @@ gfx::Insets InsetsFromGtkBorder(const GtkBorder& border) {
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  |   | 
					
						
							|  |  |  |  }  // namespace | 
					
						
							|  |  |  |   | 
					
						
							| 
									
										
										
										
											2022-06-19 17:42:30 -07:00
										 |  |  | +void* GetLibGdkPixbuf() {
 | 
					
						
							|  |  |  | +  static void* libgdk_pixbuf = DlOpen("libgdk_pixbuf-2.0.so.0");
 | 
					
						
							|  |  |  | +  return libgdk_pixbuf;
 | 
					
						
							|  |  |  | +}
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | +
 | 
					
						
							|  |  |  |  bool LoadGtk() { | 
					
						
							|  |  |  |    static bool loaded = LoadGtkImpl(); | 
					
						
							|  |  |  |    return loaded; | 
					
						
							|  |  |  | diff --git a/ui/gtk/gtk_compat.h b/ui/gtk/gtk_compat.h
 | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | index 19f73cc179d82a3729c5fe37883460ac05f4d0c3..17aa0b95bd6158ed02c03095c1687185a057fe62 100644
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | --- a/ui/gtk/gtk_compat.h
 | 
					
						
							|  |  |  | +++ b/ui/gtk/gtk_compat.h
 | 
					
						
							| 
									
										
										
										
											2024-05-09 15:51:42 +02:00
										 |  |  | @@ -41,6 +41,9 @@ using SkColor = uint32_t;
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  |   | 
					
						
							|  |  |  |  namespace gtk { | 
					
						
							|  |  |  |   | 
					
						
							| 
									
										
										
										
											2022-06-19 17:42:30 -07:00
										 |  |  | +// Get handle to the currently loaded gdk_pixbuf library in the process.
 | 
					
						
							|  |  |  | +void* GetLibGdkPixbuf();
 | 
					
						
							| 
									
										
										
										
											2022-04-18 13:24:32 +09:00
										 |  |  | +
 | 
					
						
							|  |  |  |  // Loads libgtk and related libraries and returns true on success. | 
					
						
							|  |  |  |  bool LoadGtk(); | 
					
						
							|  |  |  |   |