<!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>[265896] branches/safari-610.1.25.0-branch</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/265896">265896</a></dd>
<dt>Author</dt> <dd>repstein@apple.com</dd>
<dt>Date</dt> <dd>2020-08-19 14:29:56 -0700 (Wed, 19 Aug 2020)</dd>
</dl>

<h3>Log Message</h3>
<pre>Cherry-pick <a href="http://trac.webkit.org/projects/webkit/changeset/265881">r265881</a>. rdar://problem/67423220

    REGRESSION(<a href="http://trac.webkit.org/projects/webkit/changeset/265092">r265092</a>): delegatesFocus causes WebKit to crash
    https://bugs.webkit.org/show_bug.cgi?id=215622

    Reviewed by Youenn Fablet.

    Source/WebCore:

    The bug was caused by a missing nullptr check. Added it.

    Test: fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html

    * page/EventHandler.cpp:
    (WebCore::EventHandler::dispatchMouseEvent): Added a nullptr check.

    LayoutTests:

    Added a regression test.

    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt: Added.
    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html: Added.

    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265881 268f45cc-cd09-0410-ab3c-d52691b4dbfc</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari6101250branchLayoutTestsChangeLog">branches/safari-610.1.25.0-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari6101250branchSourceWebCoreChangeLog">branches/safari-610.1.25.0-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari6101250branchSourceWebCorepageEventHandlercpp">branches/safari-610.1.25.0-branch/Source/WebCore/page/EventHandler.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#branchessafari6101250branchLayoutTestsfastshadowdomdelegatesfocusunsuccessfullybyactivationexpectedtxt">branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt</a></li>
<li><a href="#branchessafari6101250branchLayoutTestsfastshadowdomdelegatesfocusunsuccessfullybyactivationhtml">branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari6101250branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.0-branch/LayoutTests/ChangeLog (265895 => 265896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.0-branch/LayoutTests/ChangeLog  2020-08-19 21:26:30 UTC (rev 265895)
+++ branches/safari-610.1.25.0-branch/LayoutTests/ChangeLog     2020-08-19 21:29:56 UTC (rev 265896)
</span><span class="lines">@@ -1,3 +1,43 @@
</span><ins>+2020-08-19  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r265881. rdar://problem/67423220
+
+    REGRESSION(r265092): delegatesFocus causes WebKit to crash
+    https://bugs.webkit.org/show_bug.cgi?id=215622
+    
+    Reviewed by Youenn Fablet.
+    
+    Source/WebCore:
+    
+    The bug was caused by a missing nullptr check. Added it.
+    
+    Test: fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html
+    
+    * page/EventHandler.cpp:
+    (WebCore::EventHandler::dispatchMouseEvent): Added a nullptr check.
+    
+    LayoutTests:
+    
+    Added a regression test.
+    
+    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt: Added.
+    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+            REGRESSION(r265092): delegatesFocus causes WebKit to crash
+            https://bugs.webkit.org/show_bug.cgi?id=215622
+
+            Reviewed by Youenn Fablet.
+
+            Added a regression test.
+
+            * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt: Added.
+            * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html: Added.
+
</ins><span class="cx"> 2020-07-31  Alex Christensen  <achristensen@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Use more inclusive terminology in Tools
</span></span></pre></div>
<a id="branchessafari6101250branchLayoutTestsfastshadowdomdelegatesfocusunsuccessfullybyactivationexpectedtxt"></a>
<div class="addfile"><h4>Added: branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt (0 => 265896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt                          (rev 0)
+++ branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt     2020-08-19 21:29:56 UTC (rev 265896)
</span><span class="lines">@@ -0,0 +1,3 @@
</span><ins>+This tests delegating focus in a shadow tree without a focusable element. WebKit should not crash.
+
+PASS - WebKit did not crash
</ins></span></pre></div>
<a id="branchessafari6101250branchLayoutTestsfastshadowdomdelegatesfocusunsuccessfullybyactivationhtml"></a>
<div class="addfile"><h4>Added: branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html (0 => 265896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html                          (rev 0)
+++ branches/safari-610.1.25.0-branch/LayoutTests/fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html     2020-08-19 21:29:56 UTC (rev 265896)
</span><span class="lines">@@ -0,0 +1,36 @@
</span><ins>+<!DOCTYPE html>
+<html>
+<head>
+<meta name="viewport" content="width=device-width, initial-scale=1, user-scalable=no">
+</head>
+<body>
+<p>This tests delegating focus in a shadow tree without a focusable element. WebKit should not crash.</p>
+<script src="../../resources/ui-helper.js"></script>
+<script>
+
+const host = document.createElement('div');
+document.body.appendChild(host);
+
+const shadowRoot = host.attachShadow({mode: 'closed', delegatesFocus: true});
+shadowRoot.innerHTML = `hello`;
+host.addEventListener('click', complete);
+
+async function runTest() {
+    const hostRect = host.getBoundingClientRect();
+    await UIHelper.activateAt(hostRect.x + 5, hostRect.y + 5);
+    await UIHelper.ensurePresentationUpdate();
+    await new Promise(requestAnimationFrame);
+}
+
+function complete() {
+    host.outerHTML = 'PASS - WebKit did not crash';
+}
+
+if (window.testRunner) {
+    testRunner.dumpAsText();
+    UIHelper.wait(runTest());
+}
+
+</script>
+</body>
+</html>
</ins></span></pre></div>
<a id="branchessafari6101250branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.0-branch/Source/WebCore/ChangeLog (265895 => 265896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.0-branch/Source/WebCore/ChangeLog       2020-08-19 21:26:30 UTC (rev 265895)
+++ branches/safari-610.1.25.0-branch/Source/WebCore/ChangeLog  2020-08-19 21:29:56 UTC (rev 265896)
</span><span class="lines">@@ -1,3 +1,45 @@
</span><ins>+2020-08-19  Russell Epstein  <repstein@apple.com>
+
+        Cherry-pick r265881. rdar://problem/67423220
+
+    REGRESSION(r265092): delegatesFocus causes WebKit to crash
+    https://bugs.webkit.org/show_bug.cgi?id=215622
+    
+    Reviewed by Youenn Fablet.
+    
+    Source/WebCore:
+    
+    The bug was caused by a missing nullptr check. Added it.
+    
+    Test: fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html
+    
+    * page/EventHandler.cpp:
+    (WebCore::EventHandler::dispatchMouseEvent): Added a nullptr check.
+    
+    LayoutTests:
+    
+    Added a regression test.
+    
+    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation-expected.txt: Added.
+    * fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html: Added.
+    
+    
+    git-svn-id: https://svn.webkit.org/repository/webkit/trunk@265881 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2020-08-18  Ryosuke Niwa  <rniwa@webkit.org>
+
+            REGRESSION(r265092): delegatesFocus causes WebKit to crash
+            https://bugs.webkit.org/show_bug.cgi?id=215622
+
+            Reviewed by Youenn Fablet.
+
+            The bug was caused by a missing nullptr check. Added it.
+
+            Test: fast/shadow-dom/delegates-focus-unsuccessfully-by-activation.html
+
+            * page/EventHandler.cpp:
+            (WebCore::EventHandler::dispatchMouseEvent): Added a nullptr check.
+
</ins><span class="cx"> 2020-08-06  Alan Coon  <alancoon@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cherry-pick r265318. rdar://problem/66630841
</span></span></pre></div>
<a id="branchessafari6101250branchSourceWebCorepageEventHandlercpp"></a>
<div class="modfile"><h4>Modified: branches/safari-610.1.25.0-branch/Source/WebCore/page/EventHandler.cpp (265895 => 265896)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-610.1.25.0-branch/Source/WebCore/page/EventHandler.cpp   2020-08-19 21:26:30 UTC (rev 265895)
+++ branches/safari-610.1.25.0-branch/Source/WebCore/page/EventHandler.cpp      2020-08-19 21:29:56 UTC (rev 265896)
</span><span class="lines">@@ -2761,7 +2761,7 @@
</span><span class="cx">     if (page && !page->focusController().setFocusedElement(element.get(), m_frame))
</span><span class="cx">         return false;
</span><span class="cx"> 
</span><del>-    if (m_mouseDownDelegatedFocus)
</del><ins>+    if (element && m_mouseDownDelegatedFocus)
</ins><span class="cx">         element->revealFocusedElement(SelectionRestorationMode::SetDefault);
</span><span class="cx"> 
</span><span class="cx">     return true;
</span></span></pre>
</div>
</div>

</body>
</html>