RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 21:22:46 +00:00
Code Issues Activity Actions

LibWeb: Add compute_combined_css_transform() for PaintableBox

Browse source 
This prepares for upcoming changes where the code that finds combined
CSS transform will be reused in `clear_clip_overflow_rect()`.
This commit is contained in:
Aliaksandr Kalenik 2024-02-10 20:34:03 +01:00 • committed by Andreas Kling
parent 080d9ec246
commit 1ae416fa94
2 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -142,6 +142,16 @@ CSSPixelRect PaintableBox::compute_absolute_padding_rect_with_css_transform_appl
return padding_rect; return padding_rect;
} }
Gfx::AffineTransform PaintableBox::compute_combined_css_transform() const
{
Gfx::AffineTransform combined_transform;
for (auto const* ancestor = &this->layout_box(); ancestor; ancestor = ancestor->containing_block()) {
auto affine_transform = Gfx::extract_2d_affine_transform(ancestor->paintable_box()->transform());
combined_transform = combined_transform.multiply(affine_transform);
}
return combined_transform;
}
CSSPixelRect PaintableBox::absolute_rect() const CSSPixelRect PaintableBox::absolute_rect() const
{ {
if (!m_absolute_rect.has_value()) if (!m_absolute_rect.has_value())
@ -425,15 +435,11 @@ void PaintableBox::apply_clip_overflow_rect(PaintContext& context, PaintPhase ph
if (clip_rect().has_value()) { if (clip_rect().has_value()) {
auto overflow_clip_rect = clip_rect().value(); auto overflow_clip_rect = clip_rect().value();
for (auto const* ancestor = &this->layout_box(); ancestor; ancestor = ancestor->containing_block()) { // NOTE: Since the painting command executor applies a CSS transform and the clip rect is calculated
auto affine_transform = Gfx::extract_2d_affine_transform(ancestor->paintable_box()->transform()); // with this transform in account, we need to remove the transform from the clip rect.
if (!affine_transform.is_identity()) { // Otherwise, the transform will be applied twice to the clip rect.
// NOTE: Since the painting command executor applies a CSS transform and the clip rect is calculated auto combined_transform = compute_combined_css_transform();
// with this transform in account, we need to remove the transform from the clip rect. overflow_clip_rect.translate_by(-combined_transform.translation().to_type<CSSPixels>());
// Otherwise, the transform will be applied twice to the clip rect.
overflow_clip_rect.translate_by(-affine_transform.translation().to_type<CSSPixels>());
}
}
m_clipping_overflow = true; m_clipping_overflow = true;
context.recording_painter().save(); context.recording_painter().save();

1
Userland/Libraries/LibWeb/Painting/PaintableBox.h
View file

@ -200,6 +200,7 @@ public:
CSSPixelPoint const& transform_origin() const { return m_transform_origin; } CSSPixelPoint const& transform_origin() const { return m_transform_origin; }
CSSPixelRect compute_absolute_padding_rect_with_css_transform_applied() const; CSSPixelRect compute_absolute_padding_rect_with_css_transform_applied() const;
Gfx::AffineTransform compute_combined_css_transform() const;
Optional<CSSPixelRect> get_clip_rect() const; Optional<CSSPixelRect> get_clip_rect() const;