beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

LibWeb: Don't match text across block elements for find in page queries

Browse source 
Find in page will no longer match text that spans across block elements.
Previously, given the markup `WH<div>F</div>`, the query `WHF` would
find a match. We would now match `WH` and `F` separately, but not `WHF`.
This commit is contained in:
Tim Ledbetter 2024-06-18 15:16:47 +01:00 committed by Andreas Kling
parent 6f5ccaecbd
commit 23166b85d2
Notes: sideshowbarker 2024-07-17 17:49:11 +09:00 
Author: https://github.com/tcl3
Commit: https://github.com/LadybirdBrowser/ladybird/commit/23166b85d2
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/216
1 changed files with 74 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
Userland/Libraries/LibWeb/DOM/Document.cpp
View file

@ -5113,36 +5113,65 @@ Vector<JS::Handle<DOM::Range>> Document::find_matching_text(String const& query,
if (!document_element() || !document_element()->layout_node()) if (!document_element() || !document_element()->layout_node())
return {}; return {};
struct TextPositionNode { struct TextPosition {
DOM::Text& dom_node; DOM::Text& dom_node;
size_t start_offset { 0 }; size_t start_offset { 0 };
}; };
struct TextBlock {
String text;
Vector<TextPosition> positions;
};
auto gather_text_blocks = [&]() -> Vector<TextBlock> {
StringBuilder builder; StringBuilder builder;
Vector<TextPositionNode> text_positions;
size_t current_start_position = 0; size_t current_start_position = 0;
String current_node_text; Vector<TextPosition> text_positions;
document_element()->layout_node()->for_each_in_inclusive_subtree_of_type<Layout::TextNode>([&](auto const& text_node) { Vector<TextBlock> text_blocks;
document_element()->layout_node()->for_each_in_inclusive_subtree([&](auto const& layout_node) {
if (layout_node.is_block_container()) {
if (!builder.is_empty()) {
text_blocks.append({ builder.to_string_without_validation(), text_positions });
current_start_position = 0;
text_positions.clear_with_capacity();
builder.clear();
}
return TraversalDecision::Continue;
}
if (layout_node.is_text_node()) {
auto const& text_node = verify_cast<Layout::TextNode>(layout_node);
auto& dom_node = const_cast<DOM::Text&>(text_node.dom_node()); auto& dom_node = const_cast<DOM::Text&>(text_node.dom_node());
if (text_positions.is_empty()) { if (text_positions.is_empty()) {
text_positions.empend(dom_node); text_positions.empend(dom_node);
} else { } else {
current_start_position += current_node_text.bytes_as_string_view().length();
text_positions.empend(dom_node, current_start_position); text_positions.empend(dom_node, current_start_position);
} }
current_node_text = text_node.text_for_rendering(); auto const& current_node_text = text_node.text_for_rendering();
builder.append(current_node_text); current_start_position += current_node_text.bytes_as_string_view().length();
builder.append(move(current_node_text));
}
return TraversalDecision::Continue; return TraversalDecision::Continue;
}); });
if (text_positions.is_empty()) if (!builder.is_empty())
text_blocks.append({ builder.to_string_without_validation(), text_positions });
return text_blocks;
};
auto text_blocks = gather_text_blocks();
if (text_blocks.is_empty())
return {}; return {};
size_t offset = 0;
auto* match_start_position = &text_positions[0];
auto text = builder.to_string_without_validation();
Vector<JS::Handle<DOM::Range>> matches; Vector<JS::Handle<DOM::Range>> matches;
for (auto const& text_block : text_blocks) {
size_t offset = 0;
size_t i = 0;
auto const& text = text_block.text;
auto* match_start_position = &text_block.positions[0];
while (true) { while (true) {
auto match_index = case_sensitivity == CaseSensitivity::CaseInsensitive auto match_index = case_sensitivity == CaseSensitivity::CaseInsensitive
? text.find_byte_offset_ignoring_case(query, offset) ? text.find_byte_offset_ignoring_case(query, offset)
@ -5150,9 +5179,8 @@ Vector<JS::Handle<DOM::Range>> Document::find_matching_text(String const& query,
if (!match_index.has_value()) if (!match_index.has_value())
break; break;
size_t i = 0; for (; i < text_block.positions.size() - 1 && match_index.value() > text_block.positions[i + 1].start_offset; ++i)
for (; i < text_positions.size() && match_index.value() > text_positions[i].start_offset; ++i) match_start_position = &text_block.positions[i + 1];
match_start_position = &text_positions[i];
auto range = create_range(); auto range = create_range();
auto start_position = match_index.value() - match_start_position->start_offset; auto start_position = match_index.value() - match_start_position->start_offset;
@ -5160,16 +5188,19 @@ Vector<JS::Handle<DOM::Range>> Document::find_matching_text(String const& query,
(void)range->set_start(start_dom_node, start_position); (void)range->set_start(start_dom_node, start_position);
auto* match_end_position = match_start_position; auto* match_end_position = match_start_position;
for (; i < text_positions.size() && match_index.value() + query.bytes_as_string_view().length() > text_positions[i].start_offset; ++i) for (; i < text_block.positions.size() - 1 && (match_index.value() + query.bytes_as_string_view().length() > text_block.positions[i + 1].start_offset); ++i)
match_end_position = &text_positions[i]; match_end_position = &text_block.positions[i + 1];
auto& end_dom_node = match_end_position->dom_node; auto& end_dom_node = match_end_position->dom_node;
auto end_position = match_index.value() - match_end_position->start_offset + query.bytes_as_string_view().length(); auto end_position = match_index.value() + query.bytes_as_string_view().length() - match_end_position->start_offset;
(void)range->set_end(end_dom_node, end_position); (void)range->set_end(end_dom_node, end_position);
matches.append(range); matches.append(range);
offset = match_index.value() + query.bytes_as_string_view().length() + 1;
match_start_position = match_end_position; match_start_position = match_end_position;
offset = match_index.value() + query.bytes_as_string_view().length() + 1;
if (offset >= text.bytes_as_string_view().length())
break;
}
} }
return matches; return matches;