bcarrella/cef
1
0
Fork 0
mirror of https://bitbucket.org/chromiumembedded/cef synced 2025-02-19 21:50:42 +01:00
Code Issues Packages Projects Releases Wiki Activity

Linux: Fix undefined symbol: ui::GtkUiDelegate::SetInstance

Browse Source 
See https://crbug.com/1085806 for details.
This commit is contained in:
Marshall Greenblatt 2020-05-22 14:56:02 -04:00
parent 31d3e88d32
commit 5780bf40d4
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
patch/patch.cfg
View File

@ -498,5 +498,11 @@ patches = [
# iframes. # iframes.
# https://bugs.chromium.org/p/chromium/issues/detail?id=1081397#c9 # https://bugs.chromium.org/p/chromium/issues/detail?id=1081397#c9
'name': 'browser_security_policy_1081397', 'name': 'browser_security_policy_1081397',
},
{
# Linux: Fix undefined symbol: ui::GtkUiDelegate::SetInstance in
# ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized.
# https://bugs.chromium.org/p/chromium/issues/detail?id=1085806
'name': 'linux_chrome_views_1085806',
} }
] ]

13
patch/patches/linux_chrome_views_1085806.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
index 55026be5292d..589e2c3afd28 100644
--- chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
+++ chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.cc
@@ -45,7 +45,7 @@ ChromeBrowserMainExtraPartsViewsLinux::
}
void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() {
-#if defined(USE_X11)
+#if defined(USE_X11) && BUILDFLAG(USE_GTK)
// In Aura/X11, Gtk-based LinuxUI implementation is used, so we instantiate
// and inject the GtkUiDelegate before ChromeBrowserMainExtraPartsViewsLinux,
// so it can properly initialize GtkUi on its |ToolkitInitialized| override.