diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
index 65795191a7792..29bdf33aa07c2 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
@@ -6,17 +6,17 @@ PASS Clicking inside a popover does not close that popover
 PASS Popovers close on pointerup, not pointerdown
 PASS Synthetic events can't close popovers
 PASS Moving focus outside the popover should not dismiss the popover
-PASS Clicking inside a child popover shouldn't close either popover
-PASS Clicking inside a parent popover should close child popover
+FAIL Clicking inside a child popover shouldn't close either popover assert_true: popover1 should be open expected true got false
+FAIL Clicking inside a parent popover should close child popover assert_true: expected true got false
 PASS Clicking on invoking element, after using it for activation, shouldn't close its popover
 PASS Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case)
-PASS Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation)
+FAIL Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation) assert_true: expected true got false
 PASS Clicking on invoking element, even if it wasn't used for activation, shouldn't close its popover
 PASS Clicking on popovertarget element, even if it wasn't used for activation, should hide it exactly once
 PASS Clicking on anchor element (that isn't an invoking element) shouldn't prevent its popover from being closed
-PASS Dragging from an open popover outside an open popover should leave the popover open
+FAIL Dragging from an open popover outside an open popover should leave the popover open assert_true: expected true got false
 PASS A popover inside an invoking element doesn't participate in that invoker's ancestor chain
-PASS An invoking element that was not used to invoke the popover can still be part of the ancestor chain
+PASS An invoking element that was not used to invoke the popover is not part of the ancestor chain
 FAIL Scrolling within a popover should not close the popover promise_test: Unhandled rejection with value: object "Error: Unknown source type "wheel"."
 PASS Clicking inside a shadow DOM popover does not close that popover
 PASS Clicking outside a shadow DOM popover should close that popover
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html
index 02781f71b22f3..ee85b44124832 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss.html
@@ -298,11 +298,10 @@
     assert_false(popover3.matches(':popover-open'));
     popover3.showPopover();
     assert_true(popover3.matches(':popover-open'));
-    assert_true(popover5.matches(':popover-open'));
-    popover5.hidePopover();
+    assert_false(popover5.matches(':popover-open'),'Popover 5 was not invoked from popover3\'s invoker');
+    popover3.hidePopover();
     assert_false(popover3.matches(':popover-open'));
-    assert_false(popover5.matches(':popover-open'));
-  },'An invoking element that was not used to invoke the popover can still be part of the ancestor chain');
+  },'An invoking element that was not used to invoke the popover is not part of the ancestor chain');
 </script>
 
 <div popover id=p6>Inside popover 6
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html
index 9279a121bea73..87293f1e3d56c 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-shadow-dom.html
@@ -187,7 +187,7 @@
     polyfill_declarative_shadow_dom(test5);
     const [popover1,popover2] = getPopoverReferences('test5');
     popover1.showPopover();
-    popover2.showPopover();
+    popover1.querySelector('button').click(); // Use invoker to keep 2 visible
     // Both 1 and 2 should be open at this point.
     assert_true(popover1.matches(':popover-open'), 'popover1 not open');
     assert_true(isElementVisible(popover1));
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled-expected.txt
index a135633496929..12fc45f41c117 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled-expected.txt
@@ -2,11 +2,10 @@ form
 helloother button
 
 PASS Disabled popover*target buttons should not affect the popover heirarchy.
-PASS Disabling popover*target buttons when popovers are open should still cause all popovers to be closed when the formerly outer popover is closed.
-PASS Disabling popover*target buttons when popovers are open should still cause all popovers to be closed when the formerly inner popover is closed.
-PASS Setting the form attribute on popover*target buttons when popovers are open should close all popovers.
-PASS Changing the input type on a popover*target button when popovers are open should close all popovers.
-PASS Disconnecting popover*target buttons when popovers are open should close all popovers.
-PASS Changing the popovertarget attribute to break the chain should close all popovers.
+PASS Disabling popover*target buttons when popovers are open should not cause popovers to be closed.
+PASS Setting the form attribute on popover*target buttons when popovers are open should not close them.
+PASS Changing the input type on a popover*target button when popovers are open should not close anything.
+PASS Disconnecting popover*target buttons when popovers are open should not close anything.
+PASS Changing the popovertarget attribute to break the chain should not close anything.
 PASS Modifying popovertarget on a button which doesn't break the chain shouldn't close any popovers.
 
