Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1310)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: Source/modules/accessibility/AXLayoutObject.cpp

Issue 1076453004: Show reasons why nodes are ignored in accessibility sidebar (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Removing IgnoredReasons from protocol Created 5 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « Source/devtools/protocol.json ('k') | Source/modules/accessibility/AXNodeObject.cpp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Source/modules/accessibility/AXLayoutObject.cpp
diff --git a/Source/modules/accessibility/AXLayoutObject.cpp b/Source/modules/accessibility/AXLayoutObject.cpp
index ab927d81109ce7fab78e6af1625c7091a83b73f8..ea800c994b06816e53c0f7faf9c998726dc754c5 100644
--- a/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/Source/modules/accessibility/AXLayoutObject.cpp
@@ -468,14 +468,19 @@ AXObjectInclusion AXLayoutObject::defaultObjectInclusion(IgnoredReasons* ignored
{
// The following cases can apply to any element that's a subclass of AXLayoutObject.
- if (!m_layoutObject)
+ if (!m_layoutObject) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXNotRendered));
return IgnoreObject;
+ }
if (m_layoutObject->style()->visibility() != VISIBLE) {
// aria-hidden is meant to override visibility as the determinant in AX hierarchy inclusion.
if (equalIgnoringCase(getAttribute(aria_hiddenAttr), "false"))
return DefaultBehavior;
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXNotVisible));
return IgnoreObject;
}
@@ -497,19 +502,32 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
if (decision == IgnoreObject)
return true;
- // If this element is within a parent that cannot have children, it should not be exposed.
- if (isDescendantOfLeafNode())
+ // If this element is within a parent that cannot have children, it should not be exposed
+ if (isDescendantOfLeafNode()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXAncestorIsLeafNode, leafNodeAncestor()));
return true;
+ }
- if (roleValue() == IgnoredRole)
+ if (roleValue() == IgnoredRole) {
dmazzoni 2015/04/23 05:28:38 Worth cleaning this up maybe. The only two places
aboxhall 2015/04/28 02:36:11 I'd prefer to try not to make any functional chang
+ if (ignoredReasons) {
+ ignoredReasons->append(IgnoredReason(AXUninteresting));
+ }
return true;
+ }
- if (hasInheritedPresentationalRole())
+ if (hasInheritedPresentationalRole()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXInheritsPresentation, inheritsPresentationalRoleFrom()));
return true;
+ }
// An ARIA tree can only have tree items and static text as children.
- if (treeAncestorDisallowingChild())
+ if (AXObject* treeAncestor = treeAncestorDisallowingChild()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXAncestorDisallowsChild, treeAncestor));
return true;
+ }
// TODO: we should refactor this - but right now this is necessary to make
// sure scroll areas stay in the tree.
@@ -518,28 +536,49 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
// ignore popup menu items because AppKit does
dmazzoni 2015/04/23 05:28:38 ooh, I think my recent change made this block unne
aboxhall 2015/04/28 02:36:11 Done.
for (LayoutObject* parent = m_layoutObject->parent(); parent; parent = parent->parent()) {
- if (parent->isBoxModelObject() && toLayoutBoxModelObject(parent)->isMenuList())
+ if (parent->isBoxModelObject() && toLayoutBoxModelObject(parent)->isMenuList()) {
+ if (ignoredReasons) {
+ AXObject* parentObject = axObjectCache()->getOrCreate(parent);
+ if (parentObject)
+ ignoredReasons->append(IgnoredReason(AXAncestorDisallowsChild, parentObject));
+ }
return true;
+ }
}
// find out if this element is inside of a label element.
// if so, it may be ignored because it's the label for a checkbox or radio button
AXObject* controlObject = correspondingControlForLabelElement();
- if (controlObject && !controlObject->deprecatedExposesTitleUIElement() && controlObject->isCheckboxOrRadio())
+ if (controlObject && !controlObject->deprecatedExposesTitleUIElement() && controlObject->isCheckboxOrRadio()) {
+ if (ignoredReasons) {
+ HTMLLabelElement* label = labelElementContainer();
+ if (label && !label->isSameNode(node())) {
+ AXObject* labelAXObject = axObjectCache()->getOrCreate(label);
+ ignoredReasons->append(IgnoredReason(AXLabelContainer, labelAXObject));
dmazzoni 2015/04/23 05:28:38 Null-check labelAXObject, even if there isn't any
aboxhall 2015/04/28 02:36:11 There's nothing I can really do about it if it's n
+ }
+
+ ignoredReasons->append(IgnoredReason(AXLabelFor, controlObject));
+ }
return true;
+ }
if (m_layoutObject->isBR())
return false;
- // NOTE: BRs always have text boxes now, so the text box check here can be removed
if (m_layoutObject->isText()) {
// static text beneath MenuItems and MenuButtons are just reported along with the menu item, so it's ignored on an individual level
AXObject* parent = parentObjectUnignored();
- if (parent && (parent->ariaRoleAttribute() == MenuItemRole || parent->ariaRoleAttribute() == MenuButtonRole))
+ if (parent && (parent->ariaRoleAttribute() == MenuItemRole || parent->ariaRoleAttribute() == MenuButtonRole)) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXStaticTextUsedAsNameFor, parent));
return true;
+ }
LayoutText* layoutText = toLayoutText(m_layoutObject);
- if (m_layoutObject->isBR() || !layoutText->firstTextBox())
+ if (!layoutText->firstTextBox()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXEmptyText));
return true;
+ }
// Don't ignore static text in editable text controls.
for (AXObject* parent = parentObject(); parent; parent = parent->parentObject()) {
@@ -549,7 +588,12 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
// text elements that are just empty whitespace should not be returned
// FIXME(dmazzoni): we probably shouldn't ignore this if the style is 'pre', or similar...
- return layoutText->text().impl()->containsOnlyWhitespace();
+ if (layoutText->text().impl()->containsOnlyWhitespace()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXEmptyText));
+ return true;
+ }
+ return false;
}
if (isHeading())
@@ -617,11 +661,20 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
// objects are often containers with meaningful information, the inclusion of a span can have
// the side effect of causing the immediate parent accessible to be ignored. This is especially
// problematic for platforms which have distinct roles for textual block elements.
- if (isHTMLSpanElement(node))
+ if (isHTMLSpanElement(node)) {
dmazzoni 2015/04/23 05:28:38 fwiw, i'd like to get rid of this rule. there's no
aboxhall 2015/04/28 02:36:11 Agreed. Let's chat about this for the follow up re
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXUninteresting));
return true;
+ }
+
+ if (m_layoutObject->isLayoutBlockFlow() && m_layoutObject->childrenInline() && !canSetFocusAttribute()) {
+ if (toLayoutBlockFlow(m_layoutObject)->firstLineBox() || mouseButtonListener())
+ return false;
- if (m_layoutObject->isLayoutBlockFlow() && m_layoutObject->childrenInline() && !canSetFocusAttribute())
- return !toLayoutBlockFlow(m_layoutObject)->firstLineBox() && !mouseButtonListener();
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXUninteresting));
+ return true;
+ }
// ignore images seemingly used as spacers
if (isImage()) {
@@ -637,20 +690,31 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
if (!alt.string().containsOnlyWhitespace())
return false;
// informal standard is to ignore images with zero-length alt strings
- if (!alt.isNull())
+ if (!alt.isNull()) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXEmptyAlt));
return true;
+ }
}
if (isNativeImage() && m_layoutObject->isImage()) {
// check for one-dimensional image
LayoutImage* image = toLayoutImage(m_layoutObject);
- if (image->size().height() <= 1 || image->size().width() <= 1)
+ if (image->size().height() <= 1 || image->size().width() <= 1) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXProbablyPresentational));
dmazzoni 2015/04/23 05:28:38 How about an explicit reason for this one, like AX
aboxhall 2015/04/28 02:36:11 I figured this was more on the heuristic side.
return true;
+ }
// check whether laid out image was stretched from one-dimensional file image
if (image->cachedImage()) {
LayoutSize imageSize = image->cachedImage()->imageSizeForLayoutObject(m_layoutObject, image->view()->zoomFactor());
- return imageSize.height() <= 1 || imageSize.width() <= 1;
+ if (imageSize.height() <= 1 || imageSize.width() <= 1) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXProbablyPresentational));
dmazzoni 2015/04/23 05:28:38 Same
aboxhall 2015/04/28 02:36:11 As above.
+ return true;
+ }
+ return false;
}
}
return false;
@@ -660,8 +724,11 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
if (canvasHasFallbackContent())
return false;
LayoutHTMLCanvas* canvas = toLayoutHTMLCanvas(m_layoutObject);
- if (canvas->size().height() <= 1 || canvas->size().width() <= 1)
+ if (canvas->size().height() <= 1 || canvas->size().width() <= 1) {
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXProbablyPresentational));
dmazzoni 2015/04/23 05:28:38 Same
aboxhall 2015/04/28 02:36:11 As above.
return true;
+ }
// Otherwise fall through; use presence of help text, title, or description to decide.
}
@@ -689,6 +756,8 @@ bool AXLayoutObject::computeAccessibilityIsIgnored(IgnoredReasons* ignoredReason
// By default, objects should be ignored so that the AX hierarchy is not
// filled with unnecessary items.
+ if (ignoredReasons)
+ ignoredReasons->append(IgnoredReason(AXUninteresting));
dmazzoni 2015/04/23 05:28:38 If we skip <span>, it should be handled here. To
aboxhall 2015/04/28 02:36:11 Acknowledged.
return true;
}
« no previous file with comments | « Source/devtools/protocol.json ('k') | Source/modules/accessibility/AXNodeObject.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698