Boolean properties 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 441 matching lines @@
        GetDocument()->GetFrame()->Selection().FrameIsFocusedAndActive()))
     return true;
 
   return false;
 }
 
 bool AXLayoutObject::IsSelected() const {
   if (!GetLayoutObject() || !GetNode())
     return false;
 
-  const AtomicString& aria_selected = GetAttribute(aria_selectedAttr);
-  if (EqualIgnoringASCIICase(aria_selected, "true"))
+  if (AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty::kSelected))
     return true;
 
   AXObjectImpl* focused_object = AxObjectCache().FocusedObject();
   if (AriaRoleAttribute() == kListBoxOptionRole && focused_object &&
       focused_object->ActiveDescendant() == this) {
     return true;
   }
 
   if (IsTabItem() && IsTabItemSelected())
     return true;
@@ skipping 12 matching lines @@
 
   if (!layout_object_) {
     if (ignored_reasons)
       ignored_reasons->push_back(IgnoredReason(kAXNotRendered));
     return kIgnoreObject;
   }
 
   if (layout_object_->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 kDefaultBehavior;
 
     if (ignored_reasons)
       ignored_reasons->push_back(IgnoredReason(kAXNotVisible));
     return kIgnoreObject;
   }
 
   return AXObjectImpl::DefaultObjectInclusion(ignored_reasons);
 }
 
@@ skipping 867 matching lines @@
       GetAOMPropertyOrARIAAttribute(AOMStringProperty::kRelevant);
 
   // Default aria-relevant = "additions text".
   if (relevant.IsEmpty())
     return default_live_region_relevant;
 
   return relevant;
 }
 
 bool AXLayoutObject::LiveRegionAtomic() const {
+  bool atomic = false;
+  if (HasAOMPropertyOrARIAAttribute(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() == kAlertRole || RoleValue() == kStatusRole)) {
-    return true;
-  }
-  return ElementAttributeValue(aria_atomicAttr);
+  return RoleValue() == kAlertRole || RoleValue() == kStatusRole;
 }
 
 bool AXLayoutObject::LiveRegionBusy() const {
-  return ElementAttributeValue(aria_busyAttr);
+  return AOMPropertyOrARIAAttributeIsTrue(AOMBooleanProperty::kBusy);
 }
 
 //
 // Hit testing.
 //
 
 AXObjectImpl* AXLayoutObject::AccessibilityHitTest(
     const IntPoint& point) const {
   if (!layout_object_ || !layout_object_->HasLayer())
     return nullptr;
@@ skipping 1119 matching lines @@
 
 bool AXLayoutObject::ElementAttributeValue(
     const QualifiedName& attribute_name) const {
   if (!layout_object_)
     return false;
 
   return EqualIgnoringASCIICase(GetAttribute(attribute_name), "true");
 }
 
 }  // namespace blink