diff --git a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html
index bf1f297148442..d5c951768c083 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html
+++ b/LayoutTests/imported/w3c/web-platform-tests/html/semantics/popovers/popover-target-element-disabled.html
@@ -11,6 +11,10 @@
 <script>
 test(() => {
   outerpopover.showPopover();
+  outerpopover.querySelector('button').click(); // Invoke innerpopover
+  assert_false(innerpopover.matches(':popover-open'),
+    'disabled button shouldn\'t open the target popover');
+  assert_true(outerpopover.matches(':popover-open'));
   innerpopover.showPopover();
   assert_true(innerpopover.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
@@ -26,39 +30,18 @@
 <script>
 test(() => {
   outerpopover2.showPopover();
-  innerpopover2.showPopover();
+  outerpopover2.querySelector('button').click(); // Invoke innerpopover
   assert_true(innerpopover2.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
   assert_true(outerpopover2.matches(':popover-open'),
     'The outer popover should stay open when opening the inner one.');
 
   togglebutton2.disabled = true;
-  assert_false(innerpopover2.matches(':popover-open'),
-    'The inner popover should be closed when the hierarchy is broken.');
-  assert_false(outerpopover2.matches(':popover-open'),
-    'The outer popover should be closed when the hierarchy is broken.');
-}, 'Disabling popover*target buttons when popovers are open should still cause all popovers to be closed when the formerly outer popover is closed.');
-</script>
-
-<div id=outerpopover3 popover=auto>
-  <button id=togglebutton3 popovertarget=innerpopover3>toggle popover</button>
-</div>
-<div id=innerpopover3 popover=auto>popover</div>
-<script>
-test(() => {
-  outerpopover3.showPopover();
-  innerpopover3.showPopover();
-  assert_true(innerpopover3.matches(':popover-open'),
-    'The inner popover should be able to open successfully.');
-  assert_true(outerpopover3.matches(':popover-open'),
-    'The outer popover should stay open when opening the inner one.');
-
-  togglebutton3.disabled = true;
-  assert_false(innerpopover3.matches(':popover-open'),
-    'The inner popover be should be closed when the hierarchy is broken.');
-  assert_false(outerpopover3.matches(':popover-open'),
-    'The outer popover be should be closed when the hierarchy is broken.');
-}, 'Disabling popover*target buttons when popovers are open should still cause all popovers to be closed when the formerly inner popover is closed.');
+  assert_true(innerpopover2.matches(':popover-open'),
+    'Changing disabled states after popovers are open shouldn\'t close anything');
+  assert_true(outerpopover2.matches(':popover-open'),
+  'Changing disabled states after popovers are open shouldn\'t close anything');
+}, 'Disabling popover*target buttons when popovers are open should not cause popovers to be closed.');
 </script>
 
 <div id=outerpopover4 popover=auto>
@@ -69,18 +52,18 @@
 <script>
 test(() => {
   outerpopover4.showPopover();
-  innerpopover4.showPopover();
+  outerpopover4.querySelector('button').click(); // Invoke innerpopover
   assert_true(innerpopover4.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
   assert_true(outerpopover4.matches(':popover-open'),
     'The outer popover should stay open when opening the inner one.');
 
   togglebutton4.setAttribute('form', 'submitform');
-  assert_false(innerpopover4.matches(':popover-open'),
-    'The inner popover be should be closed when the hierarchy is broken.');
-  assert_false(outerpopover4.matches(':popover-open'),
-    'The outer popover be should be closed when the hierarchy is broken.');
-}, 'Setting the form attribute on popover*target buttons when popovers are open should close all popovers.');
+  assert_true(innerpopover4.matches(':popover-open'),
+    'The inner popover be should be not closed when invoking buttons cease to be invokers.');
+  assert_true(outerpopover4.matches(':popover-open'),
+    'The outer popover be should be not closed when invoking buttons cease to be invokers.');
+}, 'Setting the form attribute on popover*target buttons when popovers are open should not close them.');
 </script>
 
 <div id=outerpopover5 popover=auto>
@@ -90,18 +73,18 @@
 <script>
 test(() => {
   outerpopover5.showPopover();
-  innerpopover5.showPopover();
+  outerpopover5.querySelector('input').click(); // Invoke innerpopover
   assert_true(innerpopover5.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
   assert_true(outerpopover5.matches(':popover-open'),
     'The outer popover should stay open when opening the inner one.');
 
   togglebutton5.setAttribute('type', 'text');
-  assert_false(innerpopover5.matches(':popover-open'),
-    'The inner popover be should be closed when the hierarchy is broken.');
-  assert_false(outerpopover5.matches(':popover-open'),
-    'The outer popover be should be closed when the hierarchy is broken.');
-}, 'Changing the input type on a popover*target button when popovers are open should close all popovers.');
+  assert_true(innerpopover5.matches(':popover-open'),
+    'The inner popover be should be not closed when invoking buttons cease to be invokers.');
+  assert_true(outerpopover5.matches(':popover-open'),
+    'The outer popover be should be not closed when invoking buttons cease to be invokers.');
+}, 'Changing the input type on a popover*target button when popovers are open should not close anything.');
 </script>
 
 <div id=outerpopover6 popover=auto>
