From cf1000628c3bb55f25c2a6338328432161b35e49 Mon Sep 17 00:00:00 2001
From: Mason Freed <masonf@chromium.org>
Date: Mon, 9 Jan 2023 15:43:50 -0800
Subject: [PATCH] Change popover invoking attributes to use Element reflection

Per the conversation at [1], we've decided to make the IDL reflections
of the invoking attributes (popovertoggletarget, popovershowtarget, and
popoverhidetarget) use Element reflection, and be named accordingly.

[1] https://github.com/whatwg/html/pull/8221#discussion_r1007512821

Fixed: 1405856
Bug: 1307772
Change-Id: Iace783795c2db7a19e11fbc4f0c4da33a8765779
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4148056
Auto-Submit: Mason Freed <masonf@chromium.org>
Commit-Queue: Mason Freed <masonf@chromium.org>
Reviewed-by: Joey Arhar <jarhar@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1090582}
---
 .../popover-invoking-attribute.tentative.html    | 16 ++++++++++------
 ...popover-top-layer-combinations.tentative.html |  2 +-
 interfaces/popover.tentative.idl                 |  8 +++-----
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/html/semantics/popovers/popover-invoking-attribute.tentative.html b/html/semantics/popovers/popover-invoking-attribute.tentative.html
index 5ce315ef1d9ea7..b49bb4e4a34ced 100644
--- a/html/semantics/popovers/popover-invoking-attribute.tentative.html
+++ b/html/semantics/popovers/popover-invoking-attribute.tentative.html
@@ -34,6 +34,10 @@
     return el;
   };
 }
+function setInvokingContentAttribute(invoker,attr,idref) {
+  invoker.setAttribute(attr,idref);
+  assert_equals(invoker[attr + "Element"],document.getElementById(idref));
+}
 const supportedButtonTypes = ['button','reset','submit',''].map(type => {
   return   {
     name: `<button type="${type}">`,
@@ -85,13 +89,13 @@
                 assert_not_equals(popover1.id,popover2.id);
                 const invoker = testcase.makeElement(test);
                 if (use_idl) {
-                  invoker.popoverToggleTarget = t===1 ? popover1.id : (t===2 ? popover2.id : null);
-                  invoker.popoverShowTarget = s===1 ? popover1.id : (s===2 ? popover2.id : null);
-                  invoker.popoverHideTarget = h===1 ? popover1.id : (h===2 ? popover2.id : null);
+                  invoker.popoverToggleTargetElement = t===1 ? popover1 : (t===2 ? popover2 : null);
+                  invoker.popoverShowTargetElement = s===1 ? popover1 : (s===2 ? popover2 : null);
+                  invoker.popoverHideTargetElement = h===1 ? popover1 : (h===2 ? popover2 : null);
                 } else {
-                  if (t) invoker.setAttribute('popovertoggletarget',t===1 ? popover1.id : popover2.id);
-                  if (s) invoker.setAttribute('popovershowtarget',s===1 ? popover1.id : popover2.id);
-                  if (h) invoker.setAttribute('popoverhidetarget',h===1 ? popover1.id : popover2.id);
+                  if (t) setInvokingContentAttribute(invoker,'popoverToggleTarget',t===1 ? popover1.id : popover2.id);
+                  if (s) setInvokingContentAttribute(invoker,'popoverShowTarget',s===1 ? popover1.id : popover2.id);
+                  if (h) setInvokingContentAttribute(invoker,'popoverHideTarget',h===1 ? popover1.id : popover2.id);
                 }
                 assert_true(!document.getElementById(popover1.id));
                 assert_true(!document.getElementById(popover2.id));
diff --git a/html/semantics/popovers/popover-top-layer-combinations.tentative.html b/html/semantics/popovers/popover-top-layer-combinations.tentative.html
index 0e04f30481be3f..001bf88a25ef85 100644
--- a/html/semantics/popovers/popover-top-layer-combinations.tentative.html
+++ b/html/semantics/popovers/popover-top-layer-combinations.tentative.html
@@ -119,7 +119,7 @@
       document.body.appendChild(button);
       assert_equals(ex.id,'');
       ex.id = 'popover-id';
-      button.popoverToggleTarget = ex.id;
+      button.popoverToggleTargetElement = ex;
       assert_true(ex.matches(':closed'));
       await clickOn(button);
       ensureIsOpenPopover(ex,'Invoking element should be able to invoke all popovers');
diff --git a/interfaces/popover.tentative.idl b/interfaces/popover.tentative.idl
index 3d7fdcffa82f9d..7e38b1f09ac9a5 100644
--- a/interfaces/popover.tentative.idl
+++ b/interfaces/popover.tentative.idl
@@ -6,11 +6,9 @@ partial interface HTMLElement {
 };
 
 interface mixin PopoverTargetElement {
-  // TODO(crbug.com/1405856): These might change to `Element`, or additional
-  // attributes like `popoverToggleTargetElement` might be added for that.
-  [CEReactions] attribute DOMString? popoverToggleTarget;
-  [CEReactions] attribute DOMString? popoverHideTarget;
-  [CEReactions] attribute DOMString? popoverShowTarget;
+  [CEReactions] attribute Element? popoverToggleTargetElement;
+  [CEReactions] attribute Element? popoverHideTargetElement;
+  [CEReactions] attribute Element? popoverShowTargetElement;
 };
 HTMLInputElement includes PopoverTargetElement;
 HTMLButtonElement includes PopoverTargetElement;