Name calculation should not include nameFrom:author descendants.

content/browser/accessibility/browser_accessibility_com_win.cc

 // Copyright (c) 2017 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/accessibility/browser_accessibility_com_win.h"
 
 #include <UIAutomationClient.h>
 #include <UIAutomationCoreApi.h>
 
 #include <algorithm>
@@ skipping 5267 matching lines @@
       break;
     case ui::AX_ROLE_CONTENT_INFO:
       ia_role = ROLE_SYSTEM_TEXT;
       ia2_role = IA2_ROLE_PARAGRAPH;
       break;
     case ui::AX_ROLE_DATE:
     case ui::AX_ROLE_DATE_TIME:
       ia_role = ROLE_SYSTEM_DROPLIST;
       ia2_role = IA2_ROLE_DATE_EDITOR;
       break;
-    case ui::AX_ROLE_DIV:
-      role_name = L"div";
-      ia_role = ROLE_SYSTEM_GROUPING;
-      ia2_role = IA2_ROLE_SECTION;
-      break;
     case ui::AX_ROLE_DEFINITION:
       role_name = html_tag;
       ia2_role = IA2_ROLE_PARAGRAPH;
       ia_state |= STATE_SYSTEM_READONLY;
       break;
     case ui::AX_ROLE_DESCRIPTION_LIST_DETAIL:
       role_name = html_tag;
       ia_role = ROLE_SYSTEM_TEXT;
       ia2_role = IA2_ROLE_PARAGRAPH;
       break;
@@ skipping 45 matching lines @@
       ia_role = ROLE_SYSTEM_GROUPING;
       break;
     case ui::AX_ROLE_FORM:
       role_name = L"form";
       ia2_role = IA2_ROLE_FORM;
       break;
     case ui::AX_ROLE_FOOTER:
       ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_FOOTER;
       break;
+    case ui::AX_ROLE_GENERIC_CONTAINER:
+      ia_role = ROLE_SYSTEM_GROUPING;
+      ia2_role = IA2_ROLE_SECTION;
+      role_name = html_tag.empty() ? L"div" : html_tag;
+      break;
     case ui::AX_ROLE_GRID:
       ia_role = ROLE_SYSTEM_TABLE;
       // TODO(aleventhal) this changed between ARIA 1.0 and 1.1,
       // need to determine whether grids/treegrids should really be readonly
       // or editable by default
       // ia_state |= STATE_SYSTEM_READONLY;
       break;
-    case ui::AX_ROLE_GROUP: {
-      base::string16 aria_role =
-          owner()->GetString16Attribute(ui::AX_ATTR_ROLE);
-      if (aria_role == L"group" || html_tag == L"fieldset") {
-        ia_role = ROLE_SYSTEM_GROUPING;
-      } else if (html_tag == L"li") {
-        ia_role = ROLE_SYSTEM_LISTITEM;
-        ia_state |= STATE_SYSTEM_READONLY;
-      } else {
-        if (html_tag.empty())
-          role_name = L"div";
-        else
-          role_name = html_tag;
-        ia2_role = IA2_ROLE_SECTION;
-      }
+    case ui::AX_ROLE_GROUP:
+      ia_role = ROLE_SYSTEM_GROUPING;
       break;
-    }
     case ui::AX_ROLE_HEADING:
       role_name = html_tag;
       if (html_tag.empty())
         ia_role = ROLE_SYSTEM_GROUPING;
       ia2_role = IA2_ROLE_HEADING;
       break;
     case ui::AX_ROLE_IFRAME:
       ia_role = ROLE_SYSTEM_DOCUMENT;
       ia2_role = IA2_ROLE_INTERNAL_FRAME;
       ia_state = STATE_SYSTEM_READONLY;
@@ skipping 330 matching lines @@
 
 BrowserAccessibilityComWin* ToBrowserAccessibilityComWin(
     BrowserAccessibility* obj) {
   if (!obj || !obj->IsNative())
     return nullptr;
   auto* result = static_cast<BrowserAccessibilityWin*>(obj)->GetCOM();
   return result;
 }
 
 }  // namespace content