@@ -111,18 +94,18 @@
 <script>
 test(() => {
   outerpopover6.showPopover();
-  innerpopover6.showPopover();
+  outerpopover6.querySelector('button').click(); // Invoke innerpopover
   assert_true(innerpopover6.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
   assert_true(outerpopover6.matches(':popover-open'),
     'The outer popover should stay open when opening the inner one.');
 
   togglebutton6.remove();
-  assert_false(innerpopover6.matches(':popover-open'),
-    'The inner popover be should be closed when the hierarchy is broken.');
-  assert_false(outerpopover6.matches(':popover-open'),
-    'The outer popover be should be closed when the hierarchy is broken.');
-}, 'Disconnecting popover*target buttons when popovers are open should close all popovers.');
+  assert_true(innerpopover6.matches(':popover-open'),
+    'The inner popover be should be not closed when invoking buttons are removed.');
+  assert_true(outerpopover6.matches(':popover-open'),
+    'The outer popover be should be not closed when invoking buttons are removed.');
+}, 'Disconnecting popover*target buttons when popovers are open should not close anything.');
 </script>
 
 <div id=outerpopover7 popover=auto>
@@ -132,18 +115,18 @@
 <script>
 test(() => {
   outerpopover7.showPopover();
-  innerpopover7.showPopover();
+  outerpopover7.querySelector('button').click(); // Invoke innerpopover
   assert_true(innerpopover7.matches(':popover-open'),
     'The inner popover should be able to open successfully.');
   assert_true(outerpopover7.matches(':popover-open'),
     'The outer popover should stay open when opening the inner one.');
 
   togglebutton7.setAttribute('popovertarget', 'otherpopover7');
-  assert_false(innerpopover7.matches(':popover-open'),
-    'The inner popover be should be closed when the hierarchy is broken.');
-  assert_false(outerpopover7.matches(':popover-open'),
-    'The outer popover be should be closed when the hierarchy is broken.');
-}, 'Changing the popovertarget attribute to break the chain should close all popovers.');
+  assert_true(innerpopover7.matches(':popover-open'),
+    'The inner popover be should be not closed when invoking buttons are retargeted.');
+    assert_true(outerpopover7.matches(':popover-open'),
+    'The outer popover be should be not closed when invoking buttons are retargeted.');
+}, 'Changing the popovertarget attribute to break the chain should not close anything.');
 </script>
 
 <div id=outerpopover8 popover=auto>
