Boolean attributes for Accessibility Object Model Phase 1

third_party/WebKit/Source/modules/accessibility/AXLayoutObject.cpp

 /*
 * Copyright (C) 2008 Apple Inc. All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
 * modification, are permitted provided that the following conditions
 * are met:
 *
 * 1.  Redistributions of source code must retain the above copyright
 *     notice, this list of conditions and the following disclaimer.
 * 2.  Redistributions in binary form must reproduce the above copyright
@@ skipping 440 matching lines @@
        getDocument()->frame()->selection().isFocusedAndActive()))
     return true;
 
   return false;
 }
 
 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();
   if (ariaRoleAttribute() == ListBoxOptionRole && focusedObject &&
       focusedObject->activeDescendant() == this) {
     return true;
   }
 
   if (isTabItem() && isTabItemSelected())
     return true;
@@ skipping 12 matching lines @@
 
   if (!m_layoutObject) {
     if (ignoredReasons)
       ignoredReasons->push_back(IgnoredReason(AXNotRendered));
     return IgnoreObject;
   }
 
   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)
       ignoredReasons->push_back(IgnoredReason(AXNotVisible));
     return IgnoreObject;
   }
 
   return AXObject::defaultObjectInclusion(ignoredReasons);
 }
 
@@ skipping 850 matching lines @@
       getAOMPropertyOrARIAAttribute(AOMStringProperty::kRelevant);
 
   // Default aria-relevant = "additions text".
   if (relevant.isEmpty())
     return defaultLiveRegionRelevant;
 
   return relevant;
 }
 
 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);
 }
 
 //
 // Hit testing.
 //
 
 AXObject* AXLayoutObject::accessibilityHitTest(const IntPoint& point) const {
   if (!m_layoutObject || !m_layoutObject->hasLayer())
     return nullptr;
 
@@ skipping 1110 matching lines @@
 
 bool AXLayoutObject::elementAttributeValue(
     const QualifiedName& attributeName) const {
   if (!m_layoutObject)
     return false;
 
   return equalIgnoringASCIICase(getAttribute(attributeName), "true");
 }
 
 }  // namespace blink