<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[280049] trunk/Source/WebCore</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/280049">280049</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-07-19 15:01:03 -0700 (Mon, 19 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Port <dialog> close event to modern event handling code
https://bugs.webkit.org/show_bug.cgi?id=227915

Reviewed by Chris Dumez.

* html/HTMLDialogElement.cpp:
(WebCore::HTMLDialogElement::close):
(WebCore::dialogCloseEventSender): Deleted.
(WebCore::HTMLDialogElement::~HTMLDialogElement): Deleted.
(WebCore::HTMLDialogElement::dispatchPendingEvent): Deleted.
* html/HTMLDialogElement.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDialogElementcpp">trunk/Source/WebCore/html/HTMLDialogElement.cpp</a></li>
<li><a href="#trunkSourceWebCorehtmlHTMLDialogElementh">trunk/Source/WebCore/html/HTMLDialogElement.h</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (280048 => 280049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-07-19 21:54:15 UTC (rev 280048)
+++ trunk/Source/WebCore/ChangeLog      2021-07-19 22:01:03 UTC (rev 280049)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2021-07-19  Tim Nguyen  <ntim@apple.com>
+
+        Port <dialog> close event to modern event handling code
+        https://bugs.webkit.org/show_bug.cgi?id=227915
+
+        Reviewed by Chris Dumez.
+
+        * html/HTMLDialogElement.cpp:
+        (WebCore::HTMLDialogElement::close):
+        (WebCore::dialogCloseEventSender): Deleted.
+        (WebCore::HTMLDialogElement::~HTMLDialogElement): Deleted.
+        (WebCore::HTMLDialogElement::dispatchPendingEvent): Deleted.
+        * html/HTMLDialogElement.h:
+
</ins><span class="cx"> 2021-07-19  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         HTMLImageElement.decoding should reflect the decoding content attribute, limited to only known values
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.cpp (280048 => 280049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.cpp  2021-07-19 21:54:15 UTC (rev 280048)
+++ trunk/Source/WebCore/html/HTMLDialogElement.cpp     2021-07-19 22:01:03 UTC (rev 280049)
</span><span class="lines">@@ -25,8 +25,8 @@
</span><span class="cx"> 
</span><span class="cx"> #include "config.h"
</span><span class="cx"> #include "HTMLDialogElement.h"
</span><ins>+#include "EventLoop.h"
</ins><span class="cx"> #include "EventNames.h"
</span><del>-#include "EventSender.h"
</del><span class="cx"> 
</span><span class="cx"> #include "HTMLNames.h"
</span><span class="cx"> #include <wtf/IsoMallocInlines.h>
</span><span class="lines">@@ -37,22 +37,11 @@
</span><span class="cx"> 
</span><span class="cx"> using namespace HTMLNames;
</span><span class="cx"> 
</span><del>-static DialogEventSender& dialogCloseEventSender()
-{
-    static NeverDestroyed<DialogEventSender> sharedCloseEventSender(eventNames().closeEvent);
-    return sharedCloseEventSender;
-}
-
</del><span class="cx"> HTMLDialogElement::HTMLDialogElement(const QualifiedName& tagName, Document& document)
</span><span class="cx">     : HTMLElement(tagName, document)
</span><span class="cx"> {
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-HTMLDialogElement::~HTMLDialogElement()
-{
-    dialogCloseEventSender().cancelEvent(*this);
-}
-
</del><span class="cx"> void HTMLDialogElement::show()
</span><span class="cx"> {
</span><span class="cx">     // If the element already has an open attribute, then return.
</span><span class="lines">@@ -101,14 +90,9 @@
</span><span class="cx"> 
</span><span class="cx">     // FIXME: Add step 6 from spec. (webkit.org/b/227537)
</span><span class="cx"> 
</span><del>-    dialogCloseEventSender().cancelEvent(*this);
-    dialogCloseEventSender().dispatchEventSoon(*this);
</del><ins>+    document().eventLoop().queueTask(TaskSource::UserInteraction, [protectedThis = GCReachableRef { *this }] {
+        protectedThis->dispatchEvent(Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));
+    });
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLDialogElement::dispatchPendingEvent(DialogEventSender* eventSender)
-{
-    ASSERT_UNUSED(eventSender, eventSender == &dialogCloseEventSender());
-    dispatchEvent(Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));
</del><span class="cx"> }
</span><del>-
-}
</del></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.h (280048 => 280049)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.h    2021-07-19 21:54:15 UTC (rev 280048)
+++ trunk/Source/WebCore/html/HTMLDialogElement.h       2021-07-19 22:01:03 UTC (rev 280049)
</span><span class="lines">@@ -29,14 +29,10 @@
</span><span class="cx"> 
</span><span class="cx"> namespace WebCore {
</span><span class="cx"> 
</span><del>-template<typename T> class EventSender;
-using DialogEventSender = EventSender<HTMLDialogElement>;
-
</del><span class="cx"> class HTMLDialogElement final : public HTMLElement {
</span><span class="cx">     WTF_MAKE_ISO_ALLOCATED(HTMLDialogElement);
</span><span class="cx"> public:
</span><span class="cx">     template<typename... Args> static Ref<HTMLDialogElement> create(Args&&... args) { return adoptRef(*new HTMLDialogElement(std::forward<Args>(args)...)); }
</span><del>-    ~HTMLDialogElement();
</del><span class="cx"> 
</span><span class="cx">     bool isOpen() const { return hasAttribute(HTMLNames::openAttr); }
</span><span class="cx"> 
</span><span class="lines">@@ -47,8 +43,6 @@
</span><span class="cx">     ExceptionOr<void> showModal();
</span><span class="cx">     void close(const String&);
</span><span class="cx"> 
</span><del>-    void dispatchPendingEvent(DialogEventSender*);
-
</del><span class="cx">     bool isModal() const { return m_isModal; };
</span><span class="cx"> 
</span><span class="cx"> private:
</span></span></pre>
</div>
</div>

</body>
</html>