diff --git a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-2-expected.txt b/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-2-expected.txt
deleted file mode 100644
index bb1a285133b8f..0000000000000
--- a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-2-expected.txt
+++ /dev/null
@@ -1,10 +0,0 @@
-Button1  Button2  Invoker1  Button3  Button4
-Invoker  after
-Show popover
-Toggle popover Other focusable element
-
-FAIL Popover focus navigation assert_equals: Focus should move from invoker into the open popover expected Element node <button id="inside_popover1" tabindex="0">Inside1</button> but got Element node <button id="button3" tabindex="0">Button3</button>
-PASS Circular reference tab navigation
-PASS Popover focus returns when popover is hidden by invoker
-FAIL Popover focus only returns to invoker when focus is within the popover assert_equals: focus does not move because it was not inside the popover expected Element node <span tabindex="0">Other focusable element</span> but got Element node <button popovertarget="focus-return2-p">Toggle popover</b...
-
diff --git a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-expected.txt b/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-expected.txt
deleted file mode 100644
index 8f2089872e800..0000000000000
--- a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-focus-expected.txt
+++ /dev/null
@@ -1,29 +0,0 @@
-This is a popover
-
-autofocus button  second autofocus button
-
-PASS Popover focus test: default behavior - popover is not focused
-FAIL Popover button click focus test: default behavior - popover is not focused assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: default behavior - popover is not focused
-PASS Popover focus test: autofocus popover
-FAIL Popover button click focus test: autofocus popover assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus popover
-PASS Popover focus test: autofocus empty popover
-FAIL Popover button click focus test: autofocus empty popover assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus empty popover
-PASS Popover focus test: autofocus popover with button
-FAIL Popover button click focus test: autofocus popover with button assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus popover with button
-PASS Popover focus test: autofocus child
-FAIL Popover button click focus test: autofocus child assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus child
-PASS Popover focus test: autofocus on tabindex=0 element
-FAIL Popover button click focus test: autofocus on tabindex=0 element assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus on tabindex=0 element
-PASS Popover focus test: autofocus multiple children
-FAIL Popover button click focus test: autofocus multiple children assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus multiple children
-PASS Popover focus test: autofocus popover and multiple autofocus children
-FAIL Popover button click focus test: autofocus popover and multiple autofocus children assert_equals: focus should move to the button when clicked, and should stay there when the popover closes expected Element node <button tabindex="0" popovertarget="popover-id">Click me<... but got Element node <button tabindex="0" id="priorFocus"></button>
-PASS Popover corner cases test: autofocus popover and multiple autofocus children
-
diff --git a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt b/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
index a440e1d457fe2..9bd035db59aaf 100644
--- a/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
+++ b/LayoutTests/platform/glib/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
@@ -6,17 +6,17 @@ PASS Clicking inside a popover does not close that popover
 PASS Popovers close on pointerup, not pointerdown
 PASS Synthetic events can't close popovers
 PASS Moving focus outside the popover should not dismiss the popover
-PASS Clicking inside a child popover shouldn't close either popover
-PASS Clicking inside a parent popover should close child popover
+FAIL Clicking inside a child popover shouldn't close either popover assert_true: popover1 should be open expected true got false
+FAIL Clicking inside a parent popover should close child popover assert_true: expected true got false
 PASS Clicking on invoking element, after using it for activation, shouldn't close its popover
 PASS Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case)
-PASS Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation)
+FAIL Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation) assert_true: expected true got false
 PASS Clicking on invoking element, even if it wasn't used for activation, shouldn't close its popover
 PASS Clicking on popovertarget element, even if it wasn't used for activation, should hide it exactly once
 PASS Clicking on anchor element (that isn't an invoking element) shouldn't prevent its popover from being closed
-PASS Dragging from an open popover outside an open popover should leave the popover open
+FAIL Dragging from an open popover outside an open popover should leave the popover open assert_true: expected true got false
 PASS A popover inside an invoking element doesn't participate in that invoker's ancestor chain
-PASS An invoking element that was not used to invoke the popover can still be part of the ancestor chain
+PASS An invoking element that was not used to invoke the popover is not part of the ancestor chain
 FAIL Scrolling within a popover should not close the popover promise_test: Unhandled rejection with value: object "Error: Unknown source type "wheel"."
 PASS Clicking inside a shadow DOM popover does not close that popover
 PASS Clicking outside a shadow DOM popover should close that popover
diff --git a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
index d2fd15e767b50..f96707121939e 100644
--- a/LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
+++ b/LayoutTests/platform/ios/imported/w3c/web-platform-tests/html/semantics/popovers/popover-light-dismiss-expected.txt
@@ -6,17 +6,17 @@ FAIL Clicking inside a popover does not close that popover assert_false: expecte
 FAIL Popovers close on pointerup, not pointerdown assert_false: expected false got true
 FAIL Synthetic events can't close popovers assert_false: expected false got true
 FAIL Moving focus outside the popover should not dismiss the popover assert_equals: Focus should move to a button outside the popover expected Element node <button id="after_p1" tabindex="0">Next control after pop... but got Element node <body><button id="b1t" popovertarget="p1">Popover 1</butt...
-PASS Clicking inside a child popover shouldn't close either popover
-FAIL Clicking inside a parent popover should close child popover assert_false: expected false got true
-PASS Clicking on invoking element, after using it for activation, shouldn't close its popover
+FAIL Clicking inside a child popover shouldn't close either popover assert_true: popover1 should be open expected true got false
+FAIL Clicking inside a parent popover should close child popover assert_true: expected true got false
+FAIL Clicking on invoking element, after using it for activation, shouldn't close its popover assert_true: expected true got false
 FAIL Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case) assert_true: button2 should activate popover2 expected true got false
