Move FocusRemovalEventsMode into FocusOptions

mrego · mrego · commit 2db19c4857be · 2021-04-15T22:27:48.000Z
https://bugs.webkit.org/show_bug.cgi?id=224549 <rdar://problem/76695885> Reviewed by Darin Adler. Follow-up patch to use braces initializer for FocusOptions struct and simplify the code. * dom/Document.cpp: (WebCore::Document::adjustFocusedNodeOnNodeRemoval): Canonical link: https://commits.webkit.org/236590@main git-svn-id: https://svn.webkit.org/repository/webkit/trunk@276077 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
@@ -1,3 +1,16 @@
+2021-04-15  Manuel Rego Casasnovas  <rego@igalia.com>
+
+        Move FocusRemovalEventsMode into FocusOptions
+        https://bugs.webkit.org/show_bug.cgi?id=224549
+        <rdar://problem/76695885>
+
+        Reviewed by Darin Adler.
+
+        Follow-up patch to use braces initializer for FocusOptions struct and simplify the code.
+
+        * dom/Document.cpp:
+        (WebCore::Document::adjustFocusedNodeOnNodeRemoval):
+
 2021-04-15  Alex Christensen  <achristensen@webkit.org>
 
         Add deprecation macros
diff --git a/Source/WebCore/dom/Document.cpp b/Source/WebCore/dom/Document.cpp
@@ -4357,9 +4357,7 @@ void Document::adjustFocusedNodeOnNodeRemoval(Node& node, NodeRemoval nodeRemova
         // FIXME: We should avoid synchronously updating the style inside setFocusedElement.
         // FIXME: Object elements should avoid loading a frame synchronously in a post style recalc callback.
         SubframeLoadingDisabler disabler(is<ContainerNode>(node) ? &downcast<ContainerNode>(node) : nullptr);
-        FocusOptions focusOptions = { };
-        focusOptions.removalEventsMode = FocusRemovalEventsMode::DoNotDispatch;
-        setFocusedElement(nullptr, focusOptions);
+        setFocusedElement(nullptr, { { }, { }, FocusRemovalEventsMode::DoNotDispatch, { } });
         // Set the focus navigation starting node to the previous focused element so that
         // we can fallback to the siblings or parent node for the next search.
         // Also we need to call removeFocusNavigationNodeOfSubtree after this function because
