From ab0a354bb48665bffc01b7f2a307bc9fcd7241ad Mon Sep 17 00:00:00 2001 From: Linus Groh Date: Tue, 22 Mar 2022 12:36:30 +0000 Subject: [PATCH] LibWeb: Convert ChildNode to use TRY for error propagation --- Userland/Libraries/LibWeb/DOM/ChildNode.h | 35 +++++------------------ 1 file changed, 7 insertions(+), 28 deletions(-) diff --git a/Userland/Libraries/LibWeb/DOM/ChildNode.h b/Userland/Libraries/LibWeb/DOM/ChildNode.h index 2f46285a64..4493e41afb 100644 --- a/Userland/Libraries/LibWeb/DOM/ChildNode.h +++ b/Userland/Libraries/LibWeb/DOM/ChildNode.h @@ -31,11 +31,7 @@ public: 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. - auto node_or_exception = 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(); + auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document())); // 5. If viablePreviousSibling is null, then set it to parent’s first child; otherwise to viablePreviousSibling’s next sibling. if (!viable_previous_sibling) @@ -44,9 +40,7 @@ public: viable_previous_sibling = viable_previous_sibling->next_sibling(); // 6. Pre-insert node into parent before viablePreviousSibling. - auto result = parent->pre_insert(node_to_insert, viable_previous_sibling); - if (result.is_exception()) - return result.exception(); + (void)TRY(parent->pre_insert(node_to_insert, viable_previous_sibling)); return {}; } @@ -67,16 +61,10 @@ public: 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. - auto node_or_exception = 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(); + auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document())); // 5. Pre-insert node into parent before viableNextSibling. - auto result = parent->pre_insert(node_to_insert, viable_next_sibling); - if (result.is_exception()) - return result.exception(); + (void)TRY(parent->pre_insert(node_to_insert, viable_next_sibling)); return {}; } @@ -97,26 +85,17 @@ public: 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. - auto node_or_exception = 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(); + auto node_to_insert = TRY(convert_nodes_to_single_node(nodes, node->document())); // 5. If this’s parent is parent, replace this with node within parent. // Note: This could have been inserted into node. if (node->parent() == parent) { - auto result = parent->replace_child(node_to_insert, *node); - if (result.is_exception()) - return result.exception(); - + (void)TRY(parent->replace_child(node_to_insert, *node)); return {}; } // 6. Otherwise, pre-insert node into parent before viableNextSibling. - auto result = parent->pre_insert(node_to_insert, viable_next_sibling); - if (result.is_exception()) - return result.exception(); + (void)TRY(parent->pre_insert(node_to_insert, viable_next_sibling)); return {}; }