RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-27 00:47:45 +00:00
Code Issues Activity Actions

LibWeb: Convert ChildNode to use TRY for error propagation

Browse source
This commit is contained in:
Linus Groh 2022-03-22 12:36:30 +00:00
parent 9ca10c9347
commit ab0a354bb4
1 changed files with 7 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

35
Userland/Libraries/LibWeb/DOM/ChildNode.h
View file

@ -31,11 +31,7 @@ public:
auto viable_previous_sibling = viable_previous_sibling_for_insertion(nodes); auto viable_previous_sibling = viable_previous_sibling_for_insertion(nodes);
// 4. Let node be the result of converting nodes into a node, given nodes and this’s node document. // 4. Let node be the result of converting nodes into a node, given nodes and this’s node document.
auto node_or_exception = convert_nodes_to_single_node(nodes, node->document()); auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document()));
if (node_or_exception.is_exception())
return node_or_exception.exception();
auto node_to_insert = node_or_exception.release_value();
// 5. If viablePreviousSibling is null, then set it to parent’s first child; otherwise to viablePreviousSibling’s next sibling. // 5. If viablePreviousSibling is null, then set it to parent’s first child; otherwise to viablePreviousSibling’s next sibling.
if (!viable_previous_sibling) if (!viable_previous_sibling)
@ -44,9 +40,7 @@ public:
viable_previous_sibling = viable_previous_sibling->next_sibling(); viable_previous_sibling = viable_previous_sibling->next_sibling();
// 6. Pre-insert node into parent before viablePreviousSibling. // 6. Pre-insert node into parent before viablePreviousSibling.
auto result = parent->pre_insert(node_to_insert, viable_previous_sibling); (void)TRY(parent->pre_insert(node_to_insert, viable_previous_sibling));
if (result.is_exception())
return result.exception();
return {}; return {};
} }
@ -67,16 +61,10 @@ public:
auto viable_next_sibling = viable_nest_sibling_for_insertion(nodes); auto viable_next_sibling = viable_nest_sibling_for_insertion(nodes);
// 4. Let node be the result of converting nodes into a node, given nodes and this’s node document. // 4. Let node be the result of converting nodes into a node, given nodes and this’s node document.
auto node_or_exception = convert_nodes_to_single_node(nodes, node->document()); auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document()));
if (node_or_exception.is_exception())
return node_or_exception.exception();
auto node_to_insert = node_or_exception.release_value();
// 5. Pre-insert node into parent before viableNextSibling. // 5. Pre-insert node into parent before viableNextSibling.
auto result = parent->pre_insert(node_to_insert, viable_next_sibling); (void)TRY(parent->pre_insert(node_to_insert, viable_next_sibling));
if (result.is_exception())
return result.exception();
return {}; return {};
} }
@ -97,26 +85,17 @@ public:
auto viable_next_sibling = viable_nest_sibling_for_insertion(nodes); auto viable_next_sibling = viable_nest_sibling_for_insertion(nodes);
// 4. Let node be the result of converting nodes into a node, given nodes and this’s node document. // 4. Let node be the result of converting nodes into a node, given nodes and this’s node document.
auto node_or_exception = convert_nodes_to_single_node(nodes, node->document()); auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document()));
if (node_or_exception.is_exception())
return node_or_exception.exception();
auto node_to_insert = node_or_exception.release_value();
// 5. If this’s parent is parent, replace this with node within parent. // 5. If this’s parent is parent, replace this with node within parent.
// Note: This could have been inserted into node. // Note: This could have been inserted into node.
if (node->parent() == parent) { if (node->parent() == parent) {
auto result = parent->replace_child(node_to_insert, *node); (void)TRY(parent->replace_child(node_to_insert, *node));
if (result.is_exception())
return result.exception();
return {}; return {};
} }
// 6. Otherwise, pre-insert node into parent before viableNextSibling. // 6. Otherwise, pre-insert node into parent before viableNextSibling.
auto result = parent->pre_insert(node_to_insert, viable_next_sibling); (void)TRY(parent->pre_insert(node_to_insert, viable_next_sibling));
if (result.is_exception())
return result.exception();
return {}; return {};
} }