From 4c081c09f37bec85de8a142814d0238edb02d417 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Mon, 10 Apr 2023 08:20:58 -0700
Subject: [PATCH 1/5] Don't throw when popover/dialog is in requested state

This patch makes the following changes:
- Don't throw exceptions when showPopover or hidePopover is called and
  the popover is already in the requested state.
- Don't throw exceptions when dialog.showModal, dialog.show, or
  dialog.close is called and the dialog is already in the
  requested state.
- Throw exceptions when trying to switch between modal and non-modal
  dialog modes via dialog.showModal or dialog.show.

Fixes https://github.com/whatwg/html/issues/9045
---
 source | 25 ++++++++++++++++++++-----
 1 file changed, 20 insertions(+), 5 deletions(-)

diff --git a/source b/source
index ac51445fdb0..dbfe513e67c 100644
--- a/source
+++ b/source
@@ -60034,8 +60034,11 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   method steps are:</p>
 
   <ol>
+   <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute and the
+   <span>is modal</span> flag of <span>this</span> is true, then return.</p></li>
+
    <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute, then
-   return.</p></li>
+   throw an <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
 
    <li><p>If <span>this</span> is in the <span data-x="popover-showing-state">popover showing
    state</span>, then throw an <span>"<code>InvalidStateError</code>"</span>
@@ -60054,6 +60057,9 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
   data-x="dom-dialog-showModal">showModal()</code></dfn> method steps are:</p>
 
   <ol>
+   <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute and the
+   <span>is modal</span> flag of <span>this</span> is true, then return.</p></li>
+
    <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute, then
    throw an <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
 
@@ -82130,8 +82136,8 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
       <p class="note"><span>Check popover validity</span> is called again because running <span
       data-x="hide-all-popovers-until">hide all popovers until</span> above could have fired the
       <code data-x="event-beforetoggle">beforetoggle</code> event, and an event handler could have
-      disconnected this element or called <code data-x="dom-showPopover">showPopover()</code> on
-      this element.</p>
+      disconnected this element or changes its <code data-x="attr-popover">popover</code>
+      attribute.</p>
      </li>
     </ol>
    </li>
@@ -82554,18 +82560,27 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
     </ol>
    </li>
 
+   <li><p>If <var>element</var> is not <span>connected</span>, then throw a
+   <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
+
    <li>
     <p>If one of the following conditions is true</p>
 
     <ul>
-     <li><p><var>element</var> is not <span>connected</span></p></li>
-
      <li><p><var>expectedToBeShowing</var> is true and <var>element</var>'s <span>popover visibility
      state</span> is not <span data-x="popover-showing-state">showing</span></p></li>
 
      <li><p><var>expectedToBeShowing</var> is false and <var>element</var>'s <span>popover
      visibility state</span> is not <span data-x="popover-hidden-state">hidden</span></p></li>
+    </ul>
+
+    <p>then return false.</p>
+   </li>
 
+   <li>
+    <p>If one of the following conditions is true</p>
+
+    <ul>
      <li><p><var>element</var> is a <code>dialog</code> element and has an <code
      data-x="attr-details-open">open</code> attribute</p></li>
 

From bbdd1f32a6f9fef1cbb5fe9227f51b6c6c671d0f Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 12 Apr 2023 14:48:09 -0700
Subject: [PATCH 2/5] fix typo

---
 source | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source b/source
index dbfe513e67c..370480a0996 100644
--- a/source
+++ b/source
@@ -82136,7 +82136,7 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
       <p class="note"><span>Check popover validity</span> is called again because running <span
       data-x="hide-all-popovers-until">hide all popovers until</span> above could have fired the
       <code data-x="event-beforetoggle">beforetoggle</code> event, and an event handler could have
-      disconnected this element or changes its <code data-x="attr-popover">popover</code>
+      disconnected this element or changed its <code data-x="attr-popover">popover</code>
       attribute.</p>
      </li>
     </ol>

From 23df73537ccf5d8a14d497a9a0683c81af65f877 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 12 Apr 2023 14:51:56 -0700
Subject: [PATCH 3/5] fix show() exception

---
 source | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/source b/source
index 5b978514b74..612ba11cccf 100644
--- a/source
+++ b/source
@@ -60039,7 +60039,7 @@ interface <dfn interface>HTMLDialogElement</dfn> : <span>HTMLElement</span> {
 
   <ol>
    <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute and the
-   <span>is modal</span> flag of <span>this</span> is true, then return.</p></li>
+   <span>is modal</span> flag of <span>this</span> is false, then return.</p></li>
 
    <li><p>If <span>this</span> has an <code data-x="attr-dialog-open">open</code> attribute, then
    throw an <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>

From 0800430c9adb639f44a1488fd70fa646243dfd28 Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Wed, 12 Apr 2023 14:54:57 -0700
Subject: [PATCH 4/5] fix disconnected exception

---
 source | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/source b/source
index 612ba11cccf..e5f27164448 100644
--- a/source
+++ b/source
@@ -82556,8 +82556,16 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
     </ol>
    </li>
 
-   <li><p>If <var>element</var> is not <span>connected</span>, then throw a
-   <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
+   <li>
+    <p>If <var>element</var> is not <span>connected</span>, then:</p>
+
+    <ol>
+     <li><p>If <var>throwExceptions</var> is true, then throw a
+     <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
+
+     <li><p>Return false.</p></li>
+    </ol>
+   </li>
 
    <li>
     <p>If one of the following conditions is true</p>

From ecdbdfa822b1cc3f65bcd472b737af1e0552f75e Mon Sep 17 00:00:00 2001
From: Joey Arhar <jarhar@chromium.org>
Date: Tue, 18 Apr 2023 16:03:48 -0700
Subject: [PATCH 5/5] move connected check after requested state check

---
 source | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/source b/source
index e5f27164448..4a83159511d 100644
--- a/source
+++ b/source
@@ -82556,17 +82556,6 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
     </ol>
    </li>
 
-   <li>
-    <p>If <var>element</var> is not <span>connected</span>, then:</p>
-
-    <ol>
-     <li><p>If <var>throwExceptions</var> is true, then throw a
-     <span>"<code>InvalidStateError</code>"</span> <code>DOMException</code>.</p></li>
-
-     <li><p>Return false.</p></li>
-    </ol>
-   </li>
-
    <li>
     <p>If one of the following conditions is true</p>
 
@@ -82585,6 +82574,8 @@ dictionary <dfn dictionary>DragEventInit</dfn> : <span>MouseEventInit</span> {
     <p>If one of the following conditions is true</p>
 
     <ul>
+     <li><p><var>element</var> is not <span>connected</span></p></li>
+
      <li><p><var>element</var> is a <code>dialog</code> element and has an <code
      data-x="attr-details-open">open</code> attribute</p></li>