RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 17:52:45 +00:00
Code Issues Activity Actions

Base+Ladybird: Move Ladybird-related HTML files to their own folder

Browse source 
Pages like the new tab page, error page, etc. all belong solely to
Ladybird, but are scattered across a couple of subfolders in Base. This
moves them all to Base/res/ladybird.
This commit is contained in:
Timothy Flynn 2023-12-04 15:21:48 -05:00 • committed by Tim Flynn
parent 980e32b4fe
commit 05c8d5ba57
11 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

0
Base/res/html/directory.html → Base/res/ladybird/directory.html
View file

0
Base/res/html/error.html → Base/res/ladybird/error.html
View file

0
Base/res/html/inspector/inspector.css → Base/res/ladybird/inspector.css
View file

0
Base/res/html/inspector/inspector.js → Base/res/ladybird/inspector.js
View file

2
Base/res/html/misc/new-tab.html → Base/res/ladybird/new-tab.html
View file

@ -40,7 +40,7 @@
<body>
<main>
<br>
<img src="../../icons/32x32/app-browser.png" width="64" height="64"><br><br>
<img src="../icons/32x32/app-browser.png" width="64" height="64"><br><br>
<form>
<input type="search" name="q" id="user_query"><br><br>
<div id="search-buttons">

4
Ladybird/Android/src/main/cpp/WebContentService.cpp
View file

@ -73,8 +73,8 @@ ErrorOr<int> service_main(int ipc_socket, int fd_passing_socket)
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/html/error.html", s_serenity_resource_root)));
Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", 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)));
TRY(Web::Bindings::initialize_main_thread_vm());

4
Ladybird/WebContent/main.cpp
View file

@ -107,8 +107,8 @@ ErrorOr<int> 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/html/error.html", s_serenity_resource_root)));
Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", 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)));
TRY(Web::Bindings::initialize_main_thread_vm());

4
Ladybird/WebWorker/main.cpp
View file

@ -48,8 +48,8 @@ ErrorOr<int> 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/html/error.html", s_serenity_resource_root)));
Web::set_directory_page_url(TRY(String::formatted("file://{}/res/html/directory.html", 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)));
TRY(Web::Bindings::initialize_main_thread_vm());

2
Userland/Applications/BrowserSettings/Defaults.h
View file

@ -33,7 +33,7 @@ inline String const& default_new_tab_url()
{
// FIXME: Teach LibWeb how to load resource:// URLs, rather than converting to a file:// URL here.
static auto default_new_tab_url = []() {
static constexpr auto url = "resource://html/misc/new-tab.html"sv;
static constexpr auto url = "resource://ladybird/new-tab.html"sv;
return MUST(Core::Resource::load_from_uri(url))->file_url();
}();

4
Userland/Libraries/LibWeb/Loader/GeneratedPagesLoader.cpp
View file

@ -26,7 +26,7 @@ void set_resource_directory_url(String resource_directory_url)
s_resource_directory_url = resource_directory_url;
}
static String s_error_page_url = "file:///res/html/error.html"_string;
static String s_error_page_url = "file:///res/ladybird/error.html"_string;
String error_page_url()
{
@ -38,7 +38,7 @@ void set_error_page_url(String error_page_url)
s_error_page_url = error_page_url;
}
static String s_directory_page_url = "file:///res/html/directory.html"_string;
static String s_directory_page_url = "file:///res/ladybird/directory.html"_string;
String directory_page_url()
{

4
Userland/Libraries/LibWebView/InspectorClient.cpp
View file

@ -201,8 +201,8 @@ void InspectorClient::load_inspector()
StringBuilder builder;
// FIXME: Teach LibWeb how to load resource:// URIs instead of needing to read these files here.
auto inspector_css = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.css"sv));
auto inspector_js = MUST(Core::Resource::load_from_uri("resource://html/inspector/inspector.js"sv));
auto inspector_css = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.css"sv));
auto inspector_js = MUST(Core::Resource::load_from_uri("resource://ladybird/inspector.js"sv));
builder.append(R"~~~(
<!DOCTYPE html>