mirror of
https://bitbucket.org/chromiumembedded/cef
synced 2025-06-05 21:39:12 +02:00
Update to Chromium version 122.0.6261.0 (#1250580)
Frame identifiers have changed from int64_t to string type. This is due to https://crbug.com/1502660 which removes access to frame routing IDs in the renderer process. New cross-process frame identifiers are 160-bit values (32-bit child process ID + 128-bit local frame token) and most easily represented as strings. All other frame-related expectations and behaviors remain the same.
This commit is contained in:
@@ -32,7 +32,7 @@ index 6b9d2c180c904..3570ef071ba07 100644
|
||||
return (dark_mode_support.allow_dark_mode_for_app ||
|
||||
dark_mode_support.set_preferred_app_mode) &&
|
||||
diff --git ui/native_theme/native_theme_mac.mm ui/native_theme/native_theme_mac.mm
|
||||
index b9feac1c87c51..bb63c6d350bfe 100644
|
||||
index be2f769afe2d1..51bcf353b8797 100644
|
||||
--- ui/native_theme/native_theme_mac.mm
|
||||
+++ ui/native_theme/native_theme_mac.mm
|
||||
@@ -50,6 +50,13 @@ bool InvertedColors() {
|
||||
@@ -49,7 +49,7 @@ index b9feac1c87c51..bb63c6d350bfe 100644
|
||||
} // namespace
|
||||
|
||||
// Helper object to respond to light mode/dark mode changeovers.
|
||||
@@ -577,11 +584,15 @@ void NativeThemeMac::PaintSelectedMenuItem(
|
||||
@@ -594,11 +601,15 @@ void NativeThemeMac::PaintSelectedMenuItem(
|
||||
|
||||
void NativeThemeMac::InitializeDarkModeStateAndObserver() {
|
||||
__block auto theme = this;
|
||||
@@ -67,22 +67,11 @@ index b9feac1c87c51..bb63c6d350bfe 100644
|
||||
theme->set_preferred_color_scheme(CalculatePreferredColorScheme());
|
||||
theme->NotifyOnNativeThemeUpdated();
|
||||
}];
|
||||
@@ -590,7 +601,9 @@ void NativeThemeMac::InitializeDarkModeStateAndObserver() {
|
||||
void NativeThemeMac::ConfigureWebInstance() {
|
||||
// NativeThemeAura is used as web instance so we need to initialize its state.
|
||||
NativeTheme* web_instance = NativeTheme::GetInstanceForWeb();
|
||||
- web_instance->set_use_dark_colors(IsDarkMode());
|
||||
+ if (!IsForcedLightMode()) {
|
||||
+ web_instance->set_use_dark_colors(IsForcedDarkMode() || IsDarkMode());
|
||||
+ }
|
||||
web_instance->set_preferred_color_scheme(CalculatePreferredColorScheme());
|
||||
web_instance->SetPreferredContrast(CalculatePreferredContrast());
|
||||
web_instance->set_prefers_reduced_transparency(PrefersReducedTransparency());
|
||||
diff --git ui/native_theme/native_theme_win.cc ui/native_theme/native_theme_win.cc
|
||||
index 50647269ec84f..c947bd2717d04 100644
|
||||
index 6af4df92820d5..c2ae96510d011 100644
|
||||
--- ui/native_theme/native_theme_win.cc
|
||||
+++ ui/native_theme/native_theme_win.cc
|
||||
@@ -662,14 +662,17 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
|
||||
@@ -653,14 +653,17 @@ bool NativeThemeWin::ShouldUseDarkColors() const {
|
||||
// Windows high contrast modes are entirely different themes,
|
||||
// so let them take priority over dark mode.
|
||||
// ...unless --force-dark-mode was specified in which case caveat emptor.
|
||||
@@ -102,7 +91,7 @@ index 50647269ec84f..c947bd2717d04 100644
|
||||
return NativeTheme::CalculatePreferredColorScheme();
|
||||
|
||||
// According to the spec, the preferred color scheme for web content is 'dark'
|
||||
@@ -1660,8 +1663,9 @@ void NativeThemeWin::RegisterColorFilteringRegkeyObserver() {
|
||||
@@ -1651,8 +1654,9 @@ void NativeThemeWin::RegisterColorFilteringRegkeyObserver() {
|
||||
}
|
||||
|
||||
void NativeThemeWin::UpdateDarkModeStatus() {
|
||||
|
Reference in New Issue
Block a user