Removes direct checking node on AXLayoutObject::determineAccessibilityRole.

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 264 matching lines @@
 
     Node* node = m_layoutObject->node();
     LayoutBoxModelObject* cssBox = layoutBoxModelObject();
 
     if ((cssBox && cssBox->isListItem()) || isHTMLLIElement(node))
         return ListItemRole;
     if (m_layoutObject->isListMarker())
         return ListMarkerRole;
     if (m_layoutObject->isBR())
         return LineBreakRole;
-    if (isHTMLLegendElement(node))
-        return LegendRole;
     if (m_layoutObject->isText())
         return StaticTextRole;
     if (cssBox && isImageOrAltText(cssBox, node)) {
         if (node && node->isLink())
             return ImageMapRole;
         if (isHTMLInputElement(node))
             return ariaHasPopup() ? PopUpButtonRole : ButtonRole;
         if (isSVGImage())
             return SVGRootRole;
         return ImageRole;
     }
     // Note: if JavaScript is disabled, the layoutObject won't be a LayoutHTMLCanvas.
     if (isHTMLCanvasElement(node) && m_layoutObject->isCanvas())
         return CanvasRole;
 
     if (cssBox && cssBox->isLayoutView())
         return WebAreaRole;
 
     if (m_layoutObject->isSVGImage())
         return ImageRole;
     if (m_layoutObject->isSVGRoot())
         return SVGRootRole;
 
-    if (node && node->hasTagName(ddTag))
-        return DescriptionListDetailRole;
-
-    if (node && node->hasTagName(dtTag))
-        return DescriptionListTermRole;
-
-    if (node && (node->nodeName() == "math"))
-        return MathRole;
-
-    if (node && (node->hasTagName(rpTag) || node->hasTagName(rtTag)))
-        return AnnotationRole;
-
     // Table sections should be ignored.
     if (m_layoutObject->isTableSection())
         return IgnoredRole;
 
     if (m_layoutObject->isHR())
         return SplitterRole;
 
-    if (isHTMLFormElement(node))
-        return FormRole;
-
-    if (node && node->hasTagName(articleTag))
-        return ArticleRole;
-
-    if (node && node->hasTagName(mainTag))
-        return MainRole;
-
-    if (node && node->hasTagName(navTag))
-        return NavigationRole;
-
-    if (node && node->hasTagName(asideTag))
-        return ComplementaryRole;
-
-    if (node && node->hasTagName(preTag))
-        return PreRole;
-
-    if (node && node->hasTagName(sectionTag))
-        return RegionRole;
-
-    if (node && node->hasTagName(addressTag))
-        return ContentInfoRole;
-
-    if (node && node->hasTagName(dialogTag))
-        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 (node && node->hasTagName(iframeTag)) {
-        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 && node->hasTagName(headerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
-        return BannerRole;
-    if (node && node->hasTagName(footerTag) && !isDescendantOfElementType(articleTag) && !isDescendantOfElementType(sectionTag))
-        return FooterRole;
-
     AccessibilityRole role = AXNodeObject::determineAccessibilityRoleUtil();
     if (role != UnknownRole)
         return role;
 
     if (m_layoutObject->isLayoutBlockFlow())
         return GroupRole;
 
     // If the element does not have role, but it has ARIA attributes, accessibility should fallback to exposing it as a group.
     if (supportsARIAAttributes())
         return GroupRole;
@@ skipping 1672 matching lines @@
                 break;
             firstChild = newFirstChild;
             if (!firstChild->node())
                 break;
         }
     }
 
     return parent;
 }
 
-bool AXLayoutObject::isDescendantOfElementType(const HTMLQualifiedName& tagName) const
-{
-    for (LayoutObject* parent = m_layoutObject->parent(); parent; parent = parent->parent()) {
-        if (parent->node() && parent->node()->hasTagName(tagName))
-            return true;
-    }
-    return false;
-}
-
 bool AXLayoutObject::isSVGImage() const
 {
     return remoteSVGRootElement();
 }
 
 void AXLayoutObject::detachRemoteSVGRoot()
 {
     if (AXSVGRoot* root = remoteSVGRootElement())
         root->setParent(0);
 }
@@ skipping 251 matching lines @@
         if (label && label->layoutObject()) {
             LayoutRect labelRect = axObjectCache()->getOrCreate(label)->elementRect();
             result.unite(labelRect);
         }
     }
 
     return result;
 }
 
 } // namespace blink