Implement ToggleEvent.source for dialog requestclose

I recently added this to the spec PR after incorporating spec changes
for the addition of dialog.requestClose:
whatwg/html#11186

Bug: 408018828
Change-Id: Ia6a3a2560349760219a863dba814c5addfa60165
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6598554
Reviewed-by: Mason Freed <masonf@chromium.org>
Commit-Queue: Joey Arhar <jarhar@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1468857}

Author: josepharhar

third_party/blink/renderer/core/html/html_dialog_element.cc

@@ -220,14 +220,16 @@ void HTMLDialogElement::close(const String& return_value,
   }
 }
 
-void HTMLDialogElement::requestClose(const String& return_value,
-                                     ExceptionState& exception_state) {
+void HTMLDialogElement::RequestCloseInternal(const String& return_value,
+                                             Element* invoker,
+                                             ExceptionState& exception_state) {
   if (!IsOpenAndActive()) {
     return;
   }
   CHECK(close_watcher_);
   close_watcher_->setEnabled(true);
   request_close_return_value_ = return_value;
+  request_close_source_element_ = invoker;
   close_watcher_->RequestClose(CloseWatcher::AllowCancel::kAlways);
   SetCloseWatcherEnabledState();
 }
@@ -381,7 +383,7 @@ bool HTMLDialogElement::HandleCommandInternal(HTMLElement& invoker,
   } else if (command == CommandEventType::kRequestClose) {
     CHECK(RuntimeEnabledFeatures::HTMLCommandRequestCloseEnabled());
     if (open) {
-      requestClose(return_value, ASSERT_NO_EXCEPTION);
+      RequestCloseInternal(return_value, &invoker, ASSERT_NO_EXCEPTION);
       return true;
     } else {
       AddConsoleMessage(
@@ -635,7 +637,8 @@ void HTMLDialogElement::CloseWatcherFiredCancel(Event* close_watcher_event) {
 void HTMLDialogElement::CloseWatcherFiredClose() {
   // https://wicg.github.io/close-watcher/#patch-dialog closeAction
 
-  close(request_close_return_value_);
+  close(request_close_return_value_, request_close_source_element_);
+  request_close_source_element_ = nullptr;
 }
 
 // https://html.spec.whatwg.org#dialog-focusing-steps
@@ -724,6 +727,7 @@ void HTMLDialogElement::DispatchPendingToggleEvent() {
 }
 
 void HTMLDialogElement::Trace(Visitor* visitor) const {
+  visitor->Trace(request_close_source_element_);
   visitor->Trace(previously_focused_element_);
   visitor->Trace(close_watcher_);
   visitor->Trace(pending_toggle_event_);

third_party/blink/renderer/core/html/html_dialog_element.h

@@ -59,9 +59,13 @@ class CORE_EXPORT HTMLDialogElement final : public HTMLElement {
              Element* invoker = nullptr,
              bool open_attribute_being_removed = false);
   void requestClose(ExceptionState& exception_state) {
-    requestClose(String(), exception_state);
+    RequestCloseInternal(/*return_value=*/String(), /*invoker=*/nullptr,
+                         exception_state);
+  }
+  void requestClose(const String& return_value,
+                    ExceptionState& exception_state) {
+    RequestCloseInternal(return_value, /*invoker=*/nullptr, exception_state);
   }
-  void requestClose(const String& return_value, ExceptionState&);
   void show(ExceptionState&);
   void showModal(ExceptionState&, Element* invoker = nullptr);
   InsertionNotificationRequest InsertedInto(ContainerNode&) override;
@@ -127,12 +131,17 @@ class CORE_EXPORT HTMLDialogElement final : public HTMLElement {
                             bool asModal = false);
   void DispatchPendingToggleEvent();
 
+  void RequestCloseInternal(const String& return_value,
+                            Element* invoker,
+                            ExceptionState&);
+
   bool is_modal_;
   // is_closing_ is set to true at the beginning of close() and is reset to
   // false after the call to close() finishes.
   bool is_closing_ = false;
   String return_value_;
   String request_close_return_value_;
+  WeakMember<Element> request_close_source_element_;
   WeakMember<Element> previously_focused_element_;
 
   Member<CloseWatcher> close_watcher_;

third_party/blink/web_tests/external/wpt/html/semantics/interactive-elements/the-dialog-element/dialog-toggle-source.tentative.html

@@ -9,14 +9,18 @@
 <script src="../../popovers/resources/toggle-event-source-test.js"></script>
 
 <button id=showmodalbutton commandfor=dialog command=show-modal>show modal</button>
-<dialog id=dialog>
+<button id=lightdismiss>light dismiss</button>
+<dialog id=dialog closedby=any>
   dialog
   <button id=closebutton commandfor=dialog command=close>close</button>
+  <button id=requestclosebutton commandfor=dialog command=request-close>request close</button>
 </dialog>
 
 <script>
 const showmodalbutton = document.getElementById('showmodalbutton');
 const dialog = document.getElementById('dialog');
+const requestclosebutton = document.getElementById('requestclosebutton');
+const lightdismiss = document.getElementById('lightdismiss');
 
 createToggleEventSourceTest({
   description: 'ToggleEvent.source on <dialog> elements: dialog.showModal().',
@@ -53,4 +57,34 @@
   openSource: showmodalbutton,
   closeSource: null
 });
+
+createToggleEventSourceTest({
+  description: 'ToggleEvent.source on <dialog> elements: open with showModal, close with request-close button.',
+  target: dialog,
+  openFunc: async () => dialog.showModal(),
+  closeFunc: async () => requestclosebutton.click(),
+  openSource: null,
+  closeSource: requestclosebutton
+});
+
+createToggleEventSourceTest({
+  description: 'ToggleEvent.source on <dialog> elements: open with button, close with light dismiss.',
+  target: dialog,
+  openFunc: async () => {
+    await test_driver.click(showmodalbutton);
+  },
+  closeFunc: async () => {
+    dialog.addEventListener('cancel', event => event.preventDefault(), {once: true});
+    requestclosebutton.click();
+    assert_true(dialog.matches(':open'),
+      'cancel preventDefault should have prevented dialog from closing.');
+    await (new test_driver.Actions()
+      .pointerMove(0, 0, {origin: lightdismiss})
+      .pointerDown()
+      .pointerUp())
+      .send();
+  },
+  openSource: showmodalbutton,
+  closeSource: null
+});
 </script>