mirror of
https://github.com/RGBCube/serenity
synced 2025-07-28 18:37:35 +00:00
LibWeb: Make Layout::Node::containing_block() return a Layout::Box
Containing blocks can be formed by boxes that aren't block containers, so let's make this return a Box and work towards type correctness here.
This commit is contained in:
parent
d5480a44e5
commit
51555dea7c
6 changed files with 42 additions and 30 deletions
|
@ -132,7 +132,7 @@ void InlinePaintable::for_each_fragment(Callback callback) const
|
|||
{
|
||||
// FIXME: This will be slow if the containing block has a lot of fragments!
|
||||
Vector<Layout::LineBoxFragment const&> fragments;
|
||||
containing_block()->paint_box()->for_each_fragment([&](auto& fragment) {
|
||||
verify_cast<PaintableWithLines>(*containing_block()->paint_box()).for_each_fragment([&](auto& fragment) {
|
||||
if (layout_node().is_inclusive_ancestor_of(fragment.layout_node()))
|
||||
fragments.append(fragment);
|
||||
return IterationDecision::Continue;
|
||||
|
|
|
@ -36,13 +36,16 @@ Paintable::DispatchEventOfSameName Paintable::handle_mousemove(Badge<EventHandle
|
|||
bool Paintable::handle_mousewheel(Badge<EventHandler>, CSSPixelPoint, unsigned, unsigned, int wheel_delta_x, int wheel_delta_y)
|
||||
{
|
||||
if (auto* containing_block = this->containing_block()) {
|
||||
if (!containing_block->is_scrollable())
|
||||
if (!containing_block->is_block_container())
|
||||
return false;
|
||||
auto new_offset = containing_block->scroll_offset();
|
||||
auto* scroll_container = static_cast<Layout::BlockContainer const*>(containing_block);
|
||||
if (!scroll_container->is_scrollable())
|
||||
return false;
|
||||
auto new_offset = scroll_container->scroll_offset();
|
||||
new_offset.translate_by(wheel_delta_x, wheel_delta_y);
|
||||
// FIXME: This const_cast is gross.
|
||||
// FIXME: Scroll offset shouldn't live in the layout tree.
|
||||
const_cast<Layout::BlockContainer*>(containing_block)->set_scroll_offset(new_offset);
|
||||
const_cast<Layout::BlockContainer*>(scroll_container)->set_scroll_offset(new_offset);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
|
@ -121,7 +121,7 @@ public:
|
|||
|
||||
void set_needs_display() const { const_cast<Layout::Node&>(*m_layout_node).set_needs_display(); }
|
||||
|
||||
Layout::BlockContainer const* containing_block() const
|
||||
Layout::Box const* containing_block() const
|
||||
{
|
||||
if (!m_containing_block.has_value())
|
||||
m_containing_block = m_layout_node->containing_block();
|
||||
|
@ -141,7 +141,7 @@ protected:
|
|||
|
||||
private:
|
||||
JS::NonnullGCPtr<Layout::Node> m_layout_node;
|
||||
Optional<JS::GCPtr<Layout::BlockContainer>> mutable m_containing_block;
|
||||
Optional<JS::GCPtr<Layout::Box>> mutable m_containing_block;
|
||||
};
|
||||
|
||||
inline DOM::Node* HitTestResult::dom_node()
|
||||
|
|
|
@ -75,14 +75,9 @@ void PaintableBox::set_content_size(CSSPixelSize size)
|
|||
CSSPixelPoint PaintableBox::effective_offset() const
|
||||
{
|
||||
CSSPixelPoint offset;
|
||||
if (m_containing_line_box_fragment.has_value()) {
|
||||
|
||||
// FIXME: This is a hack to deal with situations where the layout tree has been garbage collected.
|
||||
// We could avoid this by making the paintable tree garbage collected as well.
|
||||
if (!containing_block() || !containing_block()->paint_box())
|
||||
return offset;
|
||||
|
||||
auto const& fragment = containing_block()->paint_box()->line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index];
|
||||
if (containing_block() && m_containing_line_box_fragment.has_value()) {
|
||||
auto& paintable_with_lines = *verify_cast<PaintableWithLines>(containing_block()->paint_box());
|
||||
auto const& fragment = paintable_with_lines.line_boxes()[m_containing_line_box_fragment->line_box_index].fragments()[m_containing_line_box_fragment->fragment_index];
|
||||
offset = fragment.offset();
|
||||
} else {
|
||||
offset = m_offset;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue