2017-09-12 19:21:18 +02:00
|
|
|
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
|
2017-12-07 22:44:24 +01:00
|
|
|
index fff8488778d7..0443bcace1d4 100644
|
2017-09-12 19:21:18 +02:00
|
|
|
--- build/config/compiler/BUILD.gn
|
|
|
|
|
+++ build/config/compiler/BUILD.gn
|
2017-12-07 22:44:24 +01:00
|
|
|
@@ -399,7 +399,7 @@ config("compiler") {
|
2017-09-12 19:21:18 +02:00
|
|
|
# chromeos binutils has been patched with the fix, so always use icf there.
|
|
|
|
|
# The bug only affects x86 and x64, so we can still use ICF when targeting
|
|
|
|
|
# other architectures.
|
|
|
|
|
- if ((!is_android && linux_use_bundled_binutils) || is_chromeos ||
|
|
|
|
|
+ if ((!is_android && linux_use_bundled_binutils && current_cpu != "x86") || is_chromeos ||
|
|
|
|
|
!(current_cpu == "x86" || current_cpu == "x64")) {
|
|
|
|
|
ldflags += [ "-Wl,--icf=all" ]
|
|
|
|
|
}
|
2017-12-07 22:44:24 +01:00
|
|
|
diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
|
|
|
index bf37dd5c3799..ad5693e38487 100644
|
|
|
|
|
--- chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
|
|
|
+++ chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
|
|
|
@@ -404,11 +404,13 @@ SkColor GetToolbarTopSeparatorColor(SkColor header_fg,
|
|
|
|
|
}
|
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
+#if GTK_MAJOR_VERSION >= 3
|
|
|
|
|
using GdkSetAllowedBackendsFn = void (*)(const gchar*);
|
|
|
|
|
// Place this function pointers in read-only memory after being resolved to
|
|
|
|
|
// prevent it being tampered with. See crbug.com/771365 for details.
|
|
|
|
|
PROTECTED_MEMORY_SECTION base::ProtectedMemory<GdkSetAllowedBackendsFn>
|
|
|
|
|
g_gdk_set_allowed_backends;
|
|
|
|
|
+#endif
|
|
|
|
|
|
|
|
|
|
} // namespace
|
|
|
|
|
|
|
|
|
|
diff --git chrome/browser/ui/libgtkui/native_theme_gtk2.cc chrome/browser/ui/libgtkui/native_theme_gtk2.cc
|
|
|
|
|
index af67e8343f5a..1e6d1e5818e4 100644
|
|
|
|
|
--- chrome/browser/ui/libgtkui/native_theme_gtk2.cc
|
|
|
|
|
+++ chrome/browser/ui/libgtkui/native_theme_gtk2.cc
|
|
|
|
|
@@ -348,6 +348,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
case kColorId_NumColors:
|
|
|
|
|
+ default:
|
|
|
|
|
NOTREACHED();
|
|
|
|
|
break;
|
|
|
|
|
}
|
|
|
|
|
diff --git ui/accessibility/platform/atk_util_auralinux_gtk2.cc ui/accessibility/platform/atk_util_auralinux_gtk2.cc
|
|
|
|
|
index 9c50ead85605..54cbd52c7de0 100644
|
|
|
|
|
--- ui/accessibility/platform/atk_util_auralinux_gtk2.cc
|
|
|
|
|
+++ ui/accessibility/platform/atk_util_auralinux_gtk2.cc
|
|
|
|
|
@@ -56,6 +56,8 @@ void FinishAccessibilityInitOnMainThread(
|
|
|
|
|
init_func();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
+namespace ui {
|
|
|
|
|
+
|
|
|
|
|
bool AtkUtilAuraLinux::PlatformShouldEnableAccessibility() {
|
|
|
|
|
std::unique_ptr<base::Environment> env(base::Environment::Create());
|
|
|
|
|
std::string gtk_modules;
|
|
|
|
|
@@ -78,3 +80,6 @@ void AtkUtilAuraLinux::PlatformInitializeAsync() {
|
|
|
|
|
base::Bind(&GetAccessibilityModuleInitFunc),
|
|
|
|
|
base::Bind(&FinishAccessibilityInitOnMainThread));
|
|
|
|
|
}
|
|
|
|
|
+
|
|
|
|
|
+} // namespace ui
|
|
|
|
|
+
|
