Use Skia for 2D canvas, SVG, CSS borders, etc.

Ladybird/Android/src/main/cpp/WebViewImplementationNative.cpp

@@ -8,7 +8,7 @@
 #include "JNIHelpers.h"
 #include <LibWebView/WebContentClient.h>
 #include <Userland/Libraries/LibGfx/Bitmap.h>
-#include <Userland/Libraries/LibGfx/Painter.h>
+#include <Userland/Libraries/LibGfx/DeprecatedPainter.h>
 #include <Userland/Libraries/LibWeb/Crypto/Crypto.h>
 #include <Userland/Libraries/LibWebView/ViewImplementation.h>
 #include <android/bitmap.h>
@@ -70,7 +70,7 @@ void WebViewImplementationNative::paint_into_bitmap(void* android_bitmap_raw, An
     VERIFY((info.flags & ANDROID_BITMAP_FLAGS_IS_HARDWARE) == 0);
 
     auto android_bitmap = MUST(Gfx::Bitmap::create_wrapper(to_gfx_bitmap_format(info.format), Gfx::AlphaType::Premultiplied, { info.width, info.height }, info.stride, android_bitmap_raw));
-    Gfx::Painter painter(android_bitmap);
+    Gfx::DeprecatedPainter painter(android_bitmap);
     if (auto* bitmap = m_client_state.has_usable_bitmap ? m_client_state.front_bitmap.bitmap.ptr() : m_backup_bitmap.ptr())
         painter.blit({ 0, 0 }, *bitmap, bitmap->rect());
     else

Ladybird/CMakeLists.txt

@@ -162,7 +162,7 @@ endif()
 if (BUILD_TESTING)
     add_test(
         NAME LibWeb
-        COMMAND $<TARGET_FILE:headless-browser> --run-tests ${LADYBIRD_SOURCE_DIR}/Tests/LibWeb --dump-failed-ref-tests
+        COMMAND $<TARGET_FILE:headless-browser> --run-tests ${LADYBIRD_SOURCE_DIR}/Tests/LibWeb --dump-failed-ref-tests --force-fontconfig
     )
     add_test(
         NAME WPT

Ladybird/HelperProcess.cpp

@@ -104,6 +104,8 @@ ErrorOr<NonnullRefPtr<WebView::WebContentClient>> launch_web_content_process(
         arguments.append("--expose-internals-object"sv);
     if (web_content_options.force_cpu_painting == WebView::ForceCPUPainting::Yes)
         arguments.append("--force-cpu-painting"sv);
+    if (web_content_options.force_fontconfig == WebView::ForceFontconfig::Yes)
+        arguments.append("--force-fontconfig"sv);
     if (auto server = mach_server_name(); server.has_value()) {
         arguments.append("--mach-server-name"sv);
         arguments.append(server.value());

Ladybird/Qt/TVGIconEngine.cpp

@@ -8,7 +8,7 @@
 #include "StringUtils.h"
 #include <AK/MemoryStream.h>
 #include <AK/String.h>
-#include <LibGfx/Painter.h>
+#include <LibGfx/DeprecatedPainter.h>
 #include <QFile>
 #include <QImage>
 #include <QPainter>
@@ -33,7 +33,7 @@ QPixmap TVGIconEngine::pixmap(QSize const& size, QIcon::Mode mode, QIcon::State
     if (QPixmapCache::find(key, &pixmap))
         return pixmap;
     auto bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, { size.width(), size.height() }));
-    Gfx::Painter painter { *bitmap };
+    Gfx::DeprecatedPainter painter { *bitmap };
     m_image_data->draw_into(painter, bitmap->rect());
     for (auto const& filter : m_filters) {
         if (filter->mode() == mode) {

Ladybird/Qt/Tab.cpp

@@ -12,8 +12,8 @@
 #include "Settings.h"
 #include "StringUtils.h"
 #include <AK/TemporaryChange.h>
+#include <LibGfx/DeprecatedPainter.h>
 #include <LibGfx/ImageFormats/BMPWriter.h>
-#include <LibGfx/Painter.h>
 #include <LibWeb/HTML/SelectedFile.h>
 #include <LibWebView/SearchEngine.h>
 #include <LibWebView/SourceHighlighter.h>

Ladybird/Qt/WebContentView.cpp

@@ -20,9 +20,9 @@
 #include <LibCore/Resource.h>
 #include <LibCore/Timer.h>
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/DeprecatedPainter.h>
 #include <LibGfx/Font/FontDatabase.h>
 #include <LibGfx/ImageFormats/PNGWriter.h>
-#include <LibGfx/Painter.h>
 #include <LibGfx/Palette.h>
 #include <LibGfx/Rect.h>
 #include <LibGfx/SystemTheme.h>

Ladybird/WebContent/main.cpp

@@ -15,6 +15,7 @@
 #include <LibCore/Process.h>
 #include <LibCore/Resource.h>
 #include <LibCore/SystemServerTakeover.h>
+#include <LibGfx/Font/FontDatabase.h>
 #include <LibIPC/ConnectionFromClient.h>
 #include <LibJS/Bytecode/Interpreter.h>
 #include <LibMain/Main.h>
@@ -105,6 +106,7 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     bool enable_idl_tracing = false;
     bool enable_http_cache = false;
     bool force_cpu_painting = false;
+    bool force_fontconfig = false;
 
     Core::ArgsParser args_parser;
     args_parser.add_option(command_line, "Chrome process command line", "command-line", 0, "command_line");
@@ -122,13 +124,18 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
     args_parser.add_option(enable_idl_tracing, "Enable IDL tracing", "enable-idl-tracing");
     args_parser.add_option(enable_http_cache, "Enable HTTP cache", "enable-http-cache");
     args_parser.add_option(force_cpu_painting, "Force CPU painting", "force-cpu-painting");
+    args_parser.add_option(force_fontconfig, "Force using fontconfig for font loading", "force-fontconfig");
 
     args_parser.parse(arguments);
 
     if (wait_for_debugger) {
         Core::Process::wait_for_debugger_and_break();
     }
 
+    if (force_fontconfig) {
+        Gfx::FontDatabase::the().set_force_fontconfig(true);
+    }
+
     // Layout test mode implies internals object is exposed and the Skia CPU backend is used
     if (is_layout_test_mode) {
         expose_internals_object = true;

Meta/Lagom/CMakeLists.txt

@@ -456,7 +456,6 @@ if (ENABLE_GUI_TARGETS)
     lagom_utility(animation SOURCES ../../Userland/Utilities/animation.cpp LIBS LibGfx LibMain)
     lagom_utility(icc SOURCES ../../Userland/Utilities/icc.cpp LIBS LibGfx LibMain LibURL)
     lagom_utility(image SOURCES ../../Userland/Utilities/image.cpp LIBS LibGfx LibMain)
-    lagom_utility(ttfdisasm SOURCES ../../Userland/Utilities/ttfdisasm.cpp LIBS LibGfx LibMain)
 endif()
 
 lagom_utility(js SOURCES ../../Userland/Utilities/js.cpp LIBS LibCrypto LibJS LibLine LibUnicode LibMain LibTextCodec Threads::Threads)

Meta/gn/secondary/Userland/Libraries/LibGfx/BUILD.gn

@@ -30,6 +30,8 @@ shared_library("LibGfx") {
     "CMYKBitmap.cpp",
     "Color.cpp",
     "DeltaE.cpp",
+    "DeprecatedPainter.cpp",
+    "DeprecatedPath.cpp",
     "EdgeFlagPathRasterizer.cpp",
     "Filters/ColorBlindnessFilter.cpp",
     "Filters/FastBoxBlurFilter.cpp",
@@ -78,9 +80,7 @@ shared_library("LibGfx") {
     "ImageFormats/WebPWriter.cpp",
     "ImageFormats/WebPWriterLossless.cpp",
     "ImmutableBitmap.cpp",
-    "Painter.cpp",
     "Palette.cpp",
-    "Path.cpp",
     "PathClipper.cpp",
     "Point.cpp",
     "Rect.cpp",

Tests/LibGfx/BenchmarkGfxPainter.cpp

@@ -7,8 +7,8 @@
 #include <LibTest/TestCase.h>
 
 #include <LibGfx/Bitmap.h>
+#include <LibGfx/DeprecatedPainter.h>
 #include <LibGfx/Font/FontDatabase.h>
-#include <LibGfx/Painter.h>
 #include <stdio.h>
 
 BENCHMARK_CASE(diagonal_lines)
@@ -17,7 +17,7 @@ BENCHMARK_CASE(diagonal_lines)
     int const bitmap_size = 2000;
 
     auto bitmap = TRY_OR_FAIL(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { bitmap_size, bitmap_size }));
-    Gfx::Painter painter(bitmap);
+    Gfx::DeprecatedPainter painter(bitmap);
 
     for (int run = 0; run < run_count; run++) {
         for (int i = 0; i < bitmap_size; i++) {
@@ -33,7 +33,7 @@ BENCHMARK_CASE(fill)
     int const bitmap_size = 2000;
 
     auto bitmap = TRY_OR_FAIL(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { bitmap_size, bitmap_size }));
-    Gfx::Painter painter(bitmap);
+    Gfx::DeprecatedPainter painter(bitmap);
 
     for (int run = 0; run < run_count; run++) {
         painter.fill_rect(bitmap->rect(), Color::Blue);
@@ -46,7 +46,7 @@ BENCHMARK_CASE(fill_with_gradient)
     int const bitmap_size = 2000;
 
     auto bitmap = TRY_OR_FAIL(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { bitmap_size, bitmap_size }));
-    Gfx::Painter painter(bitmap);
+    Gfx::DeprecatedPainter painter(bitmap);
 
     for (int run = 0; run < run_count; run++) {
         painter.fill_rect_with_gradient(bitmap->rect(), Color::Blue, Color::Red);

Tests/LibGfx/TestPainter.cpp

@@ -6,13 +6,13 @@
 
 #include <LibTest/TestCase.h>
 
-#include <LibGfx/Painter.h>
+#include <LibGfx/DeprecatedPainter.h>
 
 TEST_CASE(draw_scaled_bitmap_with_transform)
 {
     auto bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { 40, 30 }));
     bitmap->fill(Gfx::Color::White);
-    Gfx::Painter painter(bitmap);
+    Gfx::DeprecatedPainter painter(bitmap);
 
     auto source_bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { 1, 1 }));
     source_bitmap->fill(Gfx::Color::Black);
@@ -49,7 +49,7 @@ TEST_CASE(draw_scaled_bitmap_with_transform)
 TEST_CASE(draw_rect_rough_bounds)
 {
     auto bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRx8888, { 10, 10 }));
-    Gfx::Painter painter(*bitmap);
+    Gfx::DeprecatedPainter painter(*bitmap);
     painter.draw_rect(Gfx::IntRect(0, 0, 1, 1), Color::Black, true);
     painter.draw_rect(Gfx::IntRect(9, 9, 1, 1), Color::Black, true);
 }

Tests/LibGfx/TestScalingFunctions.cpp

@@ -5,7 +5,7 @@
  */
 
 #include <LibGfx/Bitmap.h>
-#include <LibGfx/Painter.h>
+#include <LibGfx/DeprecatedPainter.h>
 #include <LibTest/TestCase.h>
 
 // Scaling modes which use linear interpolation should use premultiplied alpha.
@@ -22,7 +22,7 @@ TEST_CASE(test_painter_scaling_uses_premultiplied_alpha)
         auto scaled_bitmap = MUST(Gfx::Bitmap::create(Gfx::BitmapFormat::BGRA8888, { 5, 5 }));
         scaled_bitmap->fill(Color::Transparent);
 
-        Gfx::Painter painter(scaled_bitmap);
+        Gfx::DeprecatedPainter painter(scaled_bitmap);
         painter.draw_scaled_bitmap(scaled_bitmap->rect(), src_bitmap, src_bitmap->rect(), 1.0f, scaling_mode);
 
         auto top_left_pixel = scaled_bitmap->get_pixel(0, 0);

Tests/LibWeb/Layout/expected/css-namespace-tag-name-selector.txt

@@ -7,8 +7,8 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
             " "
         frag 2 from BlockContainer start: 0, length: 0, rect: [319,51 0x108] baseline: 110
         SVGSVGBox <svg> at (9,9) content-size 300x150 [SVG] children: not-inline
-          SVGGraphicsBox <a> at (29,25.015625) content-size 193.59375x67.578125 children: not-inline
-            SVGTextBox <text> at (29,25.015625) content-size 193.59375x67.578125 children: inline
+          SVGGraphicsBox <a> at (33.765625,32.4375) content-size 188.71875x60.15625 children: not-inline
+            SVGTextBox <text> at (33.765625,32.4375) content-size 188.71875x60.15625 children: inline
               TextNode <#text>
         TextNode <#text>
         BlockContainer <math> at (319,51) content-size 0x108 children: not-inline
@@ -28,8 +28,8 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x201]
       PaintableWithLines (BlockContainer(anonymous)) [8,8 784x155]
         SVGSVGPaintable (SVGSVGBox<svg>) [8,8 302x152]
-          SVGGraphicsPaintable (SVGGraphicsBox<a>) [29,25.015625 193.59375x67.578125]
-            SVGPathPaintable (SVGTextBox<text>) [29,25.015625 193.59375x67.578125]
+          SVGGraphicsPaintable (SVGGraphicsBox<a>) [33.765625,32.4375 188.71875x60.15625]
+            SVGPathPaintable (SVGTextBox<text>) [33.765625,32.4375 188.71875x60.15625]
         TextPaintable (TextNode<#text>)
         PaintableWithLines (BlockContainer<math>) [318,50 2x110] overflow: [319,51 100x100]
           PaintableWithLines (BlockContainer<a>) [319,51 100x100]

Tests/LibWeb/Layout/expected/svg-text-with-percentage-values.txt

@@ -5,16 +5,16 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 784x261.328125 [SVG] children: inline
         TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.small> at (86.40625,65.5) content-size 48.109375x37.484375 children: inline
+        SVGTextBox <text.small> at (89.46875,67.40625) content-size 46.46875x35.578125 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.heavy> at (141.28125,21.078125) content-size 148.234375x79.71875 children: inline
+        SVGTextBox <text.heavy> at (146.25,35.34375) content-size 145.90625x65.453125 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.small> at (204,117.765625) content-size 34.578125x34.703125 children: inline
+        SVGTextBox <text.small> at (206.6875,119.796875) content-size 32.84375x32.671875 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.Rrrrr> at (243.1875,47.21875) content-size 519.484375x115.359375 children: inline
+        SVGTextBox <text.Rrrrr> at (249.828125,56.546875) content-size 514.125x106.03125 children: inline
           TextNode <#text>
         TextNode <#text>
       TextNode <#text>
@@ -23,7 +23,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x261.328125]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x261.328125]
-        SVGPathPaintable (SVGTextBox<text>.small) [86.40625,65.5 48.109375x37.484375]
-        SVGPathPaintable (SVGTextBox<text>.heavy) [141.28125,21.078125 148.234375x79.71875]
-        SVGPathPaintable (SVGTextBox<text>.small) [204,117.765625 34.578125x34.703125]
-        SVGPathPaintable (SVGTextBox<text>.Rrrrr) [243.1875,47.21875 519.484375x115.359375]
+        SVGPathPaintable (SVGTextBox<text>.small) [89.46875,67.40625 46.46875x35.578125]
+        SVGPathPaintable (SVGTextBox<text>.heavy) [146.25,35.34375 145.90625x65.453125]
+        SVGPathPaintable (SVGTextBox<text>.small) [206.6875,119.796875 32.84375x32.671875]
+        SVGPathPaintable (SVGTextBox<text>.Rrrrr) [249.828125,56.546875 514.125x106.03125]

Tests/LibWeb/Layout/expected/svg-text-with-viewbox.txt

@@ -5,16 +5,16 @@ Viewport <#document> at (0,0) content-size 800x600 children: not-inline
       SVGSVGBox <svg> at (8,8) content-size 784x261.328125 [SVG] children: inline
         TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.small> at (73.328125,88.359375) content-size 48.109375x37.484375 children: inline
+        SVGTextBox <text.small> at (76.40625,90.28125) content-size 46.46875x35.578125 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.heavy> at (138.65625,43.953125) content-size 148.234375x79.71875 children: inline
+        SVGTextBox <text.heavy> at (143.640625,58.21875) content-size 145.90625x65.453125 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.small> at (187.65625,153.703125) content-size 34.578125x34.703125 children: inline
+        SVGTextBox <text.small> at (190.359375,155.734375) content-size 32.84375x32.671875 children: inline
           TextNode <#text>
         TextNode <#text>
-        SVGTextBox <text.Rrrrr> at (220.328125,83.15625) content-size 519.484375x115.359375 children: inline
+        SVGTextBox <text.Rrrrr> at (226.96875,92.46875) content-size 514.125x106.03125 children: inline
           TextNode <#text>
         TextNode <#text>
       TextNode <#text>
@@ -23,7 +23,7 @@ ViewportPaintable (Viewport<#document>) [0,0 800x600]
   PaintableWithLines (BlockContainer<HTML>) [0,0 800x600]
     PaintableWithLines (BlockContainer<BODY>) [8,8 784x261.328125]
       SVGSVGPaintable (SVGSVGBox<svg>) [8,8 784x261.328125]
-        SVGPathPaintable (SVGTextBox<text>.small) [73.328125,88.359375 48.109375x37.484375]
-        SVGPathPaintable (SVGTextBox<text>.heavy) [138.65625,43.953125 148.234375x79.71875]
-        SVGPathPaintable (SVGTextBox<text>.small) [187.65625,153.703125 34.578125x34.703125]
-        SVGPathPaintable (SVGTextBox<text>.Rrrrr) [220.328125,83.15625 519.484375x115.359375]
+        SVGPathPaintable (SVGTextBox<text>.small) [76.40625,90.28125 46.46875x35.578125]
+        SVGPathPaintable (SVGTextBox<text>.heavy) [143.640625,58.21875 145.90625x65.453125]
+        SVGPathPaintable (SVGTextBox<text>.small) [190.359375,155.734375 32.84375x32.671875]
+        SVGPathPaintable (SVGTextBox<text>.Rrrrr) [226.96875,92.46875 514.125x106.03125]

Tests/LibWeb/Ref/reference/scrollable-contains-rotated-boxes-ref.html

@@ -12,13 +12,11 @@
             height: 300px;
             overflow-y: scroll;
             background-color: #fff;
-            border: 10px solid blueviolet;
         }
         .rotated-box {
             width: 100px;
             height: 100px;
             margin: 10px;
-            border: 5px solid magenta;
             background-color: #3498db;
             overflow: hidden;
         }

Tests/LibWeb/Ref/scrollable-contains-rotated-boxes.html

@@ -12,13 +12,11 @@
             height: 300px;
             overflow-y: scroll;
             background-color: #fff;
-            border: 10px solid blueviolet;
         }
         .rotated-box {
             width: 100px;
             height: 100px;
             margin: 10px;
-            border: 5px solid magenta;
             background-color: #3498db;
             transform: rotate(90deg);
             overflow: hidden;

Tests/LibWeb/rebaseline-libweb-test

@@ -28,4 +28,4 @@ else
 fi
 
 mkdir -p $expected_dir
-$ladybird_headless_binary $mode_flag --layout-test-mode $LADYBIRD_SOURCE_DIR/Tests/LibWeb/$input_dir/$test_name.html > $LADYBIRD_SOURCE_DIR/Tests/LibWeb/$expected_dir/$test_name.txt
+$ladybird_headless_binary $mode_flag --force-fontconfig --layout-test-mode $input_dir/$test_name.html > $expected_dir/$test_name.txt