Relation list 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 1246 matching lines @@
   return AXNodeObject::TextAlternative(recursive, in_aria_labelled_by_traversal,
                                        visited, name_from, related_objects,
                                        name_sources);
 }
 
 //
 // ARIA attributes.
 //
 
 void AXLayoutObject::AriaOwnsElements(AXObjectVector& owns) const {
-  AccessibilityChildrenFromAttribute(aria_ownsAttr, owns);
+  AccessibilityChildrenFromAOMProperty(AOMRelationListProperty::kOwns, owns);
 }
 
 void AXLayoutObject::AriaDescribedbyElements(
     AXObjectVector& describedby) const {
-  AccessibilityChildrenFromAttribute(aria_describedbyAttr, describedby);
+  AccessibilityChildrenFromAOMProperty(AOMRelationListProperty::kDescribedBy,
+                                       describedby);
 }
 
 void AXLayoutObject::AriaLabelledbyElements(AXObjectVector& labelledby) const {
-  AccessibilityChildrenFromAttribute(aria_labelledbyAttr, labelledby);
+  AccessibilityChildrenFromAOMProperty(AOMRelationListProperty::kLabeledBy,
+                                       labelledby);
 }
 
 bool AXLayoutObject::AriaHasPopup() const {
   return ElementAttributeValue(aria_haspopupAttr);
 }
 
 bool AXLayoutObject::AriaRoleHasPresentationalChildren() const {
   switch (aria_role_) {
     case kButtonRole:
     case kSliderRole:
@@ skipping 963 matching lines @@
     return false;
 
   // The ARIA spec says a tab item can also be selected if it is aria-labeled by
   // a tabpanel that has keyboard focus inside of it, or if a tabpanel in its
   // aria-controls list has KB focus inside of it.
   AXObject* focused_element = AxObjectCache().FocusedObject();
   if (!focused_element)
     return false;
 
   HeapVector<Member<Element>> elements;
-  ElementsFromAttribute(elements, aria_controlsAttr);
+  if (!HasAOMPropertyOrARIAAttribute(AOMRelationListProperty::kControls,
+                                     elements))
+    return false;
 
   for (const auto& element : elements) {
     AXObject* tab_panel = AxObjectCache().GetOrCreate(element);
 
     // A tab item should only control tab panels.
     if (!tab_panel || tab_panel->RoleValue() != kTabPanelRole)
       continue;
 
     AXObject* check_focus_element = focused_element;
     // Check if the focused element is a descendant of the element controlled by
@@ skipping 250 matching lines @@
 
 bool AXLayoutObject::ElementAttributeValue(
     const QualifiedName& attribute_name) const {
   if (!layout_object_)
     return false;
 
   return EqualIgnoringASCIICase(GetAttribute(attribute_name), "true");
 }
 
 }  // namespace blink