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

Unified Diff: third_party/WebKit/Source/modules/accessibility/AXObject.cpp

Issue 1473833002: Fix bugs in accessible name calculation code exposed by Bryan Garaventa's test files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dumb_mistake
Patch Set: Fix android test expectation Created 5 years 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 | « third_party/WebKit/Source/modules/accessibility/AXObject.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: third_party/WebKit/Source/modules/accessibility/AXObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
index 29df97c32bb74b82cf9dfc6b20efe48bf5c6dd3c..96f409ba5bbfb7c3155a136b70eef6af5f778699 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXObject.cpp
@@ -676,6 +676,19 @@ bool AXObject::isPresentationalChild() const
return m_cachedIsPresentationalChild;
}
+// Simplify whitespace, but preserve a single leading and trailing whitespace character if it's present.
+// static
+String AXObject::collapseWhitespace(const String& str)
+{
+ StringBuilder result;
+ if (!str.isEmpty() && isHTMLSpace<UChar>(str[0]))
+ result.append(' ');
+ result.append(str.simplifyWhiteSpace(isHTMLSpace<UChar>));
+ if (!str.isEmpty() && isHTMLSpace<UChar>(str[str.length() - 1]))
+ result.append(' ');
+ return result.toString();
+}
+
String AXObject::computedName() const
{
AXNameFrom nameFrom;
@@ -689,8 +702,9 @@ String AXObject::name(AXNameFrom& nameFrom, AXObject::AXObjectVector* nameObject
AXRelatedObjectVector relatedObjects;
String text = textAlternative(false, false, visited, nameFrom, &relatedObjects, nullptr);
- if (!node() || !isHTMLBRElement(node()))
- text = text.simplifyWhiteSpace(isHTMLSpace<UChar>, WTF::DoNotStripWhiteSpace);
+ AccessibilityRole role = roleValue();
+ if (!node() || (!isHTMLBRElement(node()) && role != StaticTextRole && role != InlineTextBoxRole))
+ text = collapseWhitespace(text);
if (nameObjects) {
nameObjects->clear();
@@ -716,6 +730,28 @@ String AXObject::recursiveTextAlternative(const AXObject& axObj, bool inAriaLabe
return axObj.textAlternative(true, inAriaLabelledByTraversal, visited, tmpNameFrom, nullptr, nullptr);
}
+bool AXObject::isHiddenForTextAlternativeCalculation() const
+{
+ if (equalIgnoringCase(getAttribute(aria_hiddenAttr), "false"))
+ return false;
+
+ if (layoutObject())
+ return layoutObject()->style()->visibility() != VISIBLE;
+
+ // This is an obscure corner case: if a node has no LayoutObject, that means it's not rendered,
+ // but we still may be exploring it as part of a text alternative calculation, for example if it
+ // was explicitly referenced by aria-labelledby. So we need to explicitly call the style resolver
+ // to check whether it's invisible or display:none, rather than relying on the style cached in the
+ // LayoutObject.
+ Document* doc = document();
+ if (doc && doc->frame() && node() && node()->isElementNode()) {
+ RefPtr<ComputedStyle> style = doc->ensureStyleResolver().styleForElement(toElement(node()));
+ return style->display() == NONE || style->visibility() != VISIBLE;
+ }
+
+ return false;
+}
+
String AXObject::ariaTextAlternative(bool recursive, bool inAriaLabelledByTraversal, AXObjectSet& visited, AXNameFrom& nameFrom, AXRelatedObjectVector* relatedObjects, NameSources* nameSources, bool* foundTextAlternative) const
{
String textAlternative;
@@ -724,9 +760,8 @@ String AXObject::ariaTextAlternative(bool recursive, bool inAriaLabelledByTraver
// Step 2A from: http://www.w3.org/TR/accname-aam-1.1
// If you change this logic, update AXNodeObject::nameFromLabelElement, too.
- if (!recursive && layoutObject()
- && layoutObject()->style()->visibility() != VISIBLE
- && !equalIgnoringCase(getAttribute(aria_hiddenAttr), "false")) {
+ if (!inAriaLabelledByTraversal && isHiddenForTextAlternativeCalculation()) {
+ *foundTextAlternative = true;
return String();
}
« no previous file with comments | « third_party/WebKit/Source/modules/accessibility/AXObject.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698