From 57ffc2ee82f43da8b9142dff818375d89c69f82c Mon Sep 17 00:00:00 2001
From: Natalia Csoregi <ncsoregi@mozilla.com>
Date: Fri, 28 Jul 2023 00:01:51 +0300
Subject: [PATCH] Backed out changeset 80431152bbf5 (bug 1821732) for causing
 failures on popover-light-dismiss.html. CLOSED TREE

---
 ...er-light-dismiss-with-anchor.tentative.html.ini |  9 ---
 .../popovers/popover-light-dismiss.html.ini        |  7 +-
 ...opover-light-dismiss-with-anchor.tentative.html | 90 ----------------------
 .../semantics/popovers/popover-light-dismiss.html  | 53 ++++++++-----
 4 files changed, 39 insertions(+), 120 deletions(-)
 delete mode 100644 testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html.ini
 delete mode 100644 testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html
diff --git a/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html.ini b/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html.ini
deleted file mode 100644
index 22bd7bd693c9..000000000000
--- a/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[popover-light-dismiss-with-anchor.tentative.html]
-  [Clicking inside a child popover shouldn't close either popover]
-    expected: FAIL
-
-  [Clicking inside a parent popover should close child popover]
-    expected: FAIL
-
-  [Clicking on anchor element (that isn't an invoking element) shouldn't prevent its popover from being closed]
-    expected: FAIL
diff --git a/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini b/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini
index 881191676c63..ee223538f182 100644
--- a/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini
+++ b/testing/web-platform/meta/html/semantics/popovers/popover-light-dismiss.html.ini
@@ -23,14 +23,17 @@
   [Clicking inside a popover does not close that popover]
     expected: FAIL
 
+  [Clicking inside a child popover shouldn't close either popover]
+    expected: FAIL
+
   [Moving focus back to the anchor element should not dismiss the popover]
     expected: FAIL
 
   [Popovers close on pointerup, not pointerdown]
     expected: FAIL
 
-  [Clicking inside a shadow DOM popover does not close that popover]
+  [Clicking on invoking element, after using it for activation, shouldn't close its popover (nested case, not used for invocation)]
     expected: FAIL
 
-  [Moving focus back to the invoker element should not dismiss the popover]
+  [Dragging from an open popover outside an open popover should leave the popover open]
     expected: FAIL
diff --git a/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html b/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html
deleted file mode 100644
index c4e545c4fb97..000000000000
--- a/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss-with-anchor.tentative.html
+++ /dev/null
@@ -1,90 +0,0 @@
-<!DOCTYPE html>
-<meta charset="utf-8" />
-<title>Popover light dismiss with anchor behavior</title>
-<meta name="timeout" content="long">
-<link rel="author" href="mailto:masonf@chromium.org">
-<link rel=help href="https://open-ui.org/components/popover.research.explainer">
-<script src="/resources/testharness.js"></script>
-<script src="/resources/testharnessreport.js"></script>
-<script src="/resources/testdriver.js"></script>
-<script src="/resources/testdriver-actions.js"></script>
-<script src="/resources/testdriver-vendor.js"></script>
-<script src="resources/popover-utils.js"></script>
-
-<button id=p1anchor  tabindex="0">Popover1 anchor (no action)</button>
-<div popover id=p1 anchor=p1anchor>
-  <span id=inside1>Inside popover 1</span>
-  <button id=b2 popovertarget='p2' popovertargetaction=show>Popover 2</button>
-</div>
-<div popover id=p2 anchor=b2>
-  <span id=inside2>Inside popover 2</span>
-</div>
-<style>
-  #p1 {top: 50px;}
-  #p2 {top: 120px;}
-  [popover] {bottom:auto;}
-  [popover]::backdrop {
-    /* This should *not* affect anything: */
-    pointer-events: auto;
-  }
-</style>
-<script>
-  const popover1 = document.querySelector('#p1');
-  const popover1anchor = document.querySelector('#p1anchor');
-  const popover2 = document.querySelector('#p2');
-  const inside1 = document.querySelector('#inside1');
-  const inside2 = document.querySelector('#inside2');
-
-  let popover1HideCount = 0;
-  popover1.addEventListener('beforetoggle',(e) => {
-    if (e.newState !== "closed")
-      return;
-    ++popover1HideCount;
-    e.preventDefault(); // 'beforetoggle' should not be cancellable.
-  });
-  let popover2HideCount = 0;
-  popover2.addEventListener('beforetoggle',(e) => {
-    if (e.newState !== "closed")
-      return;
-    ++popover2HideCount;
-    e.preventDefault(); // 'beforetoggle' should not be cancellable.
-  });
-
-  promise_test(async () => {
-    popover1.showPopover();
-    popover2.showPopover();
-    await waitForRender();
-    p1HideCount = popover1HideCount;
-    let p2HideCount = popover2HideCount;
-    await clickOn(inside2);
-    assert_true(popover1.matches(':popover-open'),'popover1 should be open');
-    assert_true(popover2.matches(':popover-open'),'popover2 should be open');
-    assert_equals(popover1HideCount,p1HideCount,'popover1');
-    assert_equals(popover2HideCount,p2HideCount,'popover2');
-    popover1.hidePopover();
-    assert_false(popover1.matches(':popover-open'));
-    assert_false(popover2.matches(':popover-open'));
-  },'Clicking inside a child popover shouldn\'t close either popover');
-
-  promise_test(async () => {
-    popover1.showPopover();
-    popover2.showPopover();
-    await waitForRender();
-    p1HideCount = popover1HideCount;
-    p2HideCount = popover2HideCount;
-    await clickOn(inside1);
-    assert_true(popover1.matches(':popover-open'));
-    assert_equals(popover1HideCount,p1HideCount);
-    assert_false(popover2.matches(':popover-open'));
-    assert_equals(popover2HideCount,p2HideCount+1);
-    popover1.hidePopover();
-  },'Clicking inside a parent popover should close child popover');
-
-  promise_test(async () => {
-    popover1.showPopover();
-    assert_true(popover1.matches(':popover-open'));
-    await waitForRender();
-    await clickOn(popover1anchor);
-    assert_false(popover1.matches(':popover-open'),'popover1 should close');
-  },'Clicking on anchor element (that isn\'t an invoking element) shouldn\'t prevent its popover from being closed');
-</script>
diff --git a/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss.html b/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss.html
index 4c31bed1635f..eb148941fbf3 100644
--- a/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss.html
+++ b/testing/web-platform/tests/html/semantics/popovers/popover-light-dismiss.html
@@ -14,14 +14,15 @@
 
 <button id=b1t popovertarget='p1'>Popover 1</button>
 <button id=b1s popovertarget='p1' popovertargetaction=show>Popover 1</button>
+<button id=p1anchor  tabindex="0">Popover1 anchor (no action)</button>
 <span id=outside>Outside all popovers</span>
-<div popover id=p1>
+<div popover id=p1 anchor=p1anchor>
   <span id=inside1>Inside popover 1</span>
   <button id=b2 popovertarget='p2' popovertargetaction=show>Popover 2</button>
   <span id=inside1after>Inside popover 1 after button</span>
-  <div popover id=p2>
-    <span id=inside2>Inside popover 2</span>
-  </div>
+</div>
+<div popover id=p2 anchor=b2>
+  <span id=inside2>Inside popover 2</span>
 </div>
 <button id=after_p1 tabindex="0">Next control after popover1</button>
 <style>
@@ -37,6 +38,7 @@
   const popover1 = document.querySelector('#p1');
   const button1toggle = document.querySelector('#b1t');
   const button1show = document.querySelector('#b1s');
+  const popover1anchor = document.querySelector('#p1anchor');
   const inside1After = document.querySelector('#inside1after');
   const button2 = document.querySelector('#b2');
   const popover2 = document.querySelector('#p2');
@@ -240,6 +242,14 @@
 
   promise_test(async () => {
     popover1.showPopover();
+    assert_true(popover1.matches(':popover-open'));
+    await waitForRender();
+    await clickOn(popover1anchor);
+    assert_false(popover1.matches(':popover-open'),'popover1 should close');
+  },'Clicking on anchor element (that isn\'t an invoking element) shouldn\'t prevent its popover from being closed');
+
+  promise_test(async () => {
+    popover1.showPopover();
     popover2.showPopover(); // Popover1 is an ancestral element for popover2.
     assert_true(popover1.matches(':popover-open'));
     assert_true(popover2.matches(':popover-open'));
@@ -325,8 +335,8 @@
 
 <my-element id="myElement">
   <template shadowrootmode="open">
-    <button id=b7 popovertarget=p7 popovertargetaction=show tabindex="0">Popover7</button>
-    <div popover id=p7 style="top: 100px;">
+    <button id=b7 onclick='showPopover7()' tabindex="0">Popover7</button>
+    <div popover id=p7 anchor=b7 style="top: 100px;">
       <p>Popover content.</p>
       <input id="inside7" type="text" placeholder="some text">
     </div>
@@ -337,6 +347,9 @@
   const button7 = document.querySelector('#myElement').shadowRoot.querySelector('#b7');
   const popover7 = document.querySelector('#myElement').shadowRoot.querySelector('#p7');
   const inside7 = document.querySelector('#myElement').shadowRoot.querySelector('#inside7');
+  function showPopover7() {
+    popover7.showPopover();
+  }
   promise_test(async () => {
     button7.click();
     assert_true(popover7.matches(':popover-open'),'invoking element should open popover');
@@ -354,38 +367,40 @@
   },'Clicking outside a shadow DOM popover should close that popover');
 </script>
 
-<div popover id=p8>
+<div popover id=p8 anchor=p8anchor>
   <button tabindex="0">Button</button>
   <span id=inside8after>Inside popover 8 after button</span>
 </div>
-<button id=p8invoker popovertarget=p8 tabindex="0">Popover8 invoker (no action)</button>
+<button id=p8anchor tabindex="0">Popover8 anchor (no action)</button>
 <script>
   promise_test(async () => {
     const popover8 = document.querySelector('#p8');
     const inside8After = document.querySelector('#inside8after');
-    const popover8Invoker = document.querySelector('#p8invoker');
+    const popover8Anchor = document.querySelector('#p8anchor');
     assert_false(popover8.matches(':popover-open'));
     popover8.showPopover();
     await clickOn(inside8After);
     assert_true(popover8.matches(':popover-open'));
     await sendTab();
-    assert_equals(document.activeElement,popover8Invoker,'Focus should move to the invoker element');
+    assert_equals(document.activeElement,popover8Anchor,'Focus should move to the anchor element');
     assert_true(popover8.matches(':popover-open'),'popover should stay open');
     popover8.hidePopover(); // Cleanup
-  },'Moving focus back to the invoker element should not dismiss the popover');
+  },'Moving focus back to the anchor element should not dismiss the popover');
 </script>
 
 <!-- Convoluted ancestor relationship -->
 <div popover id=convoluted_p1>Popover 1
-  <button popovertarget=convoluted_p2>Open Popover 2</button>
-<div popover id=convoluted_p2>Popover 2
-    <button popovertarget=convoluted_p3>Open Popover 3</button>
-    <button popovertarget=convoluted_p2 popovertargetaction=show>Self-linked invoker</button>
-  </div>
-  <div popover id=convoluted_p3>Popover 3
-    <button popovertarget=convoluted_p4>Open Popover 4</button>
+  <div id=convoluted_anchor>Anchor
+    <button popovertarget=convoluted_p2>Open Popover 2</button>
+    <div popover id=convoluted_p4><p>Popover 4</p></div>
   </div>
-  <div popover id=convoluted_p4><p>Popover 4</p></div>
+</div>
+<div popover id=convoluted_p2 anchor=convoluted_p2>Popover 2 (self-anchor-linked)
+  <button popovertarget=convoluted_p3>Open Popover 3</button>
+  <button popovertarget=convoluted_p2 popovertargetaction=show>Self-linked invoker</button>
+</div>
+<div popover id=convoluted_p3 anchor=convoluted_anchor>Popover 3
+  <button popovertarget=convoluted_p4>Open Popover 4</button>
 </div>
 <button onclick="convoluted_p1.showPopover()" tabindex="0">Open convoluted popover</button>
 <style>
-- 
2.11.4.GIT

