<!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>[284612] 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/284612">284612</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2021-10-21 09:49:44 -0700 (Thu, 21 Oct 2021)</dd>
</dl>

<h3>Log Message</h3>
<pre>AX: Remove redundant insert of autofill button child in AccessibilityRenderObject::addTextFieldChildren
https://bugs.webkit.org/show_bug.cgi?id=232033

Patch by Tyler Wilcock <tyler_w@apple.com> on 2021-10-21
Reviewed by Chris Fleizach.

Source/WebCore:

Autofill buttons are represented in the DOM, so there's no reason
to also insert it in AccessibilityRenderObject::addTextFieldChildren.
This results in duplicate objects for this button in the AX tree.

* accessibility/AccessibilityRenderObject.cpp:
(WebCore::AccessibilityRenderObject::addTextFieldChildren):
Remove redundant insertion of autofill button element into the
accessibility tree.

LayoutTests:

* accessibility/auto-fill-crash-expected.txt:
* accessibility/auto-fill-crash.html:
* platform/glib/accessibility/auto-fill-crash-expected.txt:
Expect one less child because we no longer insert a redundant button
into the accessibility tree. Also add an expectation confirming the
autofill button is actually a part of the accessibility tree.
* platform/win/accessibility/auto-fill-crash-expected.txt: Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsaccessibilityautofillcrashexpectedtxt">trunk/LayoutTests/accessibility/auto-fill-crash-expected.txt</a></li>
<li><a href="#trunkLayoutTestsaccessibilityautofillcrashhtml">trunk/LayoutTests/accessibility/auto-fill-crash.html</a></li>
<li><a href="#trunkLayoutTestsplatformglibaccessibilityautofillcrashexpectedtxt">trunk/LayoutTests/platform/glib/accessibility/auto-fill-crash-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp">trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsplatformwinaccessibilityautofillcrashexpectedtxt">trunk/LayoutTests/platform/win/accessibility/auto-fill-crash-expected.txt</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/LayoutTests/ChangeLog 2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2021-10-21  Tyler Wilcock  <tyler_w@apple.com>
+
+        AX: Remove redundant insert of autofill button child in AccessibilityRenderObject::addTextFieldChildren
+        https://bugs.webkit.org/show_bug.cgi?id=232033
+
+        Reviewed by Chris Fleizach.
+
+        * accessibility/auto-fill-crash-expected.txt:
+        * accessibility/auto-fill-crash.html:
+        * platform/glib/accessibility/auto-fill-crash-expected.txt:
+        Expect one less child because we no longer insert a redundant button
+        into the accessibility tree. Also add an expectation confirming the
+        autofill button is actually a part of the accessibility tree.
+        * platform/win/accessibility/auto-fill-crash-expected.txt: Added.
+
</ins><span class="cx"> 2021-10-21  Chris Dumez  <cdumez@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, drop test from TestExpectations that no longer exists.
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityautofillcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/auto-fill-crash-expected.txt (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/auto-fill-crash-expected.txt     2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/LayoutTests/accessibility/auto-fill-crash-expected.txt        2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -4,8 +4,9 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS accessibilityController.accessibleElementById('textfield').childrenCount is 3
-PASS accessibilityController.accessibleElementById('textfield').childrenCount is 1
</del><ins>+PASS textFieldAxObject.childrenCount is 2
+PASS textFieldAxObject.childAtIndex(childrenCountExpected - 1).description is 'AXDescription: contact info AutoFill'
+PASS textFieldAxObject.childrenCount is 1
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsaccessibilityautofillcrashhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/accessibility/auto-fill-crash.html (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/accessibility/auto-fill-crash.html     2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/LayoutTests/accessibility/auto-fill-crash.html        2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -17,14 +17,24 @@
</span><span class="cx"> 
</span><span class="cx">     if (window.accessibilityController) {
</span><span class="cx">         var axTextField = accessibilityController.accessibleElementById("textfield");
</span><del>-        var childrenCountExpected = accessibilityController.platformName == "atk" ? "2" : "3";
</del><ins>+        var childrenCountExpected = accessibilityController.platformName == "atk" ? "1" : "2";
</ins><span class="cx">         window.internals.setShowAutoFillButton(document.getElementById("textfield"), "Contacts");
</span><del>-        shouldBe("accessibilityController.accessibleElementById('textfield').childrenCount", childrenCountExpected);
</del><ins>+        var textFieldAxObject = accessibilityController.accessibleElementById('textfield');
+        shouldBe("textFieldAxObject.childrenCount", childrenCountExpected);
+        // Verify the autofill button is represented in the accessibility tree.
+        shouldBe("textFieldAxObject.childAtIndex(childrenCountExpected - 1).description", "'AXDescription: contact info AutoFill'");
</ins><span class="cx"> 
</span><ins>+        var platform = accessibilityController.platformName;
+        // Windows expects 2 children.
+        childrenCountExpected = "2";
+        if (platform == "mac" || platform == "ios")
+            childrenCountExpected = "1"
+        else if (platform == "atk")
+            childrenCountExpected = "0"
+
</ins><span class="cx">         // Don't crash!
</span><del>-        childrenCountExpected = accessibilityController.platformName == "atk" ? "0" : "1";
</del><span class="cx">         window.internals.setShowAutoFillButton(document.getElementById("textfield"), "None");
</span><del>-        shouldBe("accessibilityController.accessibleElementById('textfield').childrenCount", childrenCountExpected);
</del><ins>+        shouldBe("textFieldAxObject.childrenCount", childrenCountExpected);
</ins><span class="cx">     }
</span><span class="cx"> 
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="trunkLayoutTestsplatformglibaccessibilityautofillcrashexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/glib/accessibility/auto-fill-crash-expected.txt (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/glib/accessibility/auto-fill-crash-expected.txt       2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/LayoutTests/platform/glib/accessibility/auto-fill-crash-expected.txt  2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -4,8 +4,9 @@
</span><span class="cx"> On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-PASS accessibilityController.accessibleElementById('textfield').childrenCount is 2
-PASS accessibilityController.accessibleElementById('textfield').childrenCount is 0
</del><ins>+PASS textFieldAxObject.childrenCount is 1
+PASS textFieldAxObject.childAtIndex(childrenCountExpected - 1).description is 'AXDescription: contact info AutoFill'
+PASS textFieldAxObject.childrenCount is 0
</ins><span class="cx"> PASS successfullyParsed is true
</span><span class="cx"> 
</span><span class="cx"> TEST COMPLETE
</span></span></pre></div>
<a id="trunkLayoutTestsplatformwinaccessibilityautofillcrashexpectedtxtfromrev284611trunkLayoutTestsaccessibilityautofillcrashexpectedtxt"></a>
<div class="copfile"><h4>Copied: trunk/LayoutTests/platform/win/accessibility/auto-fill-crash-expected.txt (from rev 284611, trunk/LayoutTests/accessibility/auto-fill-crash-expected.txt) (0 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/win/accessibility/auto-fill-crash-expected.txt                                (rev 0)
+++ trunk/LayoutTests/platform/win/accessibility/auto-fill-crash-expected.txt   2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -0,0 +1,13 @@
</span><ins>+
+This tests that when an auto fill element is removed we won't crash accessing an old value.
+
+On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
+
+
+PASS textFieldAxObject.childrenCount is 2
+PASS textFieldAxObject.childAtIndex(childrenCountExpected - 1).description is 'AXDescription: contact info AutoFill'
+PASS textFieldAxObject.childrenCount is 2
+PASS successfullyParsed is true
+
+TEST COMPLETE
+
</ins></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/Source/WebCore/ChangeLog      2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -1,5 +1,21 @@
</span><span class="cx"> 2021-10-21  Tyler Wilcock  <tyler_w@apple.com>
</span><span class="cx"> 
</span><ins>+        AX: Remove redundant insert of autofill button child in AccessibilityRenderObject::addTextFieldChildren
+        https://bugs.webkit.org/show_bug.cgi?id=232033
+
+        Reviewed by Chris Fleizach.
+
+        Autofill buttons are represented in the DOM, so there's no reason
+        to also insert it in AccessibilityRenderObject::addTextFieldChildren.
+        This results in duplicate objects for this button in the AX tree.
+
+        * accessibility/AccessibilityRenderObject.cpp:
+        (WebCore::AccessibilityRenderObject::addTextFieldChildren):
+        Remove redundant insertion of autofill button element into the
+        accessibility tree.
+
+2021-10-21  Tyler Wilcock  <tyler_w@apple.com>
+
</ins><span class="cx">         AX: Any addition of children should funnel through AccessibilityObject::addChild
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=231914
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkSourceWebCoreaccessibilityAccessibilityRenderObjectcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp (284611 => 284612)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp 2021-10-21 16:49:15 UTC (rev 284611)
+++ trunk/Source/WebCore/accessibility/AccessibilityRenderObject.cpp    2021-10-21 16:49:44 UTC (rev 284612)
</span><span class="lines">@@ -3303,13 +3303,7 @@
</span><span class="cx">     if (!is<HTMLInputElement>(node))
</span><span class="cx">         return;
</span><span class="cx">     
</span><del>-    HTMLInputElement& input = downcast<HTMLInputElement>(*node);
-    if (HTMLElement* autoFillElement = input.autoFillButtonElement()) {
-        if (AccessibilityObject* axAutoFill = axObjectCache()->getOrCreate(autoFillElement))
-            m_children.append(axAutoFill);
-    }
-    
-    HTMLElement* spinButtonElement = input.innerSpinButtonElement();
</del><ins>+    HTMLElement* spinButtonElement = downcast<HTMLInputElement>(*node).innerSpinButtonElement();
</ins><span class="cx">     if (!is<SpinButtonElement>(spinButtonElement))
</span><span class="cx">         return;
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>