-PASS Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation)
+FAIL Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation) assert_true: expected true got false
 PASS Clicking on invoking element, even if it wasn't used for activation, shouldn't close its popover
 FAIL Clicking on popovertarget element, even if it wasn't used for activation, should hide it exactly once assert_false: popover1 should be hidden by popovertarget expected false got true
 FAIL Clicking on anchor element (that isn't an invoking element) shouldn't prevent its popover from being closed assert_false: popover1 should close expected false got true
-PASS Dragging from an open popover outside an open popover should leave the popover open
+FAIL Dragging from an open popover outside an open popover should leave the popover open assert_true: expected true got false
 FAIL A popover inside an invoking element doesn't participate in that invoker's ancestor chain assert_true: invoking element should open popover expected true got false
-PASS An invoking element that was not used to invoke the popover can still be part of the ancestor chain
+PASS An invoking element that was not used to invoke the popover is not part of the ancestor chain
 FAIL Scrolling within a popover should not close the popover promise_test: Unhandled rejection with value: object "Error: Unknown source type "wheel"."
 PASS Clicking inside a shadow DOM popover does not close that popover
 FAIL Clicking outside a shadow DOM popover should close that popover assert_false: expected false got true
diff --git a/Source/WebCore/html/HTMLElement.cpp b/Source/WebCore/html/HTMLElement.cpp
index 06103df779714..ab4b9602ddfd8 100644
--- a/Source/WebCore/html/HTMLElement.cpp
+++ b/Source/WebCore/html/HTMLElement.cpp
@@ -1304,33 +1304,11 @@ static HTMLElement* topmostPopoverAncestor(Element& newPopover)
 
     checkAncestor(newPopover.parentElementInComposedTree());
 
-    // Iterate over all popover invokers in the document.
-    for (auto& invoker : descendantsOfType<HTMLFormControlElement>(newPopover.treeScope().rootNode())) {
-        // popoverTargetElement() already checks if the form control can invoke popovers.
-        if (invoker.popoverTargetElement() == &newPopover)
-            checkAncestor(&invoker);
-    }
+    checkAncestor(newPopover.popoverData()->invoker());
 
     return topmostAncestor.get();
 }
 
