<!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>[281492] 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/281492">281492</a></dd>
<dt>Author</dt> <dd>ntim@apple.com</dd>
<dt>Date</dt> <dd>2021-08-24 05:57:41 -0700 (Tue, 24 Aug 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>Move cancel dialog task to `defaultKeyboardEventHandler`.
https://bugs.webkit.org/show_bug.cgi?id=228845

Reviewed by Antti Koivisto.

LayoutTests/imported/w3c:

Updated test expectations.

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

Source/WebCore:

Test: imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html

Allows preventDefault() on keydown event to prevent cancelation.

Also rename HTMLDialogElement::cancel to HTMLDialogElement::queueCancelTask to reflect better what the function does.

* html/HTMLDialogElement.cpp:
(WebCore::HTMLDialogElement::queueCancelTask):
(WebCore::HTMLDialogElement::cancel): Deleted.
* html/HTMLDialogElement.h:
* page/EventHandler.cpp:
(WebCore::EventHandler::internalKeyEvent):
(WebCore::EventHandler::defaultKeyboardEventHandler):</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsinteractiveelementsthedialogelementdialogkeydownpreventDefaultexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault-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>
<li><a href="#trunkSourceWebCorepageEventHandlercpp">trunk/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -1,5 +1,16 @@
</span><span class="cx"> 2021-08-24  Tim Nguyen  <ntim@apple.com>
</span><span class="cx"> 
</span><ins>+        Move cancel dialog task to `defaultKeyboardEventHandler`.
+        https://bugs.webkit.org/show_bug.cgi?id=228845
+
+        Reviewed by Antti Koivisto.
+
+        Updated test expectations.
+
+        * web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault-expected.txt:
+
+2021-08-24  Tim Nguyen  <ntim@apple.com>
+
</ins><span class="cx">         Implement inert attribute behind feature flag
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=165279
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestshtmlsemanticsinteractiveelementsthedialogelementdialogkeydownpreventDefaultexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault-expected.txt (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault-expected.txt      2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault-expected.txt 2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -1,7 +1,7 @@
</span><span class="cx"> Test cancel event with preventDefault on keydown event for dialog element
</span><span class="cx"> 
</span><ins>+Hello World
</ins><span class="cx"> 
</span><del>-Harness Error (TIMEOUT), message = null
</del><span class="cx"> 
</span><del>-NOTRUN Test cancel event with preventDefault on keydown event for dialog element
</del><ins>+PASS Test cancel event with preventDefault on keydown event for dialog element
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/Source/WebCore/ChangeLog      2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -1,3 +1,24 @@
</span><ins>+2021-08-24  Tim Nguyen  <ntim@apple.com>
+
+        Move cancel dialog task to `defaultKeyboardEventHandler`.
+        https://bugs.webkit.org/show_bug.cgi?id=228845
+
+        Reviewed by Antti Koivisto.
+
+        Test: imported/w3c/web-platform-tests/html/semantics/interactive-elements/the-dialog-element/dialog-keydown-preventDefault.html
+
+        Allows preventDefault() on keydown event to prevent cancelation.
+
+        Also rename HTMLDialogElement::cancel to HTMLDialogElement::queueCancelTask to reflect better what the function does.
+
+        * html/HTMLDialogElement.cpp:
+        (WebCore::HTMLDialogElement::queueCancelTask):
+        (WebCore::HTMLDialogElement::cancel): Deleted.
+        * html/HTMLDialogElement.h:
+        * page/EventHandler.cpp:
+        (WebCore::EventHandler::internalKeyEvent):
+        (WebCore::EventHandler::defaultKeyboardEventHandler):
+
</ins><span class="cx"> 2021-08-24  Philippe Normand  <pnormand@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         REGRESSION(r281305) [GStreamer] fast/mediastream/getDisplayMedia-frame-rate.html timeouts
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.cpp (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.cpp  2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/Source/WebCore/html/HTMLDialogElement.cpp     2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx">     });
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-void HTMLDialogElement::cancel()
</del><ins>+void HTMLDialogElement::queueCancelTask()
</ins><span class="cx"> {
</span><span class="cx">     document().eventLoop().queueTask(TaskSource::UserInteraction, [protectedThis = GCReachableRef { *this }] {
</span><span class="cx">         auto cancelEvent = Event::create(eventNames().cancelEvent, Event::CanBubble::No, Event::IsCancelable::Yes);
</span></span></pre></div>
<a id="trunkSourceWebCorehtmlHTMLDialogElementh"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/html/HTMLDialogElement.h (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/html/HTMLDialogElement.h    2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/Source/WebCore/html/HTMLDialogElement.h       2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -43,10 +43,10 @@
</span><span class="cx">     ExceptionOr<void> showModal();
</span><span class="cx">     void close(const String&);
</span><span class="cx"> 
</span><del>-    void cancel();
-
</del><span class="cx">     bool isModal() const { return m_isModal; };
</span><span class="cx"> 
</span><ins>+    void queueCancelTask();
+
</ins><span class="cx"> private:
</span><span class="cx">     HTMLDialogElement(const QualifiedName&, Document&);
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/page/EventHandler.cpp (281491 => 281492)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/page/EventHandler.cpp       2021-08-24 10:07:43 UTC (rev 281491)
+++ trunk/Source/WebCore/page/EventHandler.cpp  2021-08-24 12:57:41 UTC (rev 281492)
</span><span class="lines">@@ -3520,13 +3520,6 @@
</span><span class="cx">         }
</span><span class="cx">     }
</span><span class="cx"> 
</span><del>-    if (auto* activeModalDialog = m_frame.document()->activeModalDialog()) {
-        if (initialKeyEvent.type() == PlatformEvent::KeyDown && initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE) {
-            activeModalDialog->cancel();
-            return true;
-        }
-    }
-
</del><span class="cx"> #if ENABLE(FULLSCREEN_API)
</span><span class="cx">     if (m_frame.document()->fullscreenManager().isFullscreen()) {
</span><span class="cx">         if (initialKeyEvent.type() == PlatformEvent::KeyDown && initialKeyEvent.windowsVirtualKeyCode() == VK_ESCAPE) {
</span><span class="lines">@@ -3807,7 +3800,10 @@
</span><span class="cx">         m_frame.editor().handleKeyboardEvent(event);
</span><span class="cx">         if (event.defaultHandled())
</span><span class="cx">             return;
</span><del>-        if (event.keyIdentifier() == "U+0009")
</del><ins>+        if (event.key() == "Escape") {
+            if (auto* activeModalDialog = m_frame.document()->activeModalDialog())
+                activeModalDialog->queueCancelTask();
+        } else if (event.keyIdentifier() == "U+0009")
</ins><span class="cx">             defaultTabEventHandler(event);
</span><span class="cx">         else if (event.keyIdentifier() == "U+0008")
</span><span class="cx">             defaultBackspaceEventHandler(event);
</span></span></pre>
</div>
</div>

</body>
</html>