From f32764975a58fbbce91a9b4b8386c8c585986ce1 Mon Sep 17 00:00:00 2001
From: Aliaksandr Kalenik <kalenik.aliaksandr@gmail.com>
Date: Sat, 21 Oct 2023 16:46:59 +0200
Subject: [PATCH] LibWeb: Remove ClearRect command in RecordingPainter

There is only one usage of ClearRect command and it could be replaced
with FillRect to make set of commands in RecordingPainter smaller.
---
 .../LibWeb/Painting/RecordingPainter.cpp        | 17 -----------------
 .../LibWeb/Painting/RecordingPainter.h          |  9 ---------
 Userland/Services/WebContent/PageHost.cpp       |  2 +-
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp b/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp
index 08207007f8..e0f6b56cfc 100644
--- a/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp
+++ b/Userland/Libraries/LibWeb/Painting/RecordingPainter.cpp
@@ -31,15 +31,6 @@ struct CommandExecutionState {
     Vector<StackingContext> stacking_contexts;
 };
 
-CommandResult ClearRect::execute(CommandExecutionState& state) const
-{
-    if (state.would_be_fully_clipped_by_painter(rect))
-        return CommandResult::Continue;
-
-    state.painter().clear_rect(rect, color);
-    return CommandResult::Continue;
-}
-
 CommandResult FillRectWithRoundedCorners::execute(CommandExecutionState& state) const
 {
     if (state.would_be_fully_clipped_by_painter(rect))
@@ -506,14 +497,6 @@ void RecordingPainter::blit_corner_clipping(NonnullRefPtr<BorderRadiusCornerClip
     push_command(BlitCornerClipping { corner_clipper });
 }
 
-void RecordingPainter::clear_rect(Gfx::IntRect const& rect, Color color)
-{
-    push_command(ClearRect {
-        .rect = rect,
-        .color = color,
-    });
-}
-
 void RecordingPainter::fill_rect(Gfx::IntRect const& rect, Color color)
 {
     push_command(FillRect {
diff --git a/Userland/Libraries/LibWeb/Painting/RecordingPainter.h b/Userland/Libraries/LibWeb/Painting/RecordingPainter.h
index 3af89ecea3..3fe6304000 100644
--- a/Userland/Libraries/LibWeb/Painting/RecordingPainter.h
+++ b/Userland/Libraries/LibWeb/Painting/RecordingPainter.h
@@ -40,13 +40,6 @@ enum class CommandResult {
     SkipStackingContext,
 };
 
-struct ClearRect {
-    Gfx::IntRect rect;
-    Color color;
-
-    [[nodiscard]] CommandResult execute(CommandExecutionState&) const;
-};
-
 struct DrawTextRun {
     Color color;
     Gfx::IntPoint baseline_start;
@@ -347,7 +340,6 @@ struct BlitCornerClipping {
 };
 
 using PaintingCommand = Variant<
-    ClearRect,
     DrawTextRun,
     DrawText,
     FillRect,
@@ -387,7 +379,6 @@ using PaintingCommand = Variant<
 
 class RecordingPainter {
 public:
-    void clear_rect(Gfx::IntRect const& rect, Color color);
     void fill_rect(Gfx::IntRect const& rect, Color color);
 
     struct FillPathUsingColorParams {
diff --git a/Userland/Services/WebContent/PageHost.cpp b/Userland/Services/WebContent/PageHost.cpp
index 7d42911db9..f318da0a3a 100644
--- a/Userland/Services/WebContent/PageHost.cpp
+++ b/Userland/Services/WebContent/PageHost.cpp
@@ -133,7 +133,7 @@ void PageHost::paint(Web::DevicePixelRect const& content_rect, Gfx::Bitmap& targ
     Web::PaintContext context(recording_painter, palette(), device_pixels_per_css_pixel());
 
     if (background_color.alpha() < 255)
-        recording_painter.clear_rect(bitmap_rect, Web::CSS::SystemColor::canvas());
+        recording_painter.fill_rect(bitmap_rect, Web::CSS::SystemColor::canvas());
     recording_painter.fill_rect(bitmap_rect, background_color);
 
     if (!document->paintable())