mirrors/ladybird
0
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-09-30 05:09:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

LibWeb: Add null check for get_client_rects() on non paintable elements

Browse source
This commit is contained in:
Cnidarias 2024-04-16 21:43:33 +02:00 • committed by Alexander Kalenik
commit 1a1e5aaf54
Notes: sideshowbarker 2024-07-17 06:40:35 +09:00
3 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Tests/LibWeb/Text/expected/get-bounding-client-rect-display-none.txt
View file

@ -1 +1,3 @@
{"x":0,"y":0,"width":0,"height":0,"top":0,"right":0,"bottom":0,"left":0} {"x":0,"y":0,"width":0,"height":0,"top":0,"right":0,"bottom":0,"left":0}
{"x":0,"y":0,"width":0,"height":0,"top":0,"right":0,"bottom":0,"left":0}

4
Tests/LibWeb/Text/input/get-bounding-client-rect-display-none.html
View file

@ -3,10 +3,14 @@
#box { display: none; } #box { display: none; }
</style> </style>
<div id="box"></div> <div id="box"></div>
<br id="br"/>
<script src="include.js"></script> <script src="include.js"></script>
<script> <script>
test(() => { test(() => {
const rect = document.getElementById("box").getBoundingClientRect(); const rect = document.getElementById("box").getBoundingClientRect();
println(JSON.stringify(rect)); println(JSON.stringify(rect));
const br_rect = document.getElementById("br").getBoundingClientRect();
println(JSON.stringify(br_rect));
}); });
</script> </script>

14
Userland/Libraries/LibWeb/DOM/Element.cpp
View file

@ -884,16 +884,16 @@ JS::NonnullGCPtr<Geometry::DOMRectList> Element::get_client_rects() const
const_cast<Document&>(document()).update_paint_and_hit_testing_properties_if_needed(); const_cast<Document&>(document()).update_paint_and_hit_testing_properties_if_needed();
Gfx::AffineTransform transform; Gfx::AffineTransform transform;
if (auto const* paintable_box = this->paintable_box())
transform = Gfx::extract_2d_affine_transform(paintable_box->transform());
CSSPixelPoint scroll_offset; CSSPixelPoint scroll_offset;
for (auto const* containing_block = paintable()->containing_block(); containing_block; containing_block = containing_block->containing_block()) {
transform = Gfx::extract_2d_affine_transform(containing_block->transform()).multiply(transform);
scroll_offset.translate_by(containing_block->scroll_offset());
}
auto const* paintable = this->paintable(); auto const* paintable = this->paintable();
if (auto const* paintable_box = this->paintable_box()) { if (auto const* paintable_box = this->paintable_box()) {
transform = Gfx::extract_2d_affine_transform(paintable_box->transform());
for (auto const* containing_block = paintable->containing_block(); containing_block; containing_block = containing_block->containing_block()) {
transform = Gfx::extract_2d_affine_transform(containing_block->transform()).multiply(transform);
scroll_offset.translate_by(containing_block->scroll_offset());
}
auto absolute_rect = paintable_box->absolute_border_box_rect(); auto absolute_rect = paintable_box->absolute_border_box_rect();
auto transformed_rect = transform.map(absolute_rect.translated(-paintable_box->transform_origin()).to_type<float>()) auto transformed_rect = transform.map(absolute_rect.translated(-paintable_box->transform_origin()).to_type<float>())
.to_type<CSSPixels>() .to_type<CSSPixels>()