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

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

Issue 2805493002: Boolean properties for Accessibility Object Model Phase 1 (Closed)
Patch Set: Created 3 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
Index: third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
diff --git a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
index 5b27c4762de74bb75c79991c9efd0c2889582e7a..0068625a8e7343d398fa9e156a6b68b4231bd014 100644
--- a/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
+++ b/third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp
@@ -458,8 +458,7 @@ bool AXLayoutObject::isSelected() const {
if (!getLayoutObject() || !getNode())
return false;
- const AtomicString& ariaSelected = getAttribute(aria_selectedAttr);
- if (equalIgnoringASCIICase(ariaSelected, "true"))
+ if (AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty::kSelected))
return true;
AXObject* focusedObject = axObjectCache().focusedObject();
@@ -492,7 +491,7 @@ AXObjectInclusion AXLayoutObject::defaultObjectInclusion(
if (m_layoutObject->style()->visibility() != EVisibility::kVisible) {
// aria-hidden is meant to override visibility as the determinant in AX
// hierarchy inclusion.
- if (equalIgnoringASCIICase(getAttribute(aria_hiddenAttr), "false"))
+ if (AOMPropertyOrARIAAttributeIsFalse(AOMBooleanProperty::kHidden))
return DefaultBehavior;
if (ignoredReasons)
@@ -1363,17 +1362,17 @@ const AtomicString& AXLayoutObject::liveRegionRelevant() const {
}
bool AXLayoutObject::liveRegionAtomic() const {
+ bool atomic = false;
+ if (getAOMPropertyOrARIAAttribute(AOMBooleanProperty::kAtomic, atomic))
+ return atomic;
+
// ARIA roles "alert" and "status" should have an implicit aria-atomic value
// of true.
- if (getAttribute(aria_atomicAttr).isEmpty() &&
- (roleValue() == AlertRole || roleValue() == StatusRole)) {
- return true;
- }
- return elementAttributeValue(aria_atomicAttr);
+ return roleValue() == AlertRole || roleValue() == StatusRole;
}
bool AXLayoutObject::liveRegionBusy() const {
- return elementAttributeValue(aria_busyAttr);
+ return AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty::kBusy);
}
//

Powered by Google App Engine
This is Rietveld 408576698