-void HTMLElement::checkAndPossiblyClosePopoverStackInternal()
-{
-    Vector<RefPtr<Element>> autoPopoverList;
-    for (auto& element : document().topLayerElements()) {
-        if (!is<HTMLElement>(element) || downcast<HTMLElement>(element.get()).popoverState() != PopoverState::Auto)
-            continue;
-        autoPopoverList.append(element.ptr());
-    }
-
-    for (size_t i = autoPopoverList.size(); i-- > 1;) {
-        if (topmostPopoverAncestor(*autoPopoverList[i]) != autoPopoverList[i - 1]) {
-            document().hideAllPopoversUntil(nullptr, FocusPreviousElement::No, FireEvents::No);
-            return;
-        }
-    }
-}
-
 // https://html.spec.whatwg.org/#popover-focusing-steps
 static void runPopoverFocusingSteps(HTMLElement& popover)
 {
diff --git a/Source/WebCore/html/HTMLElement.h b/Source/WebCore/html/HTMLElement.h
index 7887827db3eba..35ee6080a9212 100644
--- a/Source/WebCore/html/HTMLElement.h
+++ b/Source/WebCore/html/HTMLElement.h
@@ -192,13 +192,6 @@ class HTMLElement : public StyledElement {
     void childrenChanged(const ChildChange&) override;
     void updateEffectiveDirectionalityOfDirAuto();
 
-    void checkAndPossiblyClosePopoverStack()
-    {
-        if (!document().settings().popoverAttributeEnabled() || !document().hasTopLayerElement())
-            return;
-        checkAndPossiblyClosePopoverStackInternal();
-    }
-
     using EventHandlerNameMap = HashMap<AtomStringImpl*, AtomString>;
     static const AtomString& eventNameForEventHandlerAttribute(const QualifiedName& attributeName, const EventHandlerNameMap&);
 
@@ -222,7 +215,6 @@ class HTMLElement : public StyledElement {
     enum class UseCSSPXAsUnitType : bool { No, Yes };
     enum class IsMultiLength : bool { No, Yes };
     void addHTMLLengthToStyle(MutableStyleProperties&, CSSPropertyID, StringView value, AllowPercentage, UseCSSPXAsUnitType, IsMultiLength, AllowZeroValue = AllowZeroValue::Yes);
-    void checkAndPossiblyClosePopoverStackInternal();
 };
 
 inline HTMLElement::HTMLElement(const QualifiedName& tagName, Document& document, ConstructionType type = CreateHTMLElement)
diff --git a/Source/WebCore/html/HTMLFormControlElement.cpp b/Source/WebCore/html/HTMLFormControlElement.cpp
index 584543d1ebe64..0e40ba66adca2 100644
--- a/Source/WebCore/html/HTMLFormControlElement.cpp
+++ b/Source/WebCore/html/HTMLFormControlElement.cpp
@@ -141,7 +141,6 @@ void HTMLFormControlElement::removedFromAncestor(RemovalType removalType, Contai
 {
     HTMLElement::removedFromAncestor(removalType, oldParentOfRemovedTree);
     ValidatedFormListedElement::removedFromAncestor(removalType, oldParentOfRemovedTree);
-    checkAndPossiblyClosePopoverStack();
 }
 
 void HTMLFormControlElement::attributeChanged(const QualifiedName& name, const AtomString& oldValue, const AtomString& newValue, AttributeModificationReason attributeModificationReason)
@@ -153,9 +152,7 @@ void HTMLFormControlElement::attributeChanged(const QualifiedName& name, const A
             m_isRequired = newRequired;
             requiredStateChanged();
         }
-    } else if (name == popovertargetAttr)
-        checkAndPossiblyClosePopoverStack();
-    else {
+    } else {
         HTMLElement::attributeChanged(name, oldValue, newValue, attributeModificationReason);
         ValidatedFormListedElement::parseAttribute(name, newValue);
     }
@@ -173,7 +170,6 @@ void HTMLFormControlElement::disabledStateChanged()
     ValidatedFormListedElement::disabledStateChanged();
     if (renderer() && renderer()->style().hasEffectiveAppearance())
         renderer()->theme().stateChanged(*renderer(), ControlStates::States::Enabled);
-    checkAndPossiblyClosePopoverStack();
 }
 
 void HTMLFormControlElement::readOnlyStateChanged()
@@ -415,10 +411,4 @@ bool HTMLFormControlElement::needsMouseFocusableQuirk() const
     return document().quirks().needsFormControlToBeMouseFocusable();
 }
 
-void HTMLFormControlElement::didChangeForm()
-{
-    ValidatedFormListedElement::didChangeForm();
-    checkAndPossiblyClosePopoverStack();
-}
-
 } // namespace Webcore
diff --git a/Source/WebCore/html/HTMLFormControlElement.h b/Source/WebCore/html/HTMLFormControlElement.h
index 0bfdaef319a99..3009b88602486 100644
--- a/Source/WebCore/html/HTMLFormControlElement.h
+++ b/Source/WebCore/html/HTMLFormControlElement.h
@@ -129,8 +129,6 @@ class HTMLFormControlElement : public HTMLElement, public ValidatedFormListedEle
 
     void handlePopoverTargetAction() const;
 
-    void didChangeForm() override;
-
 private:
     void refFormAssociatedElement() const final { ref(); }
     void derefFormAssociatedElement() const final { deref(); }
diff --git a/Source/WebCore/html/HTMLInputElement.cpp b/Source/WebCore/html/HTMLInputElement.cpp
index 26349dd5eba03..1bae7d8071973 100644
--- a/Source/WebCore/html/HTMLInputElement.cpp
+++ b/Source/WebCore/html/HTMLInputElement.cpp
@@ -590,8 +590,6 @@ void HTMLInputElement::updateType(const AtomString& typeAttributeValue)
     }
 
     updateValidity();
-
-    checkAndPossiblyClosePopoverStack();
 }
 
 inline void HTMLInputElement::runPostTypeUpdateTasks()