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

LibWeb: Add Range::for_each_contained()

Browse source 
This centralizes the logic for iterating over a Range's contained nodes.
This commit is contained in:
Jelle Raaijmakers 2025-01-09 10:20:07 +01:00 • committed by Andreas Kling
commit 4323669939
Notes: github-actions[bot] 2025-01-10 22:39:13 +00:00
5 changed files with 44 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

18
Libraries/LibWeb/Editing/Commands.cpp
View file

@ -551,12 +551,12 @@ bool command_insert_paragraph_action(DOM::Document& document, String const&)
// 4. Append to node list the first node in tree order that is contained in new range and is an allowed child of
// "p", if any.
new_range->start_container()->for_each_in_inclusive_subtree([&](DOM::Node& node) {
if (is_allowed_child_of_node(GC::Ref { node }, HTML::TagNames::p) && new_range->contains_node(node)) {
new_range->for_each_contained([&node_list](GC::Ref<DOM::Node> node) {
if (is_allowed_child_of_node(node, HTML::TagNames::p)) {
node_list.append(node);
return TraversalDecision::Break;
return IterationDecision::Break;
}
return TraversalDecision::Continue;
return IterationDecision::Continue;
});
// 5. If node list is empty:
@ -725,14 +725,10 @@ bool command_insert_paragraph_action(DOM::Document& document, String const&)
container->parent()->insert_before(*new_container, container->next_sibling());
// 26. Let contained nodes be all nodes contained in new line range.
// FIXME: this is probably wildly inefficient
Vector<GC::Ref<DOM::Node>> contained_nodes;
auto common_ancestor = new_line_range->common_ancestor_container();
common_ancestor->for_each_in_subtree([&](GC::Ref<DOM::Node> child_node) {
if (!new_line_range->contains_node(child_node))
return TraversalDecision::SkipChildrenAndContinue;
contained_nodes.append(child_node);
return TraversalDecision::Continue;
new_line_range->for_each_contained([&contained_nodes](GC::Ref<DOM::Node> node) {
contained_nodes.append(node);
return IterationDecision::Continue;
});
// 27. Let frag be the result of calling extractContents() on new line range.

12
Libraries/LibWeb/Editing/Internal/Algorithms.cpp
View file

@ -590,21 +590,17 @@ void delete_the_selection(Selection& selection, bool block_merging, bool strip_w
// 24. For each node contained in the active range, append node to node list if the last member of node list (if
// any) is not an ancestor of node; node is editable; and node is not a thead, tbody, tfoot, tr, th, or td.
auto common_ancestor = active_range()->common_ancestor_container();
common_ancestor->for_each_in_subtree([&](GC::Ref<DOM::Node> node) {
if (!active_range()->contains_node(node))
return TraversalDecision::SkipChildrenAndContinue;
active_range()->for_each_contained([&node_list](GC::Ref<DOM::Node> node) {
if (!node_list.is_empty() && node_list.last()->is_ancestor_of(node))
return TraversalDecision::SkipChildrenAndContinue;
return IterationDecision::Continue;
if (!node->is_editable())
return TraversalDecision::Continue;
return IterationDecision::Continue;
if (!is<HTML::HTMLTableSectionElement>(*node) && !is<HTML::HTMLTableRowElement>(*node) && !is<HTML::HTMLTableCellElement>(*node))
node_list.append(node);
return TraversalDecision::Continue;
return IterationDecision::Continue;
});
// 25. For each node in node list: