From 576eede2b1485cde1ba913609a73dabd9bc24603 Mon Sep 17 00:00:00 2001 From: Timothy Flynn Date: Wed, 12 Mar 2025 14:33:31 -0400 Subject: [PATCH] LibWeb: Simplify IPC encoding of style sheet DOM node IDs We were essentially reinventing Optional::map here. --- Libraries/LibWeb/CSS/StyleSheetIdentifier.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Libraries/LibWeb/CSS/StyleSheetIdentifier.cpp b/Libraries/LibWeb/CSS/StyleSheetIdentifier.cpp index 134e2d75865..d96f3378d0a 100644 --- a/Libraries/LibWeb/CSS/StyleSheetIdentifier.cpp +++ b/Libraries/LibWeb/CSS/StyleSheetIdentifier.cpp @@ -50,8 +50,7 @@ template<> ErrorOr encode(Encoder& encoder, Web::CSS::StyleSheetIdentifier const& style_sheet_source) { TRY(encoder.encode(style_sheet_source.type)); - Optional dom_element_unique_id = style_sheet_source.dom_element_unique_id.has_value() ? Optional(style_sheet_source.dom_element_unique_id.value()) : Optional {}; - TRY(encoder.encode(dom_element_unique_id)); + TRY(encoder.encode(style_sheet_source.dom_element_unique_id.map([](auto value) { return value.value(); }))); TRY(encoder.encode(style_sheet_source.url)); return {}; @@ -61,12 +60,12 @@ template<> ErrorOr decode(Decoder& decoder) { auto type = TRY(decoder.decode()); - auto dom_element_unique_id = TRY(decoder.decode>()); + auto dom_element_unique_id = TRY(decoder.decode>()); auto url = TRY(decoder.decode>()); return Web::CSS::StyleSheetIdentifier { .type = type, - .dom_element_unique_id = dom_element_unique_id.has_value() ? Web::UniqueNodeID(dom_element_unique_id.value()) : Optional {}, + .dom_element_unique_id = dom_element_unique_id.map([](auto value) -> Web::UniqueNodeID { return value; }), .url = move(url), }; }