зеркало из https://github.com/electron/electron.git
52 строки
2.3 KiB
Diff
52 строки
2.3 KiB
Diff
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
From: Jeremy Apthorp <nornagon@nornagon.net>
|
|
Date: Thu, 20 Sep 2018 17:48:31 -0700
|
|
Subject: libgtkui_export.patch
|
|
|
|
Export libgtkui symbols for the GN component build.
|
|
|
|
diff --git a/chrome/browser/ui/libgtkui/gtk_util.h b/chrome/browser/ui/libgtkui/gtk_util.h
|
|
index c9712cd531c0e2114103bdf3f4cba3320b75c331..7fd8d177cec78e733c765097dcc0b9a65ed350ee 100644
|
|
--- a/chrome/browser/ui/libgtkui/gtk_util.h
|
|
+++ b/chrome/browser/ui/libgtkui/gtk_util.h
|
|
@@ -8,6 +8,7 @@
|
|
#include <gtk/gtk.h>
|
|
#include <string>
|
|
|
|
+#include "base/component_export.h"
|
|
#include "ui/base/glib/scoped_gobject.h"
|
|
#include "ui/native_theme/native_theme.h"
|
|
#include "ui/views/window/frame_buttons.h"
|
|
@@ -34,11 +35,11 @@ namespace libgtkui {
|
|
|
|
extern const color_utils::HSL kDefaultTintFrameIncognito;
|
|
|
|
-void GtkInitFromCommandLine(const base::CommandLine& command_line);
|
|
+COMPONENT_EXPORT(LIBGTKUI) void GtkInitFromCommandLine(const base::CommandLine& command_line);
|
|
|
|
// Sets |dialog| as transient for |parent|, which will keep it on top and center
|
|
// it above |parent|. Do nothing if |parent| is nullptr.
|
|
-void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
|
|
+COMPONENT_EXPORT(LIBGTKUI) void SetGtkTransientForAura(GtkWidget* dialog, aura::Window* parent);
|
|
|
|
// Gets the transient parent aura window for |dialog|.
|
|
aura::Window* GetAuraTransientParent(GtkWidget* dialog);
|
|
@@ -143,7 +144,7 @@ void ApplyCssToContext(GtkStyleContext* context, const std::string& css);
|
|
|
|
// Get the 'color' property from the style context created by
|
|
// GetStyleContextFromCss(|css_selector|).
|
|
-SkColor GetFgColor(const std::string& css_selector);
|
|
+COMPONENT_EXPORT(LIBGTKUI) SkColor GetFgColor(const std::string& css_selector);
|
|
|
|
ScopedCssProvider GetCssProvider(const std::string& css);
|
|
|
|
@@ -156,7 +157,7 @@ void RenderBackground(const gfx::Size& size,
|
|
// Renders a background from the style context created by
|
|
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
|
|
// returns the average color.
|
|
-SkColor GetBgColor(const std::string& css_selector);
|
|
+COMPONENT_EXPORT(LIBGTKUI) SkColor GetBgColor(const std::string& css_selector);
|
|
|
|
// Renders the border from the style context created by
|
|
// GetStyleContextFromCss(|css_selector|) into a 24x24 bitmap and
|