diff --git a/Base/res/ladybird/directory.html b/Base/res/ladybird/directory.html index 30f855fa0e..707f735a44 100644 --- a/Base/res/ladybird/directory.html +++ b/Base/res/ladybird/directory.html @@ -28,13 +28,13 @@ background-size: contain; } .folder { - background-image: url('@resource_directory_url@/icons/32x32/filetype-folder.png'); + background-image: url('resource://icons/32x32/filetype-folder.png'); } .file { - background-image: url('@resource_directory_url@/icons/32x32/filetype-unknown.png'); + background-image: url('resource://icons/32x32/filetype-unknown.png'); } .open-parent { - background-image: url('@resource_directory_url@/icons/16x16/open-parent-directory.png'); + background-image: url('resource://icons/16x16/open-parent-directory.png'); } diff --git a/Base/res/ladybird/error.html b/Base/res/ladybird/error.html index ca8bf4f430..81a2c5831a 100644 --- a/Base/res/ladybird/error.html +++ b/Base/res/ladybird/error.html @@ -16,7 +16,7 @@
- Warning + Warning

Failed to load @failed_url@

diff --git a/Ladybird/Android/src/main/cpp/WebContentService.cpp b/Ladybird/Android/src/main/cpp/WebContentService.cpp index a9e6b64b90..3e0902d472 100644 --- a/Ladybird/Android/src/main/cpp/WebContentService.cpp +++ b/Ladybird/Android/src/main/cpp/WebContentService.cpp @@ -72,7 +72,6 @@ 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(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index 093bb2118d..655bff5b1d 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -115,7 +115,6 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::Platform::FontPlugin::install(*new Ladybird::FontPlugin(is_layout_test_mode)); - Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); diff --git a/Ladybird/WebWorker/main.cpp b/Ladybird/WebWorker/main.cpp index b9e45c6d07..1efcb8447f 100644 --- a/Ladybird/WebWorker/main.cpp +++ b/Ladybird/WebWorker/main.cpp @@ -49,7 +49,6 @@ ErrorOr serenity_main(Main::Arguments arguments) VERIFY(fd_passing_socket >= 0); - Web::set_resource_directory_url(TRY(String::formatted("file://{}/res", s_serenity_resource_root))); Web::set_error_page_url(TRY(String::formatted("file://{}/res/ladybird/error.html", s_serenity_resource_root))); Web::set_directory_page_url(TRY(String::formatted("file://{}/res/ladybird/directory.html", s_serenity_resource_root))); diff --git a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp index c293f8274d..18a48d7e95 100644 --- a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp +++ b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp @@ -14,18 +14,6 @@ namespace Web { -static String s_resource_directory_url = "file:///res"_string; - -String resource_directory_url() -{ - return s_resource_directory_url; -} - -void set_resource_directory_url(String resource_directory_url) -{ - s_resource_directory_url = resource_directory_url; -} - static String s_error_page_url = "file:///res/ladybird/error.html"_string; String error_page_url() @@ -59,7 +47,6 @@ ErrorOr load_error_page(AK::URL const& url) auto template_contents = TRY(template_file->read_until_eof()); StringBuilder builder; SourceGenerator generator { builder }; - generator.set("resource_directory_url", resource_directory_url()); generator.set("failed_url", url.to_byte_string()); generator.append(template_contents); return TRY(String::from_utf8(generator.as_string_view())); @@ -101,7 +88,6 @@ ErrorOr load_file_directory_page(LoadRequest const& request) auto template_contents = TRY(template_file->read_until_eof()); StringBuilder builder; SourceGenerator generator { builder }; - generator.set("resource_directory_url", resource_directory_url()); generator.set("path", escape_html_entities(lexical_path.string())); generator.set("parent_path", escape_html_entities(lexical_path.parent().string())); generator.set("contents", contents.to_byte_string()); diff --git a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h index 771380318a..c1395f684f 100644 --- a/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h +++ b/Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.h @@ -11,8 +11,6 @@ namespace Web { -String resource_directory_url(); -void set_resource_directory_url(String); String error_page_url(); void set_error_page_url(String); String directory_page_url();