diff --git a/Userland/Libraries/LibAccelGfx/Painter.cpp b/Userland/Libraries/LibAccelGfx/Painter.cpp index 356d1606c2..25867205c0 100644 --- a/Userland/Libraries/LibAccelGfx/Painter.cpp +++ b/Userland/Libraries/LibAccelGfx/Painter.cpp @@ -550,11 +550,13 @@ void Painter::restore() void Painter::set_clip_rect(Gfx::IntRect rect) { + state().clip_rect = transform().map(rect); GL::enable_scissor_test(transform().map(rect)); } void Painter::clear_clip_rect() { + state().clip_rect = { { 0, 0 }, m_target_canvas->size() }; GL::disable_scissor_test(); } @@ -569,6 +571,7 @@ void Painter::set_target_canvas(NonnullRefPtr canvas) m_target_canvas = canvas; canvas->bind(); GL::set_viewport({ 0, 0, canvas->size().width(), canvas->size().height() }); + state().clip_rect = { { 0, 0 }, m_target_canvas->size() }; } void Painter::flush(Gfx::Bitmap& bitmap) diff --git a/Userland/Libraries/LibAccelGfx/Painter.h b/Userland/Libraries/LibAccelGfx/Painter.h index 34a768f5a4..cde3f519b3 100644 --- a/Userland/Libraries/LibAccelGfx/Painter.h +++ b/Userland/Libraries/LibAccelGfx/Painter.h @@ -43,6 +43,8 @@ public: void set_transform(Gfx::AffineTransform const& transform) { state().transform = transform; } void translate(Gfx::FloatPoint translation) { state().transform.translate(translation); } + Gfx::IntRect const& clip_rect() const { return state().clip_rect; } + void fill_rect(Gfx::FloatRect, Gfx::Color); void fill_rect(Gfx::IntRect, Gfx::Color); @@ -88,6 +90,7 @@ private: struct State { Gfx::AffineTransform transform; + Gfx::IntRect clip_rect; }; [[nodiscard]] State& state() { return m_state_stack.last(); } diff --git a/Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.cpp b/Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.cpp index 45adb4b085..7bf9520b4c 100644 --- a/Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.cpp +++ b/Userland/Libraries/LibWeb/Painting/PaintingCommandExecutorGPU.cpp @@ -306,10 +306,10 @@ CommandResult PaintingCommandExecutorGPU::paint_borders(DevicePixelRect const& b return CommandResult::Continue; } -bool PaintingCommandExecutorGPU::would_be_fully_clipped_by_painter(Gfx::IntRect) const +bool PaintingCommandExecutorGPU::would_be_fully_clipped_by_painter(Gfx::IntRect rect) const { - // FIXME - return false; + auto translation = painter().transform().translation().to_type(); + return !painter().clip_rect().intersects(rect.translated(translation)); } void PaintingCommandExecutorGPU::prepare_glyph_texture(HashMap> const& unique_glyphs)