Merge gdk_pixbuf stubs into gtk stubs

electron · Jun 13, 2022 · 6ae52e8 · 6ae52e8
1 parent 8db8315
commit 6ae52e8
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 18 deletions.
diff --git a/BUILD.gn b/BUILD.gn
@@ -94,15 +94,6 @@ if (is_linux) {
     logging_function = "LogNoop()"
     logging_include = "ui/gtk/log_noop.h"
   }
-
-  generate_stubs("electron_gdk_pixbuf_stubs") {
-    sigs = [ "shell/browser/ui/electron_gdk_pixbuf.sigs" ]
-    extra_header = "shell/browser/ui/electron_gdk_pixbuf.fragment"
-    output_name = "electron_gdk_pixbuf_stubs"
-    public_deps = [ "//ui/gtk:gtk_config" ]
-    logging_function = "LogNoop()"
-    logging_include = "ui/gtk/log_noop.h"
-  }
 }
 
 declare_args() {
@@ -562,7 +553,6 @@ source_set("electron_lib") {
   if (is_linux) {
     libs = [ "xshmfence" ]
     deps += [
-      ":electron_gdk_pixbuf_stubs",
       ":electron_gtk_stubs",
       ":libnotify_loader",
       "//build/config/linux/gtk",

diff --git a/shell/browser/ui/electron_gdk_pixbuf.fragment b/shell/browser/ui/electron_gdk_pixbuf.fragment
diff --git a/shell/browser/ui/electron_gdk_pixbuf.sigs b/shell/browser/ui/electron_gdk_pixbuf.sigs
diff --git a/shell/browser/ui/electron_gtk.fragment b/shell/browser/ui/electron_gtk.fragment
@@ -1 +1,2 @@
-#include <gtk/gtk.h>
+#include <gdk-pixbuf/gdk-pixbuf.h>
+#include <gtk/gtk.h>
diff --git a/shell/browser/ui/electron_gtk.sigs b/shell/browser/ui/electron_gtk.sigs
@@ -4,4 +4,7 @@ void gtk_native_dialog_show(GtkNativeDialog* self);
 void gtk_native_dialog_hide(GtkNativeDialog* self);
 gint gtk_native_dialog_run(GtkNativeDialog* self);
 void gtk_native_dialog_destroy(GtkNativeDialog* self);
-GType gtk_native_dialog_get_type(void);
+GType gtk_native_dialog_get_type(void);
+GdkPixbuf* gdk_pixbuf_new(GdkColorspace colorspace, gboolean has_alpha, int bits_per_sample, int width, int height)
+GdkPixbuf* gdk_pixbuf_scale_simple(const GdkPixbuf* src, int dest_width, int dest_height, GdkInterpType interp_type)
+guchar* gdk_pixbuf_get_pixels(const GdkPixbuf* pixbuf)
diff --git a/shell/browser/ui/gtk_util.cc b/shell/browser/ui/gtk_util.cc
@@ -12,7 +12,7 @@
 
 #include "base/no_destructor.h"
 #include "base/strings/string_number_conversions.h"
-#include "electron/electron_gdk_pixbuf_stubs.h"
+#include "electron/electron_gtk_stubs.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "third_party/skia/include/core/SkUnPreMultiply.h"

diff --git a/shell/browser/ui/message_box_gtk.cc b/shell/browser/ui/message_box_gtk.cc
@@ -11,7 +11,7 @@
 #include "base/no_destructor.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "electron/electron_gdk_pixbuf_stubs.h"
+#include "electron/electron_gtk_stubs.h"
 #include "shell/browser/browser.h"
 #include "shell/browser/native_window_observer.h"
 #include "shell/browser/native_window_views.h"