RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-10-31 15:42:44 +00:00
Code Issues Activity Actions

LibWeb: Convert DOMTokenList to use TRY for error propagation

Browse source
This commit is contained in:
Linus Groh 2022-03-22 12:37:47 +00:00
parent 91d0088a5b
commit b6f09aaef2
1 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

15
Userland/Libraries/LibWeb/DOM/DOMTokenList.cpp
View file

@ -109,8 +109,7 @@ ExceptionOr<void> DOMTokenList::add(Vector<String> const& tokens)
for (auto const& token : tokens) { for (auto const& token : tokens) {
// a. If token is the empty string, then throw a "SyntaxError" DOMException. // a. If token is the empty string, then throw a "SyntaxError" DOMException.
// b. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException. // b. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException.
if (auto exception = validate_token(token); exception.is_exception()) TRY(validate_token(token));
return exception;
// 2. For each token in tokens, append token to this’s token set. // 2. For each token in tokens, append token to this’s token set.
append_to_ordered_set(m_token_set, token); append_to_ordered_set(m_token_set, token);
@ -128,8 +127,7 @@ ExceptionOr<void> DOMTokenList::remove(Vector<String> const& tokens)
for (auto const& token : tokens) { for (auto const& token : tokens) {
// a. If token is the empty string, then throw a "SyntaxError" DOMException. // a. If token is the empty string, then throw a "SyntaxError" DOMException.
// b. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException. // b. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException.
if (auto exception = validate_token(token); exception.is_exception()) TRY(validate_token(token));
return exception;
// 2. For each token in tokens, remove token from this’s token set. // 2. For each token in tokens, remove token from this’s token set.
remove_from_ordered_set(m_token_set, token); remove_from_ordered_set(m_token_set, token);
@ -145,8 +143,7 @@ ExceptionOr<bool> DOMTokenList::toggle(String const& token, Optional<bool> force
{ {
// 1. If token is the empty string, then throw a "SyntaxError" DOMException. // 1. If token is the empty string, then throw a "SyntaxError" DOMException.
// 2. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException. // 2. If token contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException.
if (auto exception = validate_token(token); exception.is_exception()) TRY(validate_token(token));
return exception.exception();
// 3. If this’s token set[token] exists, then: // 3. If this’s token set[token] exists, then:
if (contains(token)) { if (contains(token)) {
@ -177,10 +174,8 @@ ExceptionOr<bool> DOMTokenList::replace(String const& token, String const& new_t
{ {
// 1. If either token or newToken is the empty string, then throw a "SyntaxError" DOMException. // 1. If either token or newToken is the empty string, then throw a "SyntaxError" DOMException.
// 2. If either token or newToken contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException. // 2. If either token or newToken contains any ASCII whitespace, then throw an "InvalidCharacterError" DOMException.
if (auto exception = validate_token(token); exception.is_exception()) TRY(validate_token(token));
return exception.exception(); TRY(validate_token(new_token));
if (auto exception = validate_token(new_token); exception.is_exception())
return exception.exception();
// 3. If this’s token set does not contain token, then return false. // 3. If this’s token set does not contain token, then return false.
if (!contains(token)) if (!contains(token))