diff --git a/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.cpp b/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.cpp index 3b105a24c74..9f397575fdb 100644 --- a/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.cpp +++ b/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.cpp @@ -227,12 +227,6 @@ CommandResult AffineCommandExecutorCPU::draw_line(DrawLine const& command) return CommandResult::Continue; } -CommandResult AffineCommandExecutorCPU::draw_signed_distance_field(DrawSignedDistanceField const&) -{ - // FIXME: Implement. - return CommandResult::Continue; -} - CommandResult AffineCommandExecutorCPU::apply_backdrop_filter(ApplyBackdropFilter const&) { // FIXME: Implement. diff --git a/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.h b/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.h index 54c8cc443ae..ad39d71be68 100644 --- a/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.h +++ b/Userland/Libraries/LibWeb/Painting/AffineCommandExecutorCPU.h @@ -35,7 +35,6 @@ public: CommandResult draw_ellipse(DrawEllipse const&) override; CommandResult fill_ellipse(FillEllipse const&) override; CommandResult draw_line(DrawLine const&) override; - CommandResult draw_signed_distance_field(DrawSignedDistanceField const&) override; CommandResult apply_backdrop_filter(ApplyBackdropFilter const&) override; CommandResult draw_rect(DrawRect const&) override; CommandResult paint_radial_gradient(PaintRadialGradient const&) override; diff --git a/Userland/Libraries/LibWeb/Painting/Command.h b/Userland/Libraries/LibWeb/Painting/Command.h index dede121f8db..40a9ebcf328 100644 --- a/Userland/Libraries/LibWeb/Painting/Command.h +++ b/Userland/Libraries/LibWeb/Painting/Command.h @@ -286,20 +286,6 @@ struct DrawLine { } }; -struct DrawSignedDistanceField { - Gfx::IntRect rect; - Color color; - Gfx::GrayscaleBitmap sdf; - float smoothing; - - [[nodiscard]] Gfx::IntRect bounding_rect() const { return rect; } - - void translate_by(Gfx::IntPoint const& offset) - { - rect.translate_by(offset); - } -}; - struct ApplyBackdropFilter { Gfx::IntRect backdrop_region; BorderRadiiData border_radii_data; @@ -404,7 +390,6 @@ using Command = Variant< DrawEllipse, FillEllipse, DrawLine, - DrawSignedDistanceField, ApplyBackdropFilter, DrawRect, DrawTriangleWave, diff --git a/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.cpp b/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.cpp index 8f428d557fe..850eea18f4c 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.cpp +++ b/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.cpp @@ -381,12 +381,6 @@ CommandResult CommandExecutorCPU::draw_line(DrawLine const& command) return CommandResult::Continue; } -CommandResult CommandExecutorCPU::draw_signed_distance_field(DrawSignedDistanceField const& command) -{ - painter().draw_signed_distance_field(command.rect, command.color, command.sdf, command.smoothing); - return CommandResult::Continue; -} - CommandResult CommandExecutorCPU::apply_backdrop_filter(ApplyBackdropFilter const& command) { auto& painter = this->painter(); diff --git a/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.h b/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.h index 93151d53760..9609faeb3e7 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.h +++ b/Userland/Libraries/LibWeb/Painting/CommandExecutorCPU.h @@ -36,7 +36,6 @@ public: CommandResult draw_ellipse(DrawEllipse const&) override; CommandResult fill_ellipse(FillEllipse const&) override; CommandResult draw_line(DrawLine const&) override; - CommandResult draw_signed_distance_field(DrawSignedDistanceField const&) override; CommandResult apply_backdrop_filter(ApplyBackdropFilter const&) override; CommandResult draw_rect(DrawRect const&) override; CommandResult paint_radial_gradient(PaintRadialGradient const&) override; diff --git a/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.cpp b/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.cpp index d628e2641f0..2071c918f9a 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.cpp +++ b/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.cpp @@ -268,12 +268,6 @@ CommandResult CommandExecutorGPU::draw_line(DrawLine const& command) return CommandResult::Continue; } -CommandResult CommandExecutorGPU::draw_signed_distance_field(DrawSignedDistanceField const&) -{ - // FIXME - return CommandResult::Continue; -} - CommandResult CommandExecutorGPU::apply_backdrop_filter(ApplyBackdropFilter const&) { // FIXME diff --git a/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.h b/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.h index 33481a9a609..f92218deb9c 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.h +++ b/Userland/Libraries/LibWeb/Painting/CommandExecutorGPU.h @@ -35,7 +35,6 @@ public: CommandResult draw_ellipse(DrawEllipse const&) override; CommandResult fill_ellipse(FillEllipse const&) override; CommandResult draw_line(DrawLine const&) override; - CommandResult draw_signed_distance_field(DrawSignedDistanceField const&) override; CommandResult apply_backdrop_filter(ApplyBackdropFilter const&) override; CommandResult draw_rect(DrawRect const&) override; CommandResult paint_radial_gradient(PaintRadialGradient const&) override; diff --git a/Userland/Libraries/LibWeb/Painting/CommandList.cpp b/Userland/Libraries/LibWeb/Painting/CommandList.cpp index b54f75646a2..7b982a7a98b 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandList.cpp +++ b/Userland/Libraries/LibWeb/Painting/CommandList.cpp @@ -172,7 +172,6 @@ void CommandList::execute(CommandExecutor& executor) else HANDLE_COMMAND(DrawEllipse, draw_ellipse) else HANDLE_COMMAND(FillEllipse, fill_ellipse) else HANDLE_COMMAND(DrawLine, draw_line) - else HANDLE_COMMAND(DrawSignedDistanceField, draw_signed_distance_field) else HANDLE_COMMAND(ApplyBackdropFilter, apply_backdrop_filter) else HANDLE_COMMAND(DrawRect, draw_rect) else HANDLE_COMMAND(DrawTriangleWave, draw_triangle_wave) diff --git a/Userland/Libraries/LibWeb/Painting/CommandList.h b/Userland/Libraries/LibWeb/Painting/CommandList.h index fa0be67be5b..77e8d1893ad 100644 --- a/Userland/Libraries/LibWeb/Painting/CommandList.h +++ b/Userland/Libraries/LibWeb/Painting/CommandList.h @@ -70,7 +70,6 @@ public: virtual CommandResult draw_ellipse(DrawEllipse const&) = 0; virtual CommandResult fill_ellipse(FillEllipse const&) = 0; virtual CommandResult draw_line(DrawLine const&) = 0; - virtual CommandResult draw_signed_distance_field(DrawSignedDistanceField const&) = 0; virtual CommandResult apply_backdrop_filter(ApplyBackdropFilter const&) = 0; virtual CommandResult draw_rect(DrawRect const&) = 0; virtual CommandResult draw_triangle_wave(DrawTriangleWave const&) = 0; diff --git a/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp b/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp index dd259cb1711..b7f573557e9 100644 --- a/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp +++ b/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp @@ -237,18 +237,6 @@ void RecordingPainter::draw_text(Gfx::IntRect const& rect, String raw_text, Gfx: }); } -void RecordingPainter::draw_signed_distance_field(Gfx::IntRect const& dst_rect, Color color, Gfx::GrayscaleBitmap const& sdf, float smoothing) -{ - if (dst_rect.is_empty()) - return; - append(DrawSignedDistanceField { - .rect = state().translation.map(dst_rect), - .color = color, - .sdf = sdf, - .smoothing = smoothing, - }); -} - void RecordingPainter::draw_text_run(Gfx::IntPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale) { if (rect.is_empty()) diff --git a/Userland/Libraries/LibWeb/Painting/RecordingPainter.h b/Userland/Libraries/LibWeb/Painting/RecordingPainter.h index ca1fc99aca7..f7ee60173e5 100644 --- a/Userland/Libraries/LibWeb/Painting/RecordingPainter.h +++ b/Userland/Libraries/LibWeb/Painting/RecordingPainter.h @@ -97,8 +97,6 @@ public: void draw_text(Gfx::IntRect const&, String, Gfx::Font const&, Gfx::TextAlignment = Gfx::TextAlignment::TopLeft, Color = Color::Black, Gfx::TextElision = Gfx::TextElision::None, Gfx::TextWrapping = Gfx::TextWrapping::DontWrap); - void draw_signed_distance_field(Gfx::IntRect const& dst_rect, Color color, Gfx::GrayscaleBitmap const& sdf, float smoothing); - // Streamlined text drawing routine that does no wrapping/elision/alignment. void draw_text_run(Gfx::IntPoint baseline_start, Gfx::GlyphRun const& glyph_run, Color color, Gfx::IntRect const& rect, double scale);