mirrors/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2025-01-22 09:12:13 -05:00
Code Issues Projects Releases Packages Wiki Activity

LibWeb: Use as_if in Editing API where useful

Browse source 
This arguably improves readability in a couple of places. No functional
changes.
This commit is contained in:
Jelle Raaijmakers 2025-01-21 16:56:38 +01:00 committed by Tim Ledbetter
parent d40ccb97ec
commit 2cee6aeba3
Notes: github-actions[bot] 2025-01-21 17:51:18 +00:00 
Author: https://github.com/gmta
Commit: https://github.com/LadybirdBrowser/ladybird/commit/2cee6aeba30
Pull-request: https://github.com/LadybirdBrowser/ladybird/pull/3337
Reviewed-by: https://github.com/tcl3 ✅
2 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -79,9 +79,9 @@ bool command_create_link_action(DOM::Document& document, String const& value)
node->for_each_ancestor([&](GC::Ref<DOM::Node> ancestor) {
if (visited_ancestors.contains(ancestor.ptr()))
return IterationDecision::Break;
if (is<HTML::HTMLAnchorElement>(*ancestor) && ancestor->is_editable()
&& static_cast<DOM::Element&>(*ancestor).has_attribute(HTML::AttributeNames::href))
MUST(static_cast<HTML::HTMLAnchorElement&>(*ancestor).set_href(value));
if (auto* anchor = as_if<HTML::HTMLAnchorElement>(*ancestor); anchor && anchor->is_editable()
&& anchor->has_attribute(HTML::AttributeNames::href))
MUST(anchor->set_href(value));
visited_ancestors.set(ancestor.ptr());
return IterationDecision::Continue;
});
@ -652,11 +652,10 @@ bool command_format_block_action(DOM::Document& document, String const& value)
return result;
};
new_range->for_each_contained([&](GC::Ref<DOM::Node> node) {
if (node->is_editable()
if (auto const* element = as_if<DOM::Element>(*node); node->is_editable()
&& (node_list.is_empty() || !node_list.last()->is_ancestor_of(node))
&& (is_non_list_single_line_container(node) || is_allowed_child_of_node(node, HTML::TagNames::p)
|| (is<DOM::Element>(*node)
&& static_cast<DOM::Element&>(*node).local_name().is_one_of(HTML::TagNames::dd, HTML::TagNames::dt)))
|| (element && element->local_name().is_one_of(HTML::TagNames::dd, HTML::TagNames::dt)))
&& !is_ancestor_of_prohibited_paragraph_child(node)) {
node_list.append(node);
}
@ -747,9 +746,8 @@ bool command_format_block_action(DOM::Document& document, String const& value)
[&](GC::Ref<DOM::Node> sibling) {
if (resulting_value.is_one_of("div"sv, "p"sv))
return false;
return is<HTML::HTMLElement>(*sibling)
&& static_cast<DOM::Element&>(*sibling).local_name() == resulting_value
&& !static_cast<DOM::Element&>(*sibling).has_attributes();
auto const* html_element = as_if<HTML::HTMLElement>(*sibling);
return html_element && html_element->local_name() == resulting_value && !html_element->has_attributes();
},
[&] { return MUST(DOM::create_element(document, resulting_value, Namespace::HTML)); });
if (result)
@ -800,9 +798,9 @@ bool command_format_block_indeterminate(DOM::Document const& document)
// 3. If node is an editable HTML element whose local name is a formattable block name, and node is not the
// ancestor of a prohibited paragraph child, set current type to node's local name.
if (node->is_editable() && is<HTML::HTMLElement>(*node)
&& is_formattable_block_name(static_cast<DOM::Element&>(*node).local_name()))
current_type = static_cast<DOM::Element&>(*node).local_name();
if (auto const* html_element = as_if<HTML::HTMLElement>(*node); node->is_editable() && html_element
&& is_formattable_block_name(html_element->local_name()))
current_type = html_element->local_name();
// 4. If type is null, set type to current type.
if (!type.has_value()) {
@ -851,8 +849,8 @@ String command_format_block_value(DOM::Document const& document)
// 5. If node is an editable HTML element whose local name is a formattable block name, and node is not the ancestor
// of a prohibited paragraph child, return node's local name, converted to ASCII lowercase.
if (node->is_editable() && is<HTML::HTMLElement>(*node)
&& is_formattable_block_name(static_cast<DOM::Element&>(*node).local_name())) {
if (auto const* html_element = as_if<HTML::HTMLElement>(*node); node->is_editable() && html_element
&& is_formattable_block_name(html_element->local_name())) {
bool is_ancestor_of_prohibited_paragraph_child = false;
node->for_each_in_subtree([&is_ancestor_of_prohibited_paragraph_child](GC::Ref<DOM::Node> descendant) {
if (is_prohibited_paragraph_child(descendant)) {
@ -862,7 +860,7 @@ String command_format_block_value(DOM::Document const& document)
return TraversalDecision::Continue;
});
if (!is_ancestor_of_prohibited_paragraph_child)
return static_cast<DOM::Element&>(*node).local_name().to_string().to_ascii_lowercase();
return html_element->local_name().to_string().to_ascii_lowercase();
}
// 6. Return the empty string.
@ -1363,15 +1361,14 @@ bool command_insert_linebreak_action(DOM::Document& document, String const&)
// * Insert another newline (\n) character if the active range's start offset is equal to the length of the
// active range's start node.
// * Return true.
if (is<DOM::Text>(*start_node)) {
auto& text_node = static_cast<DOM::Text&>(*start_node);
if (auto* text_node = as_if<DOM::Text>(*start_node); text_node) {
auto resolved_white_space = resolved_keyword(*start_node, CSS::PropertyID::WhiteSpace);
if (resolved_white_space.has_value()
&& first_is_one_of(resolved_white_space.value(), CSS::Keyword::Pre, CSS::Keyword::PreLine, CSS::Keyword::PreWrap)) {
MUST(text_node.insert_data(active_range.start_offset(), "\n"_string));
MUST(text_node->insert_data(active_range.start_offset(), "\n"_string));
MUST(selection.collapse(start_node, active_range.start_offset() + 1));
if (selection.range()->start_offset() == start_node->length())
MUST(text_node.insert_data(active_range.start_offset(), "\n"_string));
MUST(text_node->insert_data(active_range.start_offset(), "\n"_string));
return true;
}
}

4
Libraries/LibWeb/Editing/ExecCommand.cpp
View file

@ -146,8 +146,8 @@ bool Document::query_command_enabled(FlyString const& command)
// NOTE: Commands can define additional conditions for being enabled, and currently the only condition mentioned in
// the spec is that certain commands must not be enabled if the editing host is in the plaintext-only state.
if (is<HTML::HTMLElement>(start_node_editing_host.ptr())
&& static_cast<HTML::HTMLElement&>(*start_node_editing_host).content_editable_state() == HTML::ContentEditableState::PlaintextOnly
if (auto const* html_element = as_if<HTML::HTMLElement>(start_node_editing_host.ptr()); html_element
&& html_element->content_editable_state() == HTML::ContentEditableState::PlaintextOnly
&& command.is_one_of(
Editing::CommandNames::backColor,
Editing::CommandNames::bold,