Removes direct checking node on AXLayoutObject::determineAccessibilityRole.

Source/modules/accessibility/AXNodeObject.cpp

 /*
 * Copyright (C) 2012, Google 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 253 matching lines @@
     Node* curNode = node();
     if (!parent->hasInheritedPresentationalRole()
         && !isPresentationRoleInTable(parent, curNode))
         return false;
 
     // ARIA spec says that when a parent object is presentational and this object
     // is a required owned element of that parent, then this object is also presentational.
     return isRequiredOwnedElement(parent, roleValue(), curNode);
 }
 
+bool AXNodeObject::isDescendantOfElementType(const HTMLQualifiedName& tagName) const
+{
+    if (!node())
+        return false;
+
+    for (Element* parent = node()->parentElement(); parent; parent = parent->parentElement()) {
+        if (parent->hasTagName(tagName))
+            return true;
+    }
+    return false;
+}
+
 AccessibilityRole AXNodeObject::determineAccessibilityRoleUtil()
 {
     if (!node())
         return UnknownRole;
-    if (node()->isLink())
+    // HTMLAnchorElement sets isLink only when it has hrefAttr.
+    // We assume that it is also LinkRole if it has event listners even though it doesn't have hrefAttr.
+    if (node()->isLink() || (isHTMLAnchorElement(*node()) && isClickable()))
         return LinkRole;
+
     if (isHTMLButtonElement(*node()))
         return buttonRoleType();
+
     if (isHTMLDetailsElement(*node()))
         return DetailsRole;
+
     if (isHTMLSummaryElement(*node())) {
         if (node()->parentNode() && isHTMLDetailsElement(node()->parentNode()))
             return DisclosureTriangleRole;
         return UnknownRole;
     }
 
     if (isHTMLInputElement(*node())) {
         HTMLInputElement& input = toHTMLInputElement(*node());
         const AtomicString& type = input.type();
         if (input.dataList())
@@ skipping 27 matching lines @@
         if (input.isTextButton())
             return buttonRoleType();
         if (type == InputTypeNames::range)
             return SliderRole;
         if (type == InputTypeNames::color)
             return ColorWellRole;
         if (type == InputTypeNames::time)
             return TimeRole;
         return TextFieldRole;
     }
+
     if (isHTMLSelectElement(*node())) {
         HTMLSelectElement& selectElement = toHTMLSelectElement(*node());
         return selectElement.multiple() ? ListBoxRole : PopUpButtonRole;
     }
+
     if (isHTMLTextAreaElement(*node()))
         return TextFieldRole;
+
     if (headingLevel())
         return HeadingRole;
+
     if (isHTMLDivElement(*node()))
         return DivRole;
+
     if (isHTMLMeterElement(*node()))
         return MeterRole;
+
     if (isHTMLOutputElement(*node()))
         return StatusRole;
+
     if (isHTMLParagraphElement(*node()))
         return ParagraphRole;
+
     if (isHTMLLabelElement(*node()))
         return LabelRole;
+
+    if (isHTMLLegendElement(*node()))
+        return LegendRole;
+
     if (isHTMLRubyElement(*node()))
         return RubyRole;
+
     if (isHTMLDListElement(*node()))
         return DescriptionListRole;
-    if (node()->isElementNode() && node()->hasTagName(blockquoteTag))
+
+    if (node()->hasTagName(ddTag))
+        return DescriptionListDetailRole;
+
+    if (node()->hasTagName(dtTag))
+        return DescriptionListTermRole;
+
+    if (node()->nodeName() == "math")
+        return MathRole;
+
+    if (node()->hasTagName(rpTag) || node()->hasTagName(rtTag))
+        return AnnotationRole;
+
+    if (isHTMLFormElement(*node()))
+        return FormRole;
+
+    if (node()->hasTagName(articleTag))
+        return ArticleRole;
+
+    if (node()->hasTagName(mainTag))
+        return MainRole;
+
+    if (node()->hasTagName(navTag))
+        return NavigationRole;
+
+    if (node()->hasTagName(asideTag))
+        return ComplementaryRole;
+
+    if (node()->hasTagName(preTag))
+        return PreRole;
+
+    if (node()->hasTagName(sectionTag))
+        return RegionRole;
+
+    if (node()->hasTagName(addressTag))
+        return ContentInfoRole;
+
+    if (isHTMLDialogElement(*node()))
+        return DialogRole;
+
+    // The HTML element should not be exposed as an element. That's what the LayoutView element does.
+    if (isHTMLHtmlElement(*node()))
+        return IgnoredRole;
+
+    if (isHTMLIFrameElement(*node())) {
+        const AtomicString& ariaRole = getAttribute(roleAttr);
+        if (ariaRole == "none" || ariaRole == "presentation")
+            return IframePresentationalRole;
+        return IframeRole;
+    }
+
+    // There should only be one banner/contentInfo per page. If header/footer are being used within an article or section
+    // then it should not be exposed as whole page's banner/contentInfo
+    if (node()->hasTagName(headerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
+        return BannerRole;
+
+    if (node()->hasTagName(footerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
+        return FooterRole;
+
+    if (node()->hasTagName(blockquoteTag))
         return BlockquoteRole;
-    if (node()->isElementNode() && node()->hasTagName(captionTag))
+
+    if (node()->hasTagName(captionTag))
         return CaptionRole;
-    if (node()->isElementNode() && node()->hasTagName(figcaptionTag))
+
+    if (node()->hasTagName(figcaptionTag))
         return FigcaptionRole;
-    if (node()->isElementNode() && node()->hasTagName(figureTag))
+
+    if (node()->hasTagName(figureTag))
         return FigureRole;
-    if (isHTMLAnchorElement(*node()) && isClickable())
-        return LinkRole;
-    if (isHTMLIFrameElement(*node()))
-        return IframeRole;
+
     if (isEmbeddedObject())
         return EmbeddedObjectRole;
+
     return UnknownRole;
 }
 
 AccessibilityRole AXNodeObject::determineAccessibilityRole()
 {
     if (!node())
         return UnknownRole;
 
     if ((m_ariaRole = determineAriaRoleAttribute()) != UnknownRole)
         return m_ariaRole;
@@ skipping 1705 matching lines @@
     float range = maxValueForRange() - minValueForRange();
     float value = valueForRange();
 
     value += range * (percentChange / 100);
     setValue(String::number(value));
 
     axObjectCache()->postNotification(node(), AXObjectCacheImpl::AXValueChanged);
 }
 
 } // namespace blink