Relation properties for Accessibility Object Model phase 1

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

 /*
  * Copyright (C) 2008, 2009, 2011 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 363 matching lines @@
   return !ax_object_cache_;
 }
 
 const AtomicString& AXObject::GetAOMPropertyOrARIAAttribute(
     AOMStringProperty property) const {
   if (Element* element = this->GetElement())
     return AccessibleNode::GetPropertyOrARIAAttribute(element, property);
   return g_null_atom;
 }
 
+Element* AXObject::GetAOMPropertyOrARIAAttribute(
+    AOMRelationProperty property) const {
+  Element* element = this->GetElement();
+  if (!element)
+    return nullptr;
+
+  AccessibleNode* target =
+      AccessibleNode::GetPropertyOrARIAAttribute(element, property);
+  return target ? target->element() : nullptr;
+}
+
 bool AXObject::HasAOMPropertyOrARIAAttribute(AOMBooleanProperty property,
                                              bool& result) const {
   Element* element = this->GetElement();
   if (!element)
     return false;
 
   bool is_null = true;
   result =
       AccessibleNode::GetPropertyOrARIAAttribute(element, property, is_null);
   return !is_null;
@@ skipping 428 matching lines @@
   UpdateCachedAttributeValuesIfNeeded();
   return cached_is_presentational_child_;
 }
 
 bool AXObject::CanReceiveAccessibilityFocus() const {
   const Element* elem = GetElement();
   if (!elem)
     return false;
 
   // Focusable, and not forwarding the focus somewhere else
-  if (elem->IsFocusable() && !elem->FastHasAttribute(aria_activedescendantAttr))
+  if (elem->IsFocusable() &&
+      !GetAOMPropertyOrARIAAttribute(AOMRelationProperty::kActiveDescendant))
     return true;
 
   // aria-activedescendant focus
   return elem->FastHasAttribute(idAttr) && AncestorExposesActiveDescendant();
 }
 
 bool AXObject::AncestorExposesActiveDescendant() const {
   UpdateCachedAttributeValuesIfNeeded();
   return cached_ancestor_exposes_active_descendant_;
 }
 
 bool AXObject::ComputeAncestorExposesActiveDescendant() const {
   const AXObject* parent = ParentObjectUnignored();
   if (!parent)
     return false;
 
   if (parent->SupportsActiveDescendant() &&
-      parent->HasAttribute(aria_activedescendantAttr)) {
+      parent->GetAOMPropertyOrARIAAttribute(
+          AOMRelationProperty::kActiveDescendant)) {
     return true;
   }
 
   return parent->AncestorExposesActiveDescendant();
 }
 
 // Simplify whitespace, but preserve a single leading and trailing whitespace
 // character if it's present.
 // static
 String AXObject::CollapseWhitespace(const String& str) {
@@ skipping 1226 matching lines @@
 }
 
 DEFINE_TRACE(AXObject) {
   visitor->Trace(children_);
   visitor->Trace(parent_);
   visitor->Trace(cached_live_region_root_);
   visitor->Trace(ax_object_cache_);
 }
 
 }  // namespace blink