RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 14:37:45 +00:00
Code Issues Activity Actions

AK+Everywhere: Replace "protocol" with "scheme" url helpers

Browse source 
URL had properly named replacements for protocol(), set_protocol() and
create_with_file_protocol() already. This patch removes these function
and updates all call sites to use the functions named according to the
specification.

See https://url.spec.whatwg.org/#concept-url-scheme
This commit is contained in:
networkException 2022-09-29 01:30:58 +02:00 • committed by Linus Groh
parent 454bf1fde0
commit 4230dbbb21
61 changed files with 113 additions and 116 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Userland/Applications/Browser/CookieJar.cpp
View file

@ -273,7 +273,7 @@ Vector<Web::Cookie::Cookie&> CookieJar::get_matching_cookies(const URL& url, Str
continue;
// If the cookie's secure-only-flag is true, then the request-uri's scheme must denote a "secure" protocol.
if (cookie.value.secure && (url.protocol() != "https"))
if (cookie.value.secure && (url.scheme() != "https"))
continue;
// If the cookie's http-only-flag is true, then exclude the cookie if the cookie-string is being generated for a "non-HTTP" API.

2
Userland/Applications/Browser/DownloadWidget.cpp
View file

@ -155,7 +155,7 @@ void DownloadWidget::did_finish(bool success)
m_close_button->set_enabled(true);
m_cancel_button->set_text("Open in Folder");
m_cancel_button->on_click = [this](auto) {
Desktop::Launcher::open(URL::create_with_file_protocol(Core::StandardPaths::downloads_directory(), m_url.basename()));
Desktop::Launcher::open(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory(), m_url.basename()));
window()->close();
};
m_cancel_button->update();

4
Userland/Applications/Browser/main.cpp
View file

@ -77,7 +77,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
// Connect to LaunchServer immediately and let it know that we won't ask for anything other than opening
// the user's downloads directory.
// FIXME: This should go away with a standalone download manager at some point.
TRY(Desktop::Launcher::add_allowed_url(URL::create_with_file_protocol(Core::StandardPaths::downloads_directory())));
TRY(Desktop::Launcher::add_allowed_url(URL::create_with_file_scheme(Core::StandardPaths::downloads_directory())));
TRY(Desktop::Launcher::seal_allowlist());
TRY(Core::System::unveil("/home", "rwc"));
@ -120,7 +120,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto url_from_argument_string = [](String const& string) -> URL {
if (Core::File::exists(string)) {
return URL::create_with_file_protocol(Core::File::real_path_for(string));
return URL::create_with_file_scheme(Core::File::real_path_for(string));
}
return Browser::url_from_user_input(string);
};