mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
67 lines
3.3 KiB
Diff
67 lines
3.3 KiB
Diff
diff --git build/config/compiler/BUILD.gn build/config/compiler/BUILD.gn
|
|
index b5d6d8fdb443..3cb6a0a719c2 100644
|
|
--- build/config/compiler/BUILD.gn
|
|
+++ build/config/compiler/BUILD.gn
|
|
@@ -406,7 +406,7 @@ config("compiler") {
|
|
# 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" ]
|
|
}
|
|
diff --git chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
|
|
index b8e9169c0db2..eff883b03f26 100644
|
|
--- chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
|
|
+++ chrome/browser/safe_browsing/settings_reset_prompt/settings_reset_prompt_controller.cc
|
|
@@ -57,6 +57,7 @@ bool ResetHomepageEnabled(const SettingsResetPromptModel& model) {
|
|
void TryToShowSettingsResetPrompt(
|
|
std::unique_ptr<SettingsResetPromptModel> model,
|
|
std::unique_ptr<BrandcodedDefaultSettings> default_settings) {
|
|
+#if defined(OS_WIN)
|
|
DCHECK(model);
|
|
DCHECK(default_settings);
|
|
|
|
@@ -78,6 +79,7 @@ void TryToShowSettingsResetPrompt(
|
|
SettingsResetPromptController::ShowSettingsResetPrompt(
|
|
browser, new SettingsResetPromptController(std::move(model),
|
|
std::move(default_settings)));
|
|
+#endif // defined(OS_WIN)
|
|
}
|
|
|
|
// Will display the settings reset prompt if required and if there is at least
|
|
diff --git chrome/browser/ui/libgtkui/gtk_ui.cc chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
index a38c6b806be7..bb4fa59d7612 100644
|
|
--- chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
+++ chrome/browser/ui/libgtkui/gtk_ui.cc
|
|
@@ -1053,7 +1053,11 @@ float GtkUi::GetRawDeviceScaleFactor() {
|
|
return display::Display::GetForcedDeviceScaleFactor();
|
|
|
|
GdkScreen* screen = gdk_screen_get_default();
|
|
+#if GTK_MAJOR_VERSION == 3
|
|
gint scale = gtk_widget_get_scale_factor(fake_window_);
|
|
+#else
|
|
+ gint scale = 1;
|
|
+#endif
|
|
gdouble resolution = gdk_screen_get_resolution(screen);
|
|
const float scale_factor =
|
|
resolution <= 0 ? scale : resolution * scale / kDefaultDPI;
|
|
diff --git ui/accessibility/platform/ax_platform_node_auralinux.cc ui/accessibility/platform/ax_platform_node_auralinux.cc
|
|
index c73d7a93abf3..5fcc441e4e7b 100644
|
|
--- ui/accessibility/platform/ax_platform_node_auralinux.cc
|
|
+++ ui/accessibility/platform/ax_platform_node_auralinux.cc
|
|
@@ -474,8 +474,12 @@ void AXPlatformNodeAuraLinux::GetAtkState(AtkStateSet* atk_state_set) {
|
|
atk_state_set_add_state(atk_state_set, ATK_STATE_EXPANDED);
|
|
if (data.HasState(ui::AX_STATE_FOCUSABLE))
|
|
atk_state_set_add_state(atk_state_set, ATK_STATE_FOCUSABLE);
|
|
+#if defined(ATK_CHECK_VERSION)
|
|
+#if ATK_CHECK_VERSION(2, 11, 2)
|
|
if (data.HasState(ui::AX_STATE_HASPOPUP))
|
|
atk_state_set_add_state(atk_state_set, ATK_STATE_HAS_POPUP);
|
|
+#endif
|
|
+#endif
|
|
if (data.HasState(ui::AX_STATE_SELECTED))
|
|
atk_state_set_add_state(atk_state_set, ATK_STATE_SELECTED);
|
|
if (data.HasState(ui::AX_STATE_SELECTABLE))
|