Skip to content

GitLab

T
tangled
Commit 3a747541 authored by Alice Boxhall's avatar Alice Boxhall Committed by Commit Bot
Browse files
Options

AXObject::AddHiddenChildren() is redundant. 

Since we moved to primarily walking the DOM tree, we are automatically
getting aria-hidden=false elements in the tree, so we don't need to
specially add them.

Change-Id: Id44b451dc47e3baa301258254d89edb7a2bbe14e
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2545846Reviewed-by: default avatarDominic Mazzoni <dmazzoni@chromium.org>
Commit-Queue: Alice Boxhall <aboxhall@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829026}
parent b2fd68e9
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 57 deletions
content/test/data/accessibility/aria/aria-hidden-expected-android.txt
View file @ 3a747541
...@@ -2,4 +2,5 @@ android.webkit.WebView focusable focused scrollable ...@@ -2,4 +2,5 @@ android.webkit.WebView focusable focused scrollable
++android.view.View name='blockDisplay' ++android.view.View name='blockDisplay'
++android.view.View name='blockDisplay Hiddenfalse' ++android.view.View name='blockDisplay Hiddenfalse'
++android.view.View invisible ++android.view.View invisible
++android.view.View focusable invisible name='blockDisplay Hiddentruefocusable' ++android.view.View focusable invisible name='blockDisplay Hiddentruefocusable'
\ No newline at end of file ++android.view.View role_description='heading 1' heading invisible name='noneDisplayParent Hiddenfalse'
content/test/data/accessibility/aria/aria-hidden-expected-auralinux.txt
View file @ 3a747541
...@@ -5,3 +5,4 @@ ...@@ -5,3 +5,4 @@
++++[static] name='blockDisplay Hiddenfalse' ++++[static] name='blockDisplay Hiddenfalse'
++[section] hidden:true ++[section] hidden:true
++[section] name='blockDisplay Hiddentruefocusable' hidden:true ++[section] name='blockDisplay Hiddentruefocusable' hidden:true
++[heading] name='noneDisplayParent Hiddenfalse' hidden:true
content/test/data/accessibility/aria/aria-hidden-expected-blink.txt
View file @ 3a747541
...@@ -13,4 +13,6 @@ rootWebArea isLineBreakingObject=true ...@@ -13,4 +13,6 @@ rootWebArea isLineBreakingObject=true
++++++++++inlineTextBox name='blockDisplay Hiddenfalse' ++++++++++inlineTextBox name='blockDisplay Hiddenfalse'
++++++genericContainer invisible ++++++genericContainer invisible
++++++genericContainer invisible name='blockDisplay Hiddentruefocusable' isLineBreakingObject=true ++++++genericContainer invisible name='blockDisplay Hiddentruefocusable' isLineBreakingObject=true
++++++++staticText ignored invisible name='blockDisplay Hiddentruefocusable' ++++++++staticText ignored invisible name='blockDisplay Hiddentruefocusable'
\ No newline at end of file ++++++genericContainer ignored invisible
++++++++heading invisible name='noneDisplayParent Hiddenfalse'
content/test/data/accessibility/aria/aria-hidden-expected-win.txt
View file @ 3a747541
...@@ -4,4 +4,5 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE ...@@ -4,4 +4,5 @@ ROLE_SYSTEM_DOCUMENT READONLY FOCUSABLE
++IA2_ROLE_SECTION ++IA2_ROLE_SECTION
++++ROLE_SYSTEM_STATICTEXT name='blockDisplay Hiddenfalse' ++++ROLE_SYSTEM_STATICTEXT name='blockDisplay Hiddenfalse'
++IA2_ROLE_SECTION INVISIBLE hidden:true ++IA2_ROLE_SECTION INVISIBLE hidden:true
++IA2_ROLE_SECTION name='blockDisplay Hiddentruefocusable' INVISIBLE FOCUSABLE hidden:true ++IA2_ROLE_SECTION name='blockDisplay Hiddentruefocusable' INVISIBLE FOCUSABLE hidden:true
\ No newline at end of file ++IA2_ROLE_HEADING name='noneDisplayParent Hiddenfalse' INVISIBLE hidden:true
content/test/data/accessibility/aria/aria-hidden.html
View file @ 3a747541
...@@ -14,6 +14,7 @@ ...@@ -14,6 +14,7 @@
#blockDisplayAriaHiddenFalse {display: block;} #blockDisplayAriaHiddenFalse {display: block;}
#noneDisplayAriaHiddenFalse {display: none;} #noneDisplayAriaHiddenFalse {display: none;}
#blockDisplayAriaHiddenTrueFocusable {display: block;} #blockDisplayAriaHiddenTrueFocusable {display: block;}
#noneDisplayParent {display: none;}
</style> </style>
</head> </head>
<body> <body>
...@@ -24,5 +25,6 @@ ...@@ -24,5 +25,6 @@
<div id="blockDisplayAriaHiddenFalse" aria-hidden="false">blockDisplay Hiddenfalse</div> <div id="blockDisplayAriaHiddenFalse" aria-hidden="false">blockDisplay Hiddenfalse</div>
<div id="noneDisplayAriaHiddenFalse" aria-hidden="false">noneDisplay Hiddenfalse</div> <div id="noneDisplayAriaHiddenFalse" aria-hidden="false">noneDisplay Hiddenfalse</div>
<div id="blockDisplayAriaHiddenTrueFocusable" aria-hidden="true" tabindex="-1">blockDisplay Hiddentruefocusable</div> <div id="blockDisplayAriaHiddenTrueFocusable" aria-hidden="true" tabindex="-1">blockDisplay Hiddentruefocusable</div>
<div id="noneDisplayParent"><h1 aria-hidden="false">noneDisplayParent Hiddenfalse</h1></div>
</body> </body>
</html> </html>
third_party/blink/renderer/modules/accessibility/ax_node_object.cc
View file @ 3a747541
...@@ -3213,59 +3213,6 @@ void AXNodeObject::AddValidationMessageChild() { ...@@ -3213,59 +3213,6 @@ void AXNodeObject::AddValidationMessageChild() {
children_.push_back(ax_object); children_.push_back(ax_object);
} }
// Hidden children are those that are not laid out or visible, but are
// specifically marked as aria-hidden=false,
// meaning that they should be exposed to the AX hierarchy.
void AXNodeObject::AddHiddenChildren() {
Node* node = this->GetNode();
if (!node)
return;
// First do a quick run through to determine if we have any hidden nodes (most
// often we will not). If we do have hidden nodes, we need to determine where
// to insert them so they match DOM order as close as possible.
bool should_insert_hidden_nodes = false;
for (Node& child : NodeTraversal::ChildrenOf(*node)) {
if (!child.GetLayoutObject() && IsNodeAriaVisible(&child)) {
should_insert_hidden_nodes = true;
break;
}
}
if (!should_insert_hidden_nodes)
return;
// Iterate through all of the children, including those that may have already
// been added, and try to insert hidden nodes in the correct place in the DOM
// order.
unsigned insertion_index = 0;
for (Node& child : NodeTraversal::ChildrenOf(*node)) {
if (child.GetLayoutObject()) {
// Find out where the last layout sibling is located within children_.
if (AXObject* child_object =
AXObjectCache().Get(child.GetLayoutObject())) {
if (!child_object->AccessibilityIsIncludedInTree()) {
const auto& children = child_object->ChildrenIncludingIgnored();
child_object = children.size() ? children.back().Get() : nullptr;
}
if (child_object)
insertion_index = children_.Find(child_object) + 1;
continue;
}
}
if (!IsNodeAriaVisible(&child))
continue;
unsigned previous_size = children_.size();
if (insertion_index > previous_size)
insertion_index = previous_size;
InsertChild(AXObjectCache().GetOrCreate(&child), insertion_index);
insertion_index += (children_.size() - previous_size);
}
}
void AXNodeObject::AddImageMapChildren() { void AXNodeObject::AddImageMapChildren() {
LayoutBoxModelObject* css_box = GetLayoutBoxModelObject(); LayoutBoxModelObject* css_box = GetLayoutBoxModelObject();
if (!css_box || !css_box->IsLayoutImage()) if (!css_box || !css_box->IsLayoutImage())
...@@ -3399,7 +3346,6 @@ void AXNodeObject::AddChildren() { ...@@ -3399,7 +3346,6 @@ void AXNodeObject::AddChildren() {
} }
} }
AddHiddenChildren();
AddPopupChildren(); AddPopupChildren();
AddRemoteSVGChildren(); AddRemoteSVGChildren();
AddImageMapChildren(); AddImageMapChildren();
......
third_party/blink/web_tests/accessibility/aria-hidden.html
View file @ 3a747541
...@@ -24,5 +24,18 @@ test((t) => { ...@@ -24,5 +24,18 @@ test((t) => {
</script> </script>
<div id="hidden-container" style="display: none">
<h2 aria-hidden="false">h2</h2>
</div>
<script>
test((t) => {
var hiddenContainer = accessibilityController.accessibleElementById("hidden-container");
assert_true(hiddenContainer.isIgnored);
assert_equals(hiddenContainer.childrenCount, 1);
var ariaVisibleH2 = hiddenContainer.childAtIndex(0);
assert_false(ariaVisibleH2.isIgnored);
}, "Elements with aria-hidden=false inside a non-rendered element should be exposed in the accessibility tree, and not ignored");
</script>
</body> </body>
</html> </html>
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment