Make use of new AX name calc in Chromium.

content/browser/accessibility/browser_accessibility.cc

 // Copyright (c) 2012 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.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
@@ skipping 252 matching lines @@
   gfx::Rect bounds;
   for (size_t i = 0; i < InternalChildCount() && child_end < start + len; ++i) {
     BrowserAccessibility* child = InternalGetChild(i);
     if (child->GetRole() != ui::AX_ROLE_INLINE_TEXT_BOX) {
       DLOG(WARNING) << "BrowserAccessibility objects with role STATIC_TEXT " <<
           "should have children of role INLINE_TEXT_BOX.";
       continue;
     }
 
     std::string child_text;
-    child->GetStringAttribute(ui::AX_ATTR_VALUE, &child_text);
+    child->GetStringAttribute(ui::AX_ATTR_NAME, &child_text);
     int child_len = static_cast<int>(child_text.size());
     child_start = child_end;
     child_end += child_len;
 
     if (child_end < start)
       continue;
 
     int overlap_start = std::max(start, child_start);
     int overlap_end = std::min(end, child_end);
 
@@ skipping 78 matching lines @@
       int child_start = 0;
       int child_end = 0;
 
       // Go through the inline text boxes.
       for (size_t i = 0; i < InternalChildCount(); ++i) {
         // The next child starts where the previous one ended.
         child_start = child_end;
         BrowserAccessibility* child = InternalGetChild(i);
         DCHECK_EQ(child->GetRole(), ui::AX_ROLE_INLINE_TEXT_BOX);
         const std::string& child_text = child->GetStringAttribute(
-            ui::AX_ATTR_VALUE);
+            ui::AX_ATTR_NAME);
         int child_len = static_cast<int>(child_text.size());
         child_end += child_len; // End is one past the last character.
 
         const std::vector<int32>& word_starts = child->GetIntListAttribute(
             ui::AX_ATTR_WORD_STARTS);
         if (word_starts.empty()) {
           word_start = child_end;
           continue;
         }
 
@@ skipping 335 matching lines @@
   switch (GetRole()) {
     case ui::AX_ROLE_COMBO_BOX:
     case ui::AX_ROLE_SEARCH_BOX:
     case ui::AX_ROLE_TEXT_FIELD:
       return true;
     default:
       return false;
   }
 }
 
+std::string BrowserAccessibility::ComputeAccessibleNameFromDescendants() {
+  std::string name;
+  for (size_t i = 0; i < InternalChildCount(); ++i) {
+    BrowserAccessibility* child = InternalGetChild(i);
+    std::string child_name;
+    if (child->GetStringAttribute(ui::AX_ATTR_NAME, &child_name)) {
+      if (!name.empty())
+        name += " ";
+      name += child_name;
+    } else if (!child->HasState(ui::AX_STATE_FOCUSABLE)) {
+      child_name = child->ComputeAccessibleNameFromDescendants();
+      if (!child_name.empty()) {
+        if (!name.empty())
+          name += " ";
+        name += child_name;
+      }
+    }
+  }
+
+  return name;
+}
+
 int BrowserAccessibility::GetStaticTextLenRecursive() const {
   if (GetRole() == ui::AX_ROLE_STATIC_TEXT ||
       GetRole() == ui::AX_ROLE_LINE_BREAK) {
-    return static_cast<int>(GetStringAttribute(ui::AX_ATTR_VALUE).size());
+    return static_cast<int>(GetStringAttribute(ui::AX_ATTR_NAME).size());
   }
 
   int len = 0;
   for (size_t i = 0; i < InternalChildCount(); ++i)
     len += InternalGetChild(i)->GetStaticTextLenRecursive();
   return len;
 }
 
 void BrowserAccessibility::FixEmptyBounds(gfx::Rect* bounds) const
 {
@@ skipping 55 matching lines @@
       }
       need_to_offset_web_area = true;
     }
     parent = parent->GetParent();
   }
 
   return bounds;
 }
 
 }  // namespace content