diff --git a/Ladybird/Android/src/main/cpp/WebContentService.cpp b/Ladybird/Android/src/main/cpp/WebContentService.cpp index d752c94c73..ea841f49c9 100644 --- a/Ladybird/Android/src/main/cpp/WebContentService.cpp +++ b/Ladybird/Android/src/main/cpp/WebContentService.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -70,8 +70,8 @@ ErrorOr service_main(int ipc_socket, int fd_passing_socket) Web::HTML::Window::set_internals_object_exposed(is_layout_test_mode); Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); - Web::set_resource_directory_url(DeprecatedString::formatted("file://{}/res", s_serenity_resource_root)); - Web::set_directory_page_url(DeprecatedString::formatted("file://{}/res/html/directory.html", s_serenity_resource_root)); + Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); + Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root))); TRY(Web::Bindings::initialize_main_thread_vm()); diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 60f521335f..8176e72eed 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -21,7 +21,7 @@ #include #include #include -#include +#include #include #include #include @@ -96,8 +96,8 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); - Web::set_resource_directory_url(DeprecatedString::formatted("file://{}/res", s_serenity_resource_root)); - Web::set_directory_page_url(DeprecatedString::formatted("file://{}/res/html/directory.html", s_serenity_resource_root)); + Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); + Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", s_serenity_resource_root))); TRY(Web::Bindings::initialize_main_thread_vm()); diff --git a/Meta/gn/secondary/Userland/Libraries/LibWeb/Loader/BUILD.gn b/Meta/gn/secondary/Userland/Libraries/LibWeb/Loader/BUILD.gn index be62541597..9f0ec1def9 100644 --- a/Meta/gn/secondary/Userland/Libraries/LibWeb/Loader/BUILD.gn +++ b/Meta/gn/secondary/Userland/Libraries/LibWeb/Loader/BUILD.gn @@ -3,8 +3,8 @@ source_set("Loader") { deps = [ "//Userland/Libraries/LibWeb:all_generated" ] sources = [ "ContentFilter.cpp", - "FileDirectoryLoader.cpp", "FileRequest.cpp", + "GeneratedPagesLoader.cpp", "LoadRequest.cpp", "ProxyMappings.cpp", "Resource.cpp", diff --git a/Userland/Libraries/LibWeb/CMakeLists.txt b/Userland/Libraries/LibWeb/CMakeLists.txt index e1471d5389..82f14a9e49 100644 --- a/Userland/Libraries/LibWeb/CMakeLists.txt +++ b/Userland/Libraries/LibWeb/CMakeLists.txt @@ -450,8 +450,8 @@ set(SOURCES Layout/TreeBuilder.cpp Layout/VideoBox.cpp Loader/ContentFilter.cpp - Loader/FileDirectoryLoader.cpp Loader/FileRequest.cpp + Loader/GeneratedPagesLoader.cpp Loader/LoadRequest.cpp Loader/ProxyMappings.cpp Loader/Resource.cpp diff --git a/Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.h b/Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.h deleted file mode 100644 index 994cde189b..0000000000 --- a/Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.h +++ /dev/null @@ -1,19 +0,0 @@ -/* - * Copyright (c) 2023, Bastiaan van der Plaat - * - * SPDX-License-Identifier: BSD-2-Clause - */ - -#pragma once - -#include - -namespace Web { - -ErrorOr load_file_directory_page(LoadRequest const&); -DeprecatedString resource_directory_url(); -void set_resource_directory_url(DeprecatedString); -DeprecatedString directory_page_url(); -void set_directory_page_url(DeprecatedString); - -} diff --git a/Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.cpp b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp similarity index 81% rename from Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.cpp rename to Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp index 6fb627ab52..21336494a6 100644 --- a/Userland/Libraries/LibWeb/Loader/FileDirectoryLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp @@ -10,35 +10,36 @@ #include #include #include -#include +#include namespace Web { -static DeprecatedString s_resource_directory_url = "file:///res"; +static String s_resource_directory_url = "file:///res"_string; -DeprecatedString resource_directory_url() +String resource_directory_url() { return s_resource_directory_url; } -void set_resource_directory_url(DeprecatedString resource_directory_url) +void set_resource_directory_url(String resource_directory_url) { s_resource_directory_url = resource_directory_url; } -static DeprecatedString s_directory_page_url = "file:///res/html/directory.html"; +static String s_directory_page_url = "file:///res/html/directory.html"_string; -DeprecatedString directory_page_url() +String directory_page_url() { return s_directory_page_url; } -void set_directory_page_url(DeprecatedString directory_page_url) +void set_directory_page_url(String directory_page_url) { s_directory_page_url = directory_page_url; } -ErrorOr load_file_directory_page(LoadRequest const& request) + +ErrorOr load_file_directory_page(LoadRequest const& request) { // Generate HTML contents entries table auto lexical_path = LexicalPath(request.url().serialize_path()); @@ -69,7 +70,7 @@ ErrorOr load_file_directory_page(LoadRequest const& request) // Generate HTML directory page from directory template file // FIXME: Use an actual templating engine (our own one when it's built, preferably with a way to check these usages at compile time) - auto template_path = AK::URL::create_with_url_or_path(directory_page_url()).serialize_path(); + auto template_path = AK::URL::create_with_url_or_path(directory_page_url().to_deprecated_string()).serialize_path(); auto template_file = TRY(Core::File::open(template_path, Core::File::OpenMode::Read)); auto template_contents = TRY(template_file->read_until_eof()); StringBuilder builder; @@ -79,7 +80,7 @@ ErrorOr load_file_directory_page(LoadRequest const& request) generator.set("parent_path", escape_html_entities(lexical_path.parent().string())); generator.set("contents", contents.to_deprecated_string()); generator.append(template_contents); - return generator.as_string_view().to_deprecated_string(); + return TRY(String::from_utf8(generator.as_string_view())); } } diff --git a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h new file mode 100644 index 0000000000..4042aa209f --- /dev/null +++ b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h @@ -0,0 +1,21 @@ +/* + * Copyright (c) 2023, Bastiaan van der Plaat + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#pragma once + +#include +#include + +namespace Web { + +String resource_directory_url(); +void set_resource_directory_url(String); +String directory_page_url(); +void set_directory_page_url(String); + +ErrorOr load_file_directory_page(LoadRequest const&); + +} diff --git a/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp b/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp index 8759fd2add..f3b13a24ac 100644 --- a/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/ResourceLoader.cpp @@ -13,7 +13,7 @@ #include #include #include -#include +#include #include #include #include