diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-10-31 13:20:57 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2023-12-09 19:53:11 +0100 |
| commit | 55ed2da25e0cfe904e016421eadcbb7ab50669df (patch) | |
| tree | 84e8af4b94ea565427696a392331c1475e00ec9c /src/core/api/qwebengineglobalsettings.cpp | |
| parent | 7cc542c24464756cfe1fad9019e788080f2a6528 (diff) | |
Chromium 118 adaptations
Change-Id: I8eea99a472cc597ff9864b570c90b28b79b3751e
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Diffstat (limited to 'src/core/api/qwebengineglobalsettings.cpp')
| -rw-r--r-- | src/core/api/qwebengineglobalsettings.cpp | 36 |
1 files changed, 9 insertions, 27 deletions
diff --git a/src/core/api/qwebengineglobalsettings.cpp b/src/core/api/qwebengineglobalsettings.cpp index d79a5d9e5..6aadd5517 100644 --- a/src/core/api/qwebengineglobalsettings.cpp +++ b/src/core/api/qwebengineglobalsettings.cpp @@ -9,15 +9,15 @@ #undef signals #endif -#include "content/public/browser/network_service_instance.h" -#include "services/network/network_service.h" +namespace QtWebEngineCore { +extern void configureStubHostResolver(QWebEngineGlobalSettings::SecureDnsMode dnsMode, + std::string dnsOverHttpsTemplates, bool insecureDnsClientEnabled, + bool additionalInsecureDnsTypesEnabled); +extern bool isValidTemplates(std::string templates); -QT_BEGIN_NAMESPACE +} // namespace QtWebEngineCore -ASSERT_ENUMS_MATCH(net::SecureDnsMode::kSecure, QWebEngineGlobalSettings::SecureDnsMode::SecureOnly) -ASSERT_ENUMS_MATCH(net::SecureDnsMode::kAutomatic, - QWebEngineGlobalSettings::SecureDnsMode::SecureWithFallback) -ASSERT_ENUMS_MATCH(net::SecureDnsMode::kOff, QWebEngineGlobalSettings::SecureDnsMode::SystemOnly) +QT_BEGIN_NAMESPACE /*! \namespace QWebEngineGlobalSettings @@ -99,9 +99,7 @@ bool QWebEngineGlobalSettings::setDnsMode(DnsMode dnsMode) if (dnsMode.secureMode != SecureDnsMode::SystemOnly) { const QString servers = dnsMode.serverTemplates.join(QChar::Space); const std::string templates = servers.toStdString(); - absl::optional<net::DnsOverHttpsConfig> dnsOverHttpsConfig = - net::DnsOverHttpsConfig::FromString(templates); - if (!dnsOverHttpsConfig.has_value()) + if (!QtWebEngineCore::isValidTemplates(templates)) return false; d->dnsOverHttpsTemplates = templates; } @@ -121,23 +119,7 @@ QWebEngineGlobalSettingsPrivate *QWebEngineGlobalSettingsPrivate::instance() void QWebEngineGlobalSettingsPrivate::configureStubHostResolver() { - if (content::IsNetworkServiceCreated()) { - network::mojom::NetworkService *networkService = content::GetNetworkService(); - if (networkService) { - qDebug() << "doh set to" << dnsOverHttpsTemplates << " -- " - << (dnsMode == QWebEngineGlobalSettings::SecureDnsMode::SecureOnly - ? "SecureOnly" - : dnsMode == QWebEngineGlobalSettings::SecureDnsMode::SystemOnly - ? "SystemOnly" - : "SecureWithFallback"); - absl::optional<net::DnsOverHttpsConfig> dohConfig = dnsOverHttpsTemplates.empty() - ? net::DnsOverHttpsConfig() - : net::DnsOverHttpsConfig::FromString(dnsOverHttpsTemplates); - networkService->ConfigureStubHostResolver(insecureDnsClientEnabled, - net::SecureDnsMode(dnsMode), *dohConfig, - additionalInsecureDnsTypesEnabled); - } - } + QtWebEngineCore::configureStubHostResolver(dnsMode, dnsOverHttpsTemplates, insecureDnsClientEnabled, additionalInsecureDnsTypesEnabled); } QT_END_NAMESPACE |