<!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>[279950] trunk</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/279950">279950</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-07-15 09:16:40 -0700 (Thu, 15 Jul 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre><dialog> element: do not perform close() method steps when removing open attribute.
https://bugs.webkit.org/show_bug.cgi?id=227872

Reviewed by Chris Dumez.

Test: web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html

The close function now follows the steps at: https://html.spec.whatwg.org/multipage/interactive-elements.html#close-the-dialog

LayoutTests/imported/w3c:

* web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt:

Source/WebCore:

* html/HTMLDialogElement.cpp:
(WebCore::HTMLDialogElement::show):
(WebCore::HTMLDialogElement::showModal):
(WebCore::HTMLDialogElement::close):
(WebCore::HTMLDialogElement::dispatchPendingEvent):
(WebCore::HTMLDialogElement::isOpen const): Deleted.
(WebCore::HTMLDialogElement::returnValue): Deleted.
(WebCore::HTMLDialogElement::setReturnValue): Deleted.
(WebCore::HTMLDialogElement::parseAttribute): Deleted.
(WebCore::HTMLDialogElement::isModal const): Deleted.
* html/HTMLDialogElement.h:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsinteractiveelementsthedialogelementdialogopenexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt</a></li>
<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="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (279949 => 279950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-07-15 16:15:49 UTC (rev 279949)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-07-15 16:16:40 UTC (rev 279950)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2021-07-15  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><ins>+        <dialog> element: do not perform close() method steps when removing open attribute.
+        https://bugs.webkit.org/show_bug.cgi?id=227872
+
+        Reviewed by Chris Dumez.
+
+        Test: web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html
+
+        The close function now follows the steps at: https://html.spec.whatwg.org/multipage/interactive-elements.html#close-the-dialog
+
+        * web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt:
+
+2021-07-15  Tim Nguyen  <ntim@apple.com>
+
</ins><span class="cx">         Re-import html/semantics/interactive-elements/the-dialog-element WPT
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=227986
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsinteractiveelementsthedialogelementdialogopenexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt (279949 => 279950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt        2021-07-15 16:15:49 UTC (rev 279949)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open-expected.txt   2021-07-15 16:16:40 UTC (rev 279950)
</span><span class="lines">@@ -4,5 +4,5 @@
</span><span class="cx"> 
</span><span class="cx"> PASS On getting, the IDL open attribute must return true if the content open attribute is set, and false if it is absent.
</span><span class="cx"> PASS On setting, the content open attribute must be removed if the IDL open attribute is set to false, and must be present if the IDL open attribute is set to true.
</span><del>-FAIL On setting it to false, the close event should not be fired assert_unreached: close event should not be fired when just setting the open attribute Reached unreachable code
</del><ins>+PASS On setting it to false, the close event should not be fired
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (279949 => 279950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-07-15 16:15:49 UTC (rev 279949)
+++ trunk/Source/WebCore/ChangeLog      2021-07-15 16:16:40 UTC (rev 279950)
</span><span class="lines">@@ -1,3 +1,26 @@
</span><ins>+2021-07-15  Tim Nguyen  <ntim@apple.com>
+
+        <dialog> element: do not perform close() method steps when removing open attribute.
+        https://bugs.webkit.org/show_bug.cgi?id=227872
+
+        Reviewed by Chris Dumez.
+
+        Test: web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-open.html
+
+        The close function now follows the steps at: https://html.spec.whatwg.org/multipage/interactive-elements.html#close-the-dialog
+
+        * html/HTMLDialogElement.cpp:
+        (WebCore::HTMLDialogElement::show):
+        (WebCore::HTMLDialogElement::showModal):
+        (WebCore::HTMLDialogElement::close):
+        (WebCore::HTMLDialogElement::dispatchPendingEvent):
+        (WebCore::HTMLDialogElement::isOpen const): Deleted.
+        (WebCore::HTMLDialogElement::returnValue): Deleted.
+        (WebCore::HTMLDialogElement::setReturnValue): Deleted.
+        (WebCore::HTMLDialogElement::parseAttribute): Deleted.
+        (WebCore::HTMLDialogElement::isModal const): Deleted.
+        * html/HTMLDialogElement.h:
+
</ins><span class="cx"> 2021-07-15  Jer Noble  <jer.noble@apple.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION (r279119?): [iOS] ASSERTION FAILED: !m_impl || !m_shouldEnableAssertions || m_impl->wasConstructedOnMainThread() == isMainThread() seen with 3 WebKitLegacy media API tests
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.cpp (279949 => 279950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.cpp  2021-07-15 16:15:49 UTC (rev 279949)
+++ trunk/Source/WebCore/html/HTMLDialogElement.cpp     2021-07-15 16:16:40 UTC (rev 279950)
</span><span class="lines">@@ -53,27 +53,12 @@
</span><span class="cx">     dialogCloseEventSender().cancelEvent(*this);
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool HTMLDialogElement::isOpen() const
-{
-    return m_isOpen;
-}
-
-const String& HTMLDialogElement::returnValue()
-{
-    return m_returnValue;
-}
-
-void HTMLDialogElement::setReturnValue(String&& returnValue)
-{
-    m_returnValue = WTFMove(returnValue);
-}
-
</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="cx">     if (isOpen())
</span><span class="cx">         return;
</span><del>-    
</del><ins>+
</ins><span class="cx">     setBooleanAttribute(openAttr, true);
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="lines">@@ -89,54 +74,41 @@
</span><span class="cx"> 
</span><span class="cx">     setBooleanAttribute(openAttr, true);
</span><span class="cx"> 
</span><del>-    document().addToTopLayer(*this);
</del><span class="cx">     m_isModal = true;
</span><span class="cx"> 
</span><ins>+    // FIXME: Only add dialog to top layer if it's not already in it. (webkit.org/b/227907)
+    document().addToTopLayer(*this);
+
+    // FIXME: Add steps 8 & 9 from spec. (webkit.org/b/227537)
+
</ins><span class="cx">     return { };
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLDialogElement::close(const String& returnValue)
</del><ins>+void HTMLDialogElement::close(const String& result)
</ins><span class="cx"> {
</span><span class="cx">     if (!isOpen())
</span><span class="cx">         return;
</span><del>-    
</del><ins>+
</ins><span class="cx">     setBooleanAttribute(openAttr, false);
</span><span class="cx"> 
</span><del>-    if (!returnValue.isNull())
-        m_returnValue = returnValue;
-}
</del><ins>+    m_isModal = false;
</ins><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><ins>+    if (!result.isNull())
+        m_returnValue = result;
</ins><span class="cx"> 
</span><del>-void HTMLDialogElement::parseAttribute(const QualifiedName& name, const AtomString& value)
-{
-    if (name == openAttr) {
-        bool oldValue = m_isOpen;
-        m_isOpen = !value.isNull();
</del><ins>+    // FIXME: Only remove dialog from top layer if it's inside it. (webkit.org/b/227907)
+    document().removeFromTopLayer(*this);
</ins><span class="cx"> 
</span><del>-        // Emit close event
-        if (oldValue != m_isOpen && !m_isOpen) {
-            if (m_isModal) {
-                document().removeFromTopLayer(*this);
-                m_isModal = false;
-            }
</del><ins>+    // FIXME: Add step 6 from spec. (webkit.org/b/227537)
</ins><span class="cx"> 
</span><del>-            dialogCloseEventSender().cancelEvent(*this);
-            dialogCloseEventSender().dispatchEventSoon(*this);
-        }
-        return;
-    }
-    
-    HTMLElement::parseAttribute(name, value);
</del><ins>+    dialogCloseEventSender().cancelEvent(*this);
+    dialogCloseEventSender().dispatchEventSoon(*this);
</ins><span class="cx"> }
</span><span class="cx"> 
</span><del>-bool HTMLDialogElement::isModal() const
</del><ins>+void HTMLDialogElement::dispatchPendingEvent(DialogEventSender* eventSender)
</ins><span class="cx"> {
</span><del>-    return m_isModal;
</del><ins>+    ASSERT_UNUSED(eventSender, eventSender == &dialogCloseEventSender());
+    dispatchEvent(Event::create(eventNames().closeEvent, Event::CanBubble::No, Event::IsCancelable::No));
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.h (279949 => 279950)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.h    2021-07-15 16:15:49 UTC (rev 279949)
+++ trunk/Source/WebCore/html/HTMLDialogElement.h       2021-07-15 16:16:40 UTC (rev 279950)
</span><span class="lines">@@ -37,12 +37,12 @@
</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><span class="cx">     ~HTMLDialogElement();
</span><del>-    
-    bool isOpen() const;
</del><span class="cx"> 
</span><del>-    const String& returnValue();
-    void setReturnValue(String&&);
</del><ins>+    bool isOpen() const { return hasAttribute(HTMLNames::openAttr); }
</ins><span class="cx"> 
</span><ins>+    const String& returnValue() const { return m_returnValue; }
+    void setReturnValue(String&& value) { m_returnValue = WTFMove(value); }
+
</ins><span class="cx">     void show();
</span><span class="cx">     ExceptionOr<void> showModal();
</span><span class="cx">     void close(const String&);
</span><span class="lines">@@ -49,16 +49,13 @@
</span><span class="cx"> 
</span><span class="cx">     void dispatchPendingEvent(DialogEventSender*);
</span><span class="cx"> 
</span><del>-    bool isModal() const;
</del><ins>+    bool isModal() const { return m_isModal; };
</ins><span class="cx"> 
</span><span class="cx"> private:
</span><span class="cx">     HTMLDialogElement(const QualifiedName&, Document&);
</span><span class="cx"> 
</span><del>-    void parseAttribute(const QualifiedName&, const AtomString&) final;
-
</del><span class="cx">     String m_returnValue;
</span><span class="cx">     bool m_isModal { false };
</span><del>-    bool m_isOpen { false };
</del><span class="cx"> };
</span><span class="cx"> 
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>

</body>
</html>