Name calculation should not include nameFrom:author descendants.

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 529 matching lines @@
     return select_element.IsMultiple() ? kListBoxRole : kPopUpButtonRole;
   }
 
   if (isHTMLTextAreaElement(*GetNode()))
     return kTextFieldRole;
 
   if (HeadingLevel())
     return kHeadingRole;
 
   if (isHTMLDivElement(*GetNode()))
-    return kDivRole;
+    return kGenericContainerRole;
 
   if (isHTMLMeterElement(*GetNode()))
     return kMeterRole;
 
   if (isHTMLOutputElement(*GetNode()))
     return kStatusRole;
 
   if (isHTMLParagraphElement(*GetNode()))
     return kParagraphRole;
 
@@ skipping 67 matching lines @@
   if (isHTMLIFrameElement(*GetNode())) {
     const AtomicString& aria_role =
         GetAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
     if (aria_role == "none" || aria_role == "presentation")
       return kIframePresentationalRole;
     return kIframeRole;
   }
 
   // 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.
+  // whole page's banner/contentInfo but as a generic container role.
   if (GetNode()->HasTagName(headerTag)) {
     if (IsDescendantOfElementType(GetLandmarkRolesNotAllowed()))
-      return kGroupRole;
+      return kGenericContainerRole;
     return kBannerRole;
   }
 
   if (GetNode()->HasTagName(footerTag)) {
     if (IsDescendantOfElementType(GetLandmarkRolesNotAllowed()))
-      return kGroupRole;
+      return kGenericContainerRole;
     return kFooterRole;
   }
 
   if (GetNode()->HasTagName(blockquoteTag))
     return kBlockquoteRole;
 
   if (GetNode()->HasTagName(captionTag))
     return kCaptionRole;
 
   if (GetNode()->HasTagName(figcaptionTag))
@@ skipping 28 matching lines @@
 
   AccessibilityRole role = NativeAccessibilityRoleIgnoringAria();
   if (role != kUnknownRole)
     return role;
   if (GetNode()->IsElementNode()) {
     Element* element = ToElement(GetNode());
     // A generic element with tabIndex explicitly set gets GroupRole.
     // The layout checks for focusability aren't critical here; a false
     // positive would be harmless.
     if (element->IsInCanvasSubtree() && element->SupportsFocus())
-      return kGroupRole;
+      return kGenericContainerRole;
   }
   return kUnknownRole;
 }
 
 AccessibilityRole AXNodeObject::DetermineAriaRoleAttribute() const {
   const AtomicString& aria_role =
       GetAOMPropertyOrARIAAttribute(AOMStringProperty::kRole);
   if (aria_role.IsNull() || aria_role.IsEmpty())
     return kUnknownRole;
 
@@ skipping 1158 matching lines @@
   text_alternative =
       NativeTextAlternative(visited, name_from, related_objects, name_sources,
                             &found_text_alternative);
   const bool has_text_alternative =
       !text_alternative.IsEmpty() ||
       name_from == kAXNameFromAttributeExplicitlyEmpty;
   if (has_text_alternative && !name_sources)
     return text_alternative;
 
   // Step 2F / 2G from: http://www.w3.org/TR/accname-aam-1.1
-  if (recursive || NameFromContents()) {
-    name_from = kAXNameFromContents;
-    if (name_sources) {
-      name_sources->push_back(NameSource(found_text_alternative));
-      name_sources->back().type = name_from;
-    }
+  if (in_aria_labelled_by_traversal || NameFromContents(recursive)) {
+    Node* node = this->GetNode();
+    if (!isHTMLSelectElement(node)) {  // Avoid option descendant text
+      name_from = kAXNameFromContents;
+      if (name_sources) {
+        name_sources->push_back(NameSource(found_text_alternative));
+        name_sources->back().type = name_from;
+      }
 
-    Node* node = this->GetNode();
-    if (node && node->IsTextNode())
-      text_alternative = ToText(node)->wholeText();
-    else if (isHTMLBRElement(node))
-      text_alternative = String("\n");
-    else
-      text_alternative = TextFromDescendants(visited, false);
+      if (node && node->IsTextNode())
+        text_alternative = ToText(node)->wholeText();
+      else if (isHTMLBRElement(node))
+        text_alternative = String("\n");
+      else
+        text_alternative = TextFromDescendants(visited, false);
 
-    if (!text_alternative.IsEmpty()) {
-      if (name_sources) {
-        found_text_alternative = true;
-        name_sources->back().text = text_alternative;
-      } else {
-        return text_alternative;
+      if (!text_alternative.IsEmpty()) {
+        if (name_sources) {
+          found_text_alternative = true;
+          name_sources->back().text = text_alternative;
+        } else {
+          return text_alternative;
+        }
       }
     }
   }
 
   // Step 2H from: http://www.w3.org/TR/accname-aam-1.1
   name_from = kAXNameFromTitle;
   if (name_sources) {
     name_sources->push_back(NameSource(found_text_alternative, titleAttr));
     name_sources->back().type = name_from;
   }
@@ skipping 111 matching lines @@
     html_element = ToHTMLElement(GetNode());
   if (html_element && IsLabelableElement(html_element)) {
     if (ToLabelableElement(html_element)->labels() &&
         ToLabelableElement(html_element)->labels()->length() > 0)
       return true;
   }
 
   return false;
 }
 
-bool AXNodeObject::NameFromContents() const {
-  Node* node = GetNode();
-  if (!node || !node->IsElementNode())
-    return AXObjectImpl::NameFromContents();
-  // AXObjectImpl::nameFromContents determines whether an element should take
-  // its name from its descendant contents based on role. However, <select> is a
-  // special case, as unlike a typical pop-up button it contains its own pop-up
-  // menu's contents, which should not be used as the name.
-  if (isHTMLSelectElement(node))
-    return false;
-  return AXObjectImpl::NameFromContents();
-}
-
 void AXNodeObject::GetRelativeBounds(
     AXObjectImpl** out_container,
     FloatRect& out_bounds_in_container,
     SkMatrix44& out_container_transform) const {
   if (LayoutObjectForRelativeBounds()) {
     AXObjectImpl::GetRelativeBounds(out_container, out_bounds_in_container,
                                     out_container_transform);
     return;
   }
 
@@ skipping 1180 matching lines @@
     return String();
   return ToTextControlElement(node)->StrippedPlaceholder();
 }
 
 DEFINE_TRACE(AXNodeObject) {
   visitor->Trace(node_);
   AXObjectImpl::Trace(visitor);
 }
 
 }  // namespace blink