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

LibWeb: Extract hit testing on children into a separate method

Browse source 
This way we can reuse the logic between PaintableWithLines and
PaintableBox. It also introduces the .is_positioned() check for the
children of a PaintableWithLines, which makes sure to skip positioned
child nodes since those are handled by the StackingContext.
This commit is contained in:
Jelle Raaijmakers 2025-07-04 14:54:20 +02:00 • committed by Tim Ledbetter
commit c24be6a39d
Notes: github-actions[bot] 2025-07-05 22:57:52 +00:00
2 changed files with 16 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Libraries/LibWeb/Painting/PaintableBox.cpp
View file

@ -1119,13 +1119,8 @@ TraversalDecision PaintableBox::hit_test(CSSPixelPoint position, HitTestType typ
return stacking_context()->hit_test(position, type, callback); return stacking_context()->hit_test(position, type, callback);
} }
for (auto const* child = last_child(); child; child = child->previous_sibling()) { if (hit_test_children(position, type, callback) == TraversalDecision::Break)
auto z_index = child->computed_values().z_index(); return TraversalDecision::Break;
if (child->layout_node().is_positioned() && z_index.value_or(0) == 0)
continue;
if (child->hit_test(position, type, callback) == TraversalDecision::Break)
return TraversalDecision::Break;
}
if (!visible_for_hit_testing()) if (!visible_for_hit_testing())
return TraversalDecision::Continue; return TraversalDecision::Continue;
@ -1174,6 +1169,17 @@ Optional<HitTestResult> PaintableBox::hit_test(CSSPixelPoint position, HitTestTy
return result; return result;
} }
TraversalDecision PaintableBox::hit_test_children(CSSPixelPoint position, HitTestType type, Function<TraversalDecision(HitTestResult)> const& callback) const
{
for (auto const* child = last_child(); child; child = child->previous_sibling()) {
if (child->layout_node().is_positioned() && child->computed_values().z_index().value_or(0) == 0)
continue;
if (child->hit_test(position, type, callback) == TraversalDecision::Break)
return TraversalDecision::Break;
}
return TraversalDecision::Continue;
}
TraversalDecision PaintableWithLines::hit_test(CSSPixelPoint position, HitTestType type, Function<TraversalDecision(HitTestResult)> const& callback) const TraversalDecision PaintableWithLines::hit_test(CSSPixelPoint position, HitTestType type, Function<TraversalDecision(HitTestResult)> const& callback) const
{ {
if (clip_rect_for_hit_testing().has_value() && !clip_rect_for_hit_testing()->contains(position)) if (clip_rect_for_hit_testing().has_value() && !clip_rect_for_hit_testing()->contains(position))
@ -1207,10 +1213,8 @@ TraversalDecision PaintableWithLines::hit_test(CSSPixelPoint position, HitTestTy
if (hit_test_scrollbars(transformed_position_adjusted_by_scroll_offset, callback) == TraversalDecision::Break) if (hit_test_scrollbars(transformed_position_adjusted_by_scroll_offset, callback) == TraversalDecision::Break)
return TraversalDecision::Break; return TraversalDecision::Break;
for (auto const* child = last_child(); child; child = child->previous_sibling()) { if (hit_test_children(position, type, callback) == TraversalDecision::Break)
if (child->hit_test(position, type, callback) == TraversalDecision::Break) return TraversalDecision::Break;
return TraversalDecision::Break;
}
if (!visible_for_hit_testing()) if (!visible_for_hit_testing())
return TraversalDecision::Continue; return TraversalDecision::Continue;

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

@ -147,6 +147,7 @@ public:
[[nodiscard]] virtual TraversalDecision hit_test(CSSPixelPoint position, HitTestType type, Function<TraversalDecision(HitTestResult)> const& callback) const override; [[nodiscard]] virtual TraversalDecision hit_test(CSSPixelPoint position, HitTestType type, Function<TraversalDecision(HitTestResult)> const& callback) const override;
Optional<HitTestResult> hit_test(CSSPixelPoint, HitTestType) const; Optional<HitTestResult> hit_test(CSSPixelPoint, HitTestType) const;
[[nodiscard]] TraversalDecision hit_test_children(CSSPixelPoint, HitTestType, Function<TraversalDecision(HitTestResult)> const&) const;
[[nodiscard]] TraversalDecision hit_test_continuation(Function<TraversalDecision(HitTestResult)> const& callback) const; [[nodiscard]] TraversalDecision hit_test_continuation(Function<TraversalDecision(HitTestResult)> const& callback) const;
virtual bool handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned buttons, unsigned modifiers, int wheel_delta_x, int wheel_delta_y) override; virtual bool handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned buttons, unsigned modifiers, int wheel_delta_x, int wheel_delta_y) override;