From 7a9b2483f6e1476ad373df6733d96f17bbf103a6 Mon Sep 17 00:00:00 2001 From: Peter Varga Date: Mon, 25 Jan 2021 17:17:11 +0100 Subject: Add back prefers-color-scheme support Task-number: QTBUG-89753 Change-Id: I89552671de0127d4e74ede4ca5f7fc4eab8cae6d Reviewed-by: Allan Sandfeld Jensen --- src/core/web_engine_settings.cpp | 27 ++++++++++----------------- 1 file changed, 10 insertions(+), 17 deletions(-) diff --git a/src/core/web_engine_settings.cpp b/src/core/web_engine_settings.cpp index ffa2b615e..4115d10d7 100644 --- a/src/core/web_engine_settings.cpp +++ b/src/core/web_engine_settings.cpp @@ -407,23 +407,16 @@ void WebEngineSettings::applySettingsToWebPreferences(blink::web_pref::WebPrefer // Set the theme colors. Based on chrome_content_browser_client.cc: const ui::NativeTheme *webTheme = ui::NativeTheme::GetInstanceForWeb(); - // WebPreferences::preferred_color_scheme was deleted in Chromium 80, but it - // will make a comeback in Chromium 82... - // - // See also: https://chromium-review.googlesource.com/c/chromium/src/+/2079192 - // - // if (webTheme) { - // switch (webTheme->GetPreferredColorScheme()) { - // case ui::NativeTheme::PreferredColorScheme::kDark: - // prefs->preferred_color_scheme = blink::PreferredColorScheme::kDark; - // break; - // case ui::NativeTheme::PreferredColorScheme::kLight: - // prefs->preferred_color_scheme = blink::PreferredColorScheme::kLight; - // break; - // case ui::NativeTheme::PreferredColorScheme::kNoPreference: - // prefs->preferred_color_scheme = blink::PreferredColorScheme::kNoPreference; - // } - // } + if (webTheme) { + switch (webTheme->GetPreferredColorScheme()) { + case ui::NativeTheme::PreferredColorScheme::kDark: + prefs->preferred_color_scheme = blink::PreferredColorScheme::kDark; + break; + case ui::NativeTheme::PreferredColorScheme::kLight: + prefs->preferred_color_scheme = blink::PreferredColorScheme::kLight; + break; + } + } // Apply native CaptionStyle parameters. base::Optional style; -- cgit v1.2.3