mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-08-05 23:59:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWebView: Create a dedicated settings observer for the Application

Browse source 
We had a bit of an awkward setup where we want the Application to be a
SettingsObserver, but neither the Settings object nor the Application
itself was fully initialized by the time the observer was created. So
we invented a deferred observer initializer specifically for the
Application.

Instead, let's just create a dedicated observer subclass that is owned
by the Application. We can then create it once we have the singleton
Application appropriately set up.
This commit is contained in:
Timothy Flynn 2025-04-23 12:37:05 -04:00 • committed by Tim Flynn
commit 6a6c56aabe
Notes: github-actions[bot] 2025-04-24 00:00:00 +00:00
4 changed files with 65 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

77
Libraries/LibWebView/Settings.cpp
View file

@ -142,34 +142,6 @@ Settings Settings::create(Badge<Application>)
return settings;
}
DNSSettings Settings::parse_dns_settings(JsonValue const& dns_settings)
{
if (!dns_settings.is_object())
return SystemDNS {};
auto& dns_settings_object = dns_settings.as_object();
auto mode = dns_settings_object.get_string("mode"sv);
if (mode.has_value()) {
if (*mode == "system"sv)
return SystemDNS {};
if (*mode == "custom"sv) {
auto server = dns_settings_object.get_string("server"sv);
auto port = dns_settings_object.get_u16("port"sv);
auto type = dns_settings_object.get_string("type"sv);
if (server.has_value() && port.has_value() && type.has_value()) {
if (*type == "tls"sv)
return DNSOverTLS { .server_address = server->to_byte_string(), .port = *port };
if (*type == "udp"sv)
return DNSOverUDP { .server_address = server->to_byte_string(), .port = *port };
}
}
}
dbgln("Invalid DNS settings in parse_dns_settings, falling back to system DNS");
return SystemDNS {};
}
Settings::Settings(ByteString settings_path)
: m_settings_path(move(settings_path))
, m_new_tab_page_url(URL::about_newtab())
@ -452,6 +424,35 @@ void Settings::set_do_not_track(DoNotTrack do_not_track)
observer.do_not_track_changed();
}
DNSSettings Settings::parse_dns_settings(JsonValue const& dns_settings)
{
if (!dns_settings.is_object())
return SystemDNS {};
auto const& dns_settings_object = dns_settings.as_object();
if (auto mode = dns_settings_object.get_string("mode"sv); mode.has_value()) {
if (*mode == "system"sv)
return SystemDNS {};
if (*mode == "custom"sv) {
auto server = dns_settings_object.get_string("server"sv);
auto port = dns_settings_object.get_u16("port"sv);
auto type = dns_settings_object.get_string("type"sv);
if (server.has_value() && port.has_value() && type.has_value()) {
if (*type == "tls"sv)
return DNSOverTLS { .server_address = server->to_byte_string(), .port = *port };
if (*type == "udp"sv)
return DNSOverUDP { .server_address = server->to_byte_string(), .port = *port };
}
}
}
dbgln("Invalid DNS settings in parse_dns_settings, falling back to system DNS");
return SystemDNS {};
}
void Settings::set_dns_settings(DNSSettings const& dns_settings, bool override_by_command_line)
{
m_dns_settings = dns_settings;
@ -485,29 +486,13 @@ void Settings::remove_observer(Badge<SettingsObserver>, SettingsObserver& observ
VERIFY(was_removed);
}
SettingsObserver::SettingsObserver(AddToObservers add_to_observers)
SettingsObserver::SettingsObserver()
{
if (add_to_observers == AddToObservers::Yes)
Settings::add_observer({}, *this);
else
m_registration_was_delayed = true;
Settings::add_observer({}, *this);
}
SettingsObserver::~SettingsObserver()
{
if (!m_registration_was_delayed)
Settings::remove_observer({}, *this);
}
void SettingsObserver::complete_delayed_registration()
{
VERIFY(m_registration_was_delayed);
Settings::add_observer({}, *this);
}
void SettingsObserver::complete_delayed_unregistration()
{
VERIFY(m_registration_was_delayed);
Settings::remove_observer({}, *this);
}