Updated descendant condition for header/footer AX role mapping.

third_party/WebKit/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 402 matching lines @@
       return 0;
   }
   // 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.
   if (isRequiredOwnedElement(parent, roleValue(), element))
     return parent;
   return 0;
 }
 
+// There should only be one banner/contentInfo per page. If header/footer are
+// being used within an article, aside, nave, section, blockquote, details,
+// fieldset, figure, td, or main, then it should not be exposed as whole
+// page's banner/contentInfo.
+static HashSet<QualifiedName>& getLandmarkRolesNotAllowed() {
+  DEFINE_STATIC_LOCAL(HashSet<QualifiedName>, landmarkRolesNotAllowed, ());
+  if (landmarkRolesNotAllowed.isEmpty()) {
+    landmarkRolesNotAllowed.add(articleTag);
+    landmarkRolesNotAllowed.add(asideTag);
+    landmarkRolesNotAllowed.add(navTag);
+    landmarkRolesNotAllowed.add(sectionTag);
+    landmarkRolesNotAllowed.add(blockquoteTag);
+    landmarkRolesNotAllowed.add(detailsTag);
+    landmarkRolesNotAllowed.add(fieldsetTag);
+    landmarkRolesNotAllowed.add(figureTag);
+    landmarkRolesNotAllowed.add(tdTag);
+    landmarkRolesNotAllowed.add(mainTag);
+  }
+  return landmarkRolesNotAllowed;
+}
+
 bool AXNodeObject::isDescendantOfElementType(
-    const HTMLQualifiedName& tagName) const {
+    HashSet<QualifiedName>& tagNames) const {
   if (!getNode())
     return false;
 
   for (Element* parent = getNode()->parentElement(); parent;
        parent = parent->parentElement()) {
-    if (parent->hasTagName(tagName))
+    if (tagNames.contains(parent->tagQName()))
       return true;
   }
   return false;
 }
 
 AccessibilityRole AXNodeObject::nativeAccessibilityRoleIgnoringAria() const {
   if (!getNode())
     return UnknownRole;
 
   // HTMLAnchorElement sets isLink only when it has hrefAttr.
@@ skipping 156 matching lines @@
     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 but as a group role.
   if (getNode()->hasTagName(headerTag)) {
-    if (isDescendantOfElementType(articleTag) ||
-        isDescendantOfElementType(sectionTag) ||
-        (getNode()->parentElement() &&
-         getNode()->parentElement()->hasTagName(mainTag))) {
+    if (isDescendantOfElementType(getLandmarkRolesNotAllowed()))
       return GroupRole;
-    }
     return BannerRole;
   }
 
   if (getNode()->hasTagName(footerTag)) {
-    if (isDescendantOfElementType(articleTag) ||
-        isDescendantOfElementType(sectionTag) ||
-        (getNode()->parentElement() &&
-         getNode()->parentElement()->hasTagName(mainTag))) {
+    if (isDescendantOfElementType(getLandmarkRolesNotAllowed()))
       return GroupRole;
-    }
     return FooterRole;
   }
 
   if (getNode()->hasTagName(blockquoteTag))
     return BlockquoteRole;
 
   if (getNode()->hasTagName(captionTag))
     return CaptionRole;
 
   if (getNode()->hasTagName(figcaptionTag))
@@ skipping 2469 matching lines @@
     return String();
   return toTextControlElement(node)->strippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->trace(m_node);
   AXObject::trace(visitor);
 }
 
 }  // namespace blink