diff --git a/Ladybird/AppKit/main.mm b/Ladybird/AppKit/main.mm index c24020e190..dc59ff26f5 100644 --- a/Ladybird/AppKit/main.mm +++ b/Ladybird/AppKit/main.mm @@ -83,7 +83,6 @@ ErrorOr serenity_main(Main::Arguments arguments) Vector raw_urls; Vector certificates; StringView webdriver_content_ipc_path; - bool use_skia_painting = false; bool debug_web_content = false; bool log_all_js_exceptions = false; bool enable_http_cache = false; @@ -95,7 +94,6 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.set_general_help("The Ladybird web browser"); args_parser.add_positional_argument(raw_urls, "URLs to open", "url", Core::ArgsParser::Required::No); args_parser.add_option(webdriver_content_ipc_path, "Path to WebDriver IPC for WebContent", "webdriver-content-path", 0, "path", Core::ArgsParser::OptionHideMode::CommandLineAndMarkdown); - args_parser.add_option(use_skia_painting, "Enable Skia painting", "enable-skia-painting"); args_parser.add_option(debug_web_content, "Wait for debugger to attach to WebContent", "debug-web-content"); args_parser.add_option(certificates, "Path to a certificate file", "certificate", 'C', "certificate"); args_parser.add_option(log_all_js_exceptions, "Log all JavaScript exceptions", "log-all-js-exceptions"); @@ -142,7 +140,6 @@ ErrorOr serenity_main(Main::Arguments arguments) Ladybird::WebContentOptions web_content_options { .command_line = MUST(command_line_builder.to_string()), .executable_path = MUST(String::from_byte_string(MUST(Core::System::current_executable_path()))), - .enable_skia_painting = use_skia_painting ? Ladybird::EnableSkiaPainting::Yes : Ladybird::EnableSkiaPainting::No, .wait_for_debugger = debug_web_content ? Ladybird::WaitForDebugger::Yes : Ladybird::WaitForDebugger::No, .log_all_js_exceptions = log_all_js_exceptions ? Ladybird::LogAllJSExceptions::Yes : Ladybird::LogAllJSExceptions::No, .enable_http_cache = enable_http_cache ? Ladybird::EnableHTTPCache::Yes : Ladybird::EnableHTTPCache::No, diff --git a/Ladybird/HelperProcess.cpp b/Ladybird/HelperProcess.cpp index 5656b210aa..ed499d461d 100644 --- a/Ladybird/HelperProcess.cpp +++ b/Ladybird/HelperProcess.cpp @@ -88,8 +88,6 @@ ErrorOr> launch_web_content_process( arguments.append("--layout-test-mode"sv); if (web_content_options.use_lagom_networking == Ladybird::UseLagomNetworking::Yes) arguments.append("--use-lagom-networking"sv); - if (web_content_options.enable_skia_painting == Ladybird::EnableSkiaPainting::Yes) - arguments.append("--use-skia-painting"sv); if (web_content_options.wait_for_debugger == Ladybird::WaitForDebugger::Yes) arguments.append("--wait-for-debugger"sv); if (web_content_options.log_all_js_exceptions == Ladybird::LogAllJSExceptions::Yes) diff --git a/Ladybird/Qt/main.cpp b/Ladybird/Qt/main.cpp index 7347d6c2b8..bda1527d53 100644 --- a/Ladybird/Qt/main.cpp +++ b/Ladybird/Qt/main.cpp @@ -93,7 +93,6 @@ ErrorOr serenity_main(Main::Arguments arguments) bool disable_sql_database = false; bool enable_qt_networking = false; bool expose_internals_object = false; - bool use_skia_painting = false; bool debug_web_content = false; bool log_all_js_exceptions = false; bool enable_idl_tracing = false; @@ -109,7 +108,6 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.add_option(enable_callgrind_profiling, "Enable Callgrind profiling", "enable-callgrind-profiling", 'P'); args_parser.add_option(disable_sql_database, "Disable SQL database", "disable-sql-database"); args_parser.add_option(enable_qt_networking, "Enable Qt as the backend networking service", "enable-qt-networking"); - args_parser.add_option(use_skia_painting, "Enable Skia painting", "enable-skia-painting"); args_parser.add_option(debug_web_content, "Wait for debugger to attach to WebContent", "debug-web-content"); args_parser.add_option(certificates, "Path to a certificate file", "certificate", 'C', "certificate"); args_parser.add_option(log_all_js_exceptions, "Log all JavaScript exceptions", "log-all-js-exceptions"); @@ -179,7 +177,6 @@ ErrorOr serenity_main(Main::Arguments arguments) .executable_path = MUST(String::from_byte_string(MUST(Core::System::current_executable_path()))), .config_path = Ladybird::Settings::the()->directory(), .enable_callgrind_profiling = enable_callgrind_profiling ? Ladybird::EnableCallgrindProfiling::Yes : Ladybird::EnableCallgrindProfiling::No, - .enable_skia_painting = use_skia_painting ? Ladybird::EnableSkiaPainting::Yes : Ladybird::EnableSkiaPainting::No, .use_lagom_networking = enable_qt_networking ? Ladybird::UseLagomNetworking::No : Ladybird::UseLagomNetworking::Yes, .wait_for_debugger = debug_web_content ? Ladybird::WaitForDebugger::Yes : Ladybird::WaitForDebugger::No, .log_all_js_exceptions = log_all_js_exceptions ? Ladybird::LogAllJSExceptions::Yes : Ladybird::LogAllJSExceptions::No, diff --git a/Ladybird/Types.h b/Ladybird/Types.h index 8aff64c9ff..735a82879e 100644 --- a/Ladybird/Types.h +++ b/Ladybird/Types.h @@ -15,11 +15,6 @@ enum class EnableCallgrindProfiling { Yes }; -enum class EnableSkiaPainting { - No, - Yes -}; - enum class IsLayoutTestMode { No, Yes @@ -60,7 +55,6 @@ struct WebContentOptions { String executable_path; Optional config_path {}; EnableCallgrindProfiling enable_callgrind_profiling { EnableCallgrindProfiling::No }; - EnableSkiaPainting enable_skia_painting { EnableSkiaPainting::No }; IsLayoutTestMode is_layout_test_mode { IsLayoutTestMode::No }; UseLagomNetworking use_lagom_networking { UseLagomNetworking::Yes }; WaitForDebugger wait_for_debugger { WaitForDebugger::No }; diff --git a/Ladybird/WebContent/main.cpp b/Ladybird/WebContent/main.cpp index ef9bff248d..55a8129f9a 100644 --- a/Ladybird/WebContent/main.cpp +++ b/Ladybird/WebContent/main.cpp @@ -136,10 +136,8 @@ ErrorOr serenity_main(Main::Arguments arguments) Web::set_chrome_process_command_line(command_line); Web::set_chrome_process_executable_path(executable_path); - if (use_skia_painter) { - // Always use the CPU backend for layout tests, as the GPU backend is not deterministic - WebContent::PageClient::set_use_skia_painter(is_layout_test_mode ? WebContent::PageClient::UseSkiaPainter::CPUBackend : WebContent::PageClient::UseSkiaPainter::GPUBackendIfAvailable); - } + // Always use the CPU backend for layout tests, as the GPU backend is not deterministic + WebContent::PageClient::set_use_skia_painter(is_layout_test_mode ? WebContent::PageClient::UseSkiaPainter::CPUBackend : WebContent::PageClient::UseSkiaPainter::GPUBackendIfAvailable); if (enable_http_cache) { Web::Fetch::Fetching::g_http_cache_enabled = true; diff --git a/Tests/LibWeb/Screenshot/images/alt-frame.png b/Tests/LibWeb/Screenshot/images/alt-frame.png index bae73ef195..7d9d934c61 100644 Binary files a/Tests/LibWeb/Screenshot/images/alt-frame.png and b/Tests/LibWeb/Screenshot/images/alt-frame.png differ diff --git a/Tests/LibWeb/Screenshot/images/border-radius-ref.png b/Tests/LibWeb/Screenshot/images/border-radius-ref.png index 59efe16360..7d40159cf8 100644 Binary files a/Tests/LibWeb/Screenshot/images/border-radius-ref.png and b/Tests/LibWeb/Screenshot/images/border-radius-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/canvas-arcs-and-ellipses-ref.png b/Tests/LibWeb/Screenshot/images/canvas-arcs-and-ellipses-ref.png index d5cfd94dd7..a71dab3e28 100644 Binary files a/Tests/LibWeb/Screenshot/images/canvas-arcs-and-ellipses-ref.png and b/Tests/LibWeb/Screenshot/images/canvas-arcs-and-ellipses-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/canvas-implict-moves-and-lines-ref.png b/Tests/LibWeb/Screenshot/images/canvas-implict-moves-and-lines-ref.png index 4392c0fa91..0d2c381ec0 100644 Binary files a/Tests/LibWeb/Screenshot/images/canvas-implict-moves-and-lines-ref.png and b/Tests/LibWeb/Screenshot/images/canvas-implict-moves-and-lines-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/canvas-text-ref.png b/Tests/LibWeb/Screenshot/images/canvas-text-ref.png index 0684ebcba5..341eed2a72 100644 Binary files a/Tests/LibWeb/Screenshot/images/canvas-text-ref.png and b/Tests/LibWeb/Screenshot/images/canvas-text-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/clip-path-polygon-ref.png b/Tests/LibWeb/Screenshot/images/clip-path-polygon-ref.png index 25c114765d..9978121c55 100644 Binary files a/Tests/LibWeb/Screenshot/images/clip-path-polygon-ref.png and b/Tests/LibWeb/Screenshot/images/clip-path-polygon-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-background-clip-text.png b/Tests/LibWeb/Screenshot/images/css-background-clip-text.png index 35b50ac077..d3a18a4e25 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-background-clip-text.png and b/Tests/LibWeb/Screenshot/images/css-background-clip-text.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-background-position-ref.png b/Tests/LibWeb/Screenshot/images/css-background-position-ref.png index 8685d27138..ca89f9dc4c 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-background-position-ref.png and b/Tests/LibWeb/Screenshot/images/css-background-position-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-background-repeat-ref.png b/Tests/LibWeb/Screenshot/images/css-background-repeat-ref.png index 80a21b736a..c20596abbd 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-background-repeat-ref.png and b/Tests/LibWeb/Screenshot/images/css-background-repeat-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-backgrounds-ref.png b/Tests/LibWeb/Screenshot/images/css-backgrounds-ref.png index 3299eee8fc..1e50022d12 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-backgrounds-ref.png and b/Tests/LibWeb/Screenshot/images/css-backgrounds-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-color-functions-ref.png b/Tests/LibWeb/Screenshot/images/css-color-functions-ref.png index 246cb7d2a7..6f839f452f 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-color-functions-ref.png and b/Tests/LibWeb/Screenshot/images/css-color-functions-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-gradients-ref.png b/Tests/LibWeb/Screenshot/images/css-gradients-ref.png index e228b095ae..0c22ea1346 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-gradients-ref.png and b/Tests/LibWeb/Screenshot/images/css-gradients-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/css-transform-box-ref.png b/Tests/LibWeb/Screenshot/images/css-transform-box-ref.png index 58fe5260b5..7f27e188aa 100644 Binary files a/Tests/LibWeb/Screenshot/images/css-transform-box-ref.png and b/Tests/LibWeb/Screenshot/images/css-transform-box-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/inline-node-ref.png b/Tests/LibWeb/Screenshot/images/inline-node-ref.png index 1c791ec3ff..b1245096a9 100644 Binary files a/Tests/LibWeb/Screenshot/images/inline-node-ref.png and b/Tests/LibWeb/Screenshot/images/inline-node-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/input-placeholder-ref.png b/Tests/LibWeb/Screenshot/images/input-placeholder-ref.png index ea91df5783..61f2207a31 100644 Binary files a/Tests/LibWeb/Screenshot/images/input-placeholder-ref.png and b/Tests/LibWeb/Screenshot/images/input-placeholder-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/meter-ref.png b/Tests/LibWeb/Screenshot/images/meter-ref.png index 79077a227e..d05ad745bf 100644 Binary files a/Tests/LibWeb/Screenshot/images/meter-ref.png and b/Tests/LibWeb/Screenshot/images/meter-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/nested-boxes-with-hidden-overflow-and-border-radius-ref.png b/Tests/LibWeb/Screenshot/images/nested-boxes-with-hidden-overflow-and-border-radius-ref.png index 84b09d71a6..66bb3e5018 100644 Binary files a/Tests/LibWeb/Screenshot/images/nested-boxes-with-hidden-overflow-and-border-radius-ref.png and b/Tests/LibWeb/Screenshot/images/nested-boxes-with-hidden-overflow-and-border-radius-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/object-fit-position.png b/Tests/LibWeb/Screenshot/images/object-fit-position.png index 53cb388cb5..5e17de0e33 100644 Binary files a/Tests/LibWeb/Screenshot/images/object-fit-position.png and b/Tests/LibWeb/Screenshot/images/object-fit-position.png differ diff --git a/Tests/LibWeb/Screenshot/images/opacity-stacking-ref.png b/Tests/LibWeb/Screenshot/images/opacity-stacking-ref.png index e71e777f34..f9bf0f65d0 100644 Binary files a/Tests/LibWeb/Screenshot/images/opacity-stacking-ref.png and b/Tests/LibWeb/Screenshot/images/opacity-stacking-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/outer-box-shadow-ref.png b/Tests/LibWeb/Screenshot/images/outer-box-shadow-ref.png index b68e17ef69..0632e1cad0 100644 Binary files a/Tests/LibWeb/Screenshot/images/outer-box-shadow-ref.png and b/Tests/LibWeb/Screenshot/images/outer-box-shadow-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-axis-aligned-lines-ref.png b/Tests/LibWeb/Screenshot/images/svg-axis-aligned-lines-ref.png index 2672a5cc5f..9cb95f8be6 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-axis-aligned-lines-ref.png and b/Tests/LibWeb/Screenshot/images/svg-axis-aligned-lines-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-background-no-natural-size-ref.png b/Tests/LibWeb/Screenshot/images/svg-background-no-natural-size-ref.png index fe5c015a42..931329120a 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-background-no-natural-size-ref.png and b/Tests/LibWeb/Screenshot/images/svg-background-no-natural-size-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-clip-path-and-mask-ref.png b/Tests/LibWeb/Screenshot/images/svg-clip-path-and-mask-ref.png index ca6d1431f5..17572d72ae 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-clip-path-and-mask-ref.png and b/Tests/LibWeb/Screenshot/images/svg-clip-path-and-mask-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-clip-rule-ref.png b/Tests/LibWeb/Screenshot/images/svg-clip-rule-ref.png index 356d789026..613467480b 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-clip-rule-ref.png and b/Tests/LibWeb/Screenshot/images/svg-clip-rule-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-foreign-object-mask-ref.png b/Tests/LibWeb/Screenshot/images/svg-foreign-object-mask-ref.png index 0f8ac394fc..38ee417836 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-foreign-object-mask-ref.png and b/Tests/LibWeb/Screenshot/images/svg-foreign-object-mask-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-gradient-spreadMethod-ref.png b/Tests/LibWeb/Screenshot/images/svg-gradient-spreadMethod-ref.png index 36a873a929..1a141b4f9b 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-gradient-spreadMethod-ref.png and b/Tests/LibWeb/Screenshot/images/svg-gradient-spreadMethod-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-maskContentUnits-ref.png b/Tests/LibWeb/Screenshot/images/svg-maskContentUnits-ref.png index aaef71743d..0c5eebe59d 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-maskContentUnits-ref.png and b/Tests/LibWeb/Screenshot/images/svg-maskContentUnits-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-non-local-clip-path-ref.png b/Tests/LibWeb/Screenshot/images/svg-non-local-clip-path-ref.png index 3fadb5c479..dc071eb953 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-non-local-clip-path-ref.png and b/Tests/LibWeb/Screenshot/images/svg-non-local-clip-path-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-radialGradient-ref.png b/Tests/LibWeb/Screenshot/images/svg-radialGradient-ref.png index 5d221b01e1..428658e0d2 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-radialGradient-ref.png and b/Tests/LibWeb/Screenshot/images/svg-radialGradient-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-simple-clipPath-ref.png b/Tests/LibWeb/Screenshot/images/svg-simple-clipPath-ref.png index 80b441b51a..c4cd1d4baf 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-simple-clipPath-ref.png and b/Tests/LibWeb/Screenshot/images/svg-simple-clipPath-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-stroke-paintstyle-with-opacity-ref.png b/Tests/LibWeb/Screenshot/images/svg-stroke-paintstyle-with-opacity-ref.png index 4973b070eb..da940a801e 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-stroke-paintstyle-with-opacity-ref.png and b/Tests/LibWeb/Screenshot/images/svg-stroke-paintstyle-with-opacity-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-text-effects-ref.png b/Tests/LibWeb/Screenshot/images/svg-text-effects-ref.png index 6b94197391..5363ef392b 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-text-effects-ref.png and b/Tests/LibWeb/Screenshot/images/svg-text-effects-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/svg-textPath-ref.png b/Tests/LibWeb/Screenshot/images/svg-textPath-ref.png index 3152ef8dfe..843594ad6f 100644 Binary files a/Tests/LibWeb/Screenshot/images/svg-textPath-ref.png and b/Tests/LibWeb/Screenshot/images/svg-textPath-ref.png differ diff --git a/Tests/LibWeb/Screenshot/images/text-decorations.png b/Tests/LibWeb/Screenshot/images/text-decorations.png index 6bcb8a514b..e1f96c07b2 100644 Binary files a/Tests/LibWeb/Screenshot/images/text-decorations.png and b/Tests/LibWeb/Screenshot/images/text-decorations.png differ diff --git a/Tests/LibWeb/Screenshot/images/text-shadow-ref.png b/Tests/LibWeb/Screenshot/images/text-shadow-ref.png index 4d0205af58..153ee86c8e 100644 Binary files a/Tests/LibWeb/Screenshot/images/text-shadow-ref.png and b/Tests/LibWeb/Screenshot/images/text-shadow-ref.png differ diff --git a/Userland/Libraries/LibWeb/Painting/SVGMaskable.cpp b/Userland/Libraries/LibWeb/Painting/SVGMaskable.cpp index 24b390f939..e49ebcec90 100644 --- a/Userland/Libraries/LibWeb/Painting/SVGMaskable.cpp +++ b/Userland/Libraries/LibWeb/Painting/SVGMaskable.cpp @@ -8,6 +8,7 @@ #include #include #include +#include #include #include #include @@ -88,7 +89,7 @@ RefPtr SVGMaskable::calculate_mask_of_svg(PaintContext& context, CS paint_context.set_svg_transform(graphics_element.get_transform()); paint_context.set_draw_svg_geometry_for_clip_path(is(paintable)); StackingContext::paint_node_as_stacking_context(paintable, paint_context); - DisplayListPlayerCPU executor { *mask_bitmap }; + DisplayListPlayerSkia executor { *mask_bitmap }; display_list.execute(executor); return mask_bitmap; }; diff --git a/Userland/Services/WebContent/PageClient.cpp b/Userland/Services/WebContent/PageClient.cpp index 2a813604df..0c87fb3c26 100644 --- a/Userland/Services/WebContent/PageClient.cpp +++ b/Userland/Services/WebContent/PageClient.cpp @@ -27,7 +27,7 @@ namespace WebContent { -static PageClient::UseSkiaPainter s_use_skia_painter = PageClient::UseSkiaPainter::No; +static PageClient::UseSkiaPainter s_use_skia_painter = PageClient::UseSkiaPainter::GPUBackendIfAvailable; JS_DEFINE_ALLOCATOR(PageClient); @@ -733,8 +733,6 @@ void PageClient::did_get_js_console_messages(i32 start_index, Vector Web::DisplayListPlayerType PageClient::display_list_player_type() const { switch (s_use_skia_painter) { - case UseSkiaPainter::No: - return Web::DisplayListPlayerType::CPU; case UseSkiaPainter::GPUBackendIfAvailable: return Web::DisplayListPlayerType::SkiaGPUIfAvailable; case UseSkiaPainter::CPUBackend: diff --git a/Userland/Services/WebContent/PageClient.h b/Userland/Services/WebContent/PageClient.h index 60549b1cff..a1ded2e8b9 100644 --- a/Userland/Services/WebContent/PageClient.h +++ b/Userland/Services/WebContent/PageClient.h @@ -28,7 +28,6 @@ public: virtual ~PageClient() override; enum class UseSkiaPainter { - No, CPUBackend, GPUBackendIfAvailable, }; diff --git a/Userland/Utilities/headless-browser.cpp b/Userland/Utilities/headless-browser.cpp index 200092bf00..26c4566e9b 100644 --- a/Userland/Utilities/headless-browser.cpp +++ b/Userland/Utilities/headless-browser.cpp @@ -64,7 +64,7 @@ static StringView s_current_test_path; class HeadlessWebContentView final : public WebView::ViewImplementation { public: - static ErrorOr> create(Core::AnonymousBuffer theme, Gfx::IntSize const& window_size, String const& command_line, StringView web_driver_ipc_path, Ladybird::IsLayoutTestMode is_layout_test_mode = Ladybird::IsLayoutTestMode::No, Vector const& certificates = {}, StringView resources_folder = {}, Ladybird::EnableSkiaPainting enable_skia_painting = Ladybird::EnableSkiaPainting::No) + static ErrorOr> create(Core::AnonymousBuffer theme, Gfx::IntSize const& window_size, String const& command_line, StringView web_driver_ipc_path, Ladybird::IsLayoutTestMode is_layout_test_mode = Ladybird::IsLayoutTestMode::No, Vector const& certificates = {}, StringView resources_folder = {}) { RefPtr request_client; RefPtr image_decoder_client; @@ -83,7 +83,6 @@ public: Ladybird::WebContentOptions web_content_options { .command_line = command_line, .executable_path = MUST(String::from_byte_string(MUST(Core::System::current_executable_path()))), - .enable_skia_painting = enable_skia_painting, .is_layout_test_mode = is_layout_test_mode, }; @@ -647,7 +646,6 @@ ErrorOr serenity_main(Main::Arguments arguments) bool dump_text = false; bool dump_gc_graph = false; bool is_layout_test_mode = false; - bool enable_skia_painting = false; StringView test_root_path; ByteString test_glob; Vector certificates; @@ -668,7 +666,6 @@ ErrorOr serenity_main(Main::Arguments arguments) args_parser.add_option(web_driver_ipc_path, "Path to the WebDriver IPC socket", "webdriver-ipc-path", 0, "path"); args_parser.add_option(is_layout_test_mode, "Enable layout test mode", "layout-test-mode"); args_parser.add_option(certificates, "Path to a certificate file", "certificate", 'C', "certificate"); - args_parser.add_option(enable_skia_painting, "Enable Skia painting", "enable-skia-painting"); args_parser.add_positional_argument(raw_url, "URL to open", "url", Core::ArgsParser::Required::No); args_parser.parse(arguments); @@ -687,7 +684,7 @@ ErrorOr serenity_main(Main::Arguments arguments) StringBuilder command_line_builder; command_line_builder.join(' ', arguments.strings); - auto view = TRY(HeadlessWebContentView::create(move(theme), window_size, MUST(command_line_builder.to_string()), web_driver_ipc_path, is_layout_test_mode ? Ladybird::IsLayoutTestMode::Yes : Ladybird::IsLayoutTestMode::No, certificates, resources_folder, enable_skia_painting ? Ladybird::EnableSkiaPainting::Yes : Ladybird::EnableSkiaPainting::No)); + auto view = TRY(HeadlessWebContentView::create(move(theme), window_size, MUST(command_line_builder.to_string()), web_driver_ipc_path, is_layout_test_mode ? Ladybird::IsLayoutTestMode::Yes : Ladybird::IsLayoutTestMode::No, certificates, resources_folder)); if (!test_root_path.is_empty()) { test_glob = ByteString::formatted("*{}*", test_glob);