RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-25 21:27:35 +00:00
Code Issues Activity Actions

LibWeb: Move initialization of the MainThreadVM to WebContent's main()

Browse source 
It is a fallible operation, so this lets us abort early if it fails.
This commit is contained in:
Timothy Flynn 2023-03-17 10:56:59 -04:00 • committed by Linus Groh
parent 13dfadba79
commit 6e1b5b541a
4 changed files with 307 additions and 291 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Ladybird/WebContent/main.cpp
View file

@ -20,6 +20,7 @@
#include <LibCore/SystemServerTakeover.h>
#include <LibIPC/ConnectionFromClient.h>
#include <LibMain/Main.h>
#include <LibWeb/Bindings/MainThreadVM.h>
#include <LibWeb/Loader/ContentFilter.h>
#include <LibWeb/Loader/FrameLoader.h>
#include <LibWeb/Loader/ResourceLoader.h>
@ -78,6 +79,8 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
Web::FrameLoader::set_error_page_url(DeprecatedString::formatted("file://{}/res/html/error.html", s_serenity_resource_root));
TRY(Web::Bindings::initialize_main_thread_vm());
auto maybe_content_filter_error = load_content_filters();
if (maybe_content_filter_error.is_error())
dbgln("Failed to load content filters: {}", maybe_content_filter_error.error());