RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 05:37:35 +00:00
Code Issues Activity Actions

LibWeb: Teach InlineLevelIterator to skip across inline-block elements

Browse source 
We don't want to descend into inline-block containers when iterating
inline-level items, since that would make the inline-level children of
the inline-block bubble up to the containing block of the inline-block.
This commit is contained in:
Andreas Kling 2022-01-20 12:18:25 +01:00
parent ce8043c6c2
commit 67b3f769fb
1 changed files with 18 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Userland/Libraries/LibWeb/Layout/InlineLevelIterator.cpp
View file

@ -11,11 +11,28 @@
namespace Web::Layout { namespace Web::Layout {
// This is similar to Layout::Node::next_in_pre_order() but will not descend into inline-block nodes.
static Layout::Node* next_inline_node_in_pre_order(Layout::Node& current, Layout::Node const* stay_within)
{
if (current.first_child() && current.first_child()->is_inline() && !current.is_inline_block())
return current.first_child();
Layout::Node* node = &current;
Layout::Node* next = nullptr;
while (!(next = node->next_sibling())) {
node = node->parent();
if (!node || node == stay_within)
return nullptr;
}
return next;
}
void InlineLevelIterator::skip_to_next() void InlineLevelIterator::skip_to_next()
{ {
VERIFY(m_current_node); VERIFY(m_current_node);
do { do {
m_current_node = m_current_node->next_in_pre_order(&m_container); m_current_node = next_inline_node_in_pre_order(*m_current_node, &m_container);
} while (m_current_node && !m_current_node->is_inline()); } while (m_current_node && !m_current_node->is_inline());
} }