Make use of new AX name calc in Chromium.

content/renderer/accessibility/blink_ax_tree_source.cc

 // Copyright 2014 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/renderer/accessibility/blink_ax_tree_source.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 90 matching lines @@
 void AddIntListAttributeFromWebObjects(ui::AXIntListAttribute attr,
                                        WebVector<WebAXObject> objects,
                                        AXContentNodeData* dst) {
   std::vector<int32> ids;
   for(size_t i = 0; i < objects.size(); i++)
     ids.push_back(objects[i].axID());
   if (ids.size() > 0)
     dst->AddIntListAttribute(attr, ids);
 }
 
-}  // Anonymous namespace
+}  // namespace
 
 BlinkAXTreeSource::BlinkAXTreeSource(RenderFrameImpl* render_frame)
     : render_frame_(render_frame),
       accessibility_focus_id_(-1) {
 }
 
 BlinkAXTreeSource::~BlinkAXTreeSource() {
 }
 
 void BlinkAXTreeSource::SetRoot(blink::WebAXObject root) {
@@ skipping 134 matching lines @@
 blink::WebAXObject BlinkAXTreeSource::GetNull() const {
   return blink::WebAXObject();
 }
 
 void BlinkAXTreeSource::SerializeNode(blink::WebAXObject src,
                                       AXContentNodeData* dst) const {
   dst->role = AXRoleFromBlink(src.role());
   dst->state = AXStateFromBlink(src);
   dst->location = src.boundingBoxRect();
   dst->id = src.axID();
-  std::string name = src.deprecatedTitle().utf8();
+
+  blink::WebAXNameFrom nameFrom;
+  blink::WebVector<blink::WebAXObject> nameObjects;
+  blink::WebString web_name = src.name(nameFrom, nameObjects);
+  if (!web_name.isEmpty()) {
+    dst->AddStringAttribute(ui::AX_ATTR_NAME, web_name.utf8());
+    dst->AddIntAttribute(ui::AX_ATTR_NAME_FROM, AXNameFromFromBlink(nameFrom));
+    AddIntListAttributeFromWebObjects(
+        ui::AX_ATTR_LABELLEDBY_IDS, nameObjects, dst);
+  }
+
+  blink::WebAXDescriptionFrom descriptionFrom;
+  blink::WebVector<blink::WebAXObject> descriptionObjects;
+  blink::WebString web_description = src.description(
+      nameFrom, descriptionFrom, descriptionObjects);
+  if (!web_description.isEmpty()) {
+    dst->AddStringAttribute(ui::AX_ATTR_DESCRIPTION, web_description.utf8());
+    dst->AddIntAttribute(ui::AX_ATTR_DESCRIPTION_FROM,
+        AXDescriptionFromFromBlink(descriptionFrom));
+    AddIntListAttributeFromWebObjects(
+        ui::AX_ATTR_DESCRIBEDBY_IDS, descriptionObjects, dst);
+  }
+
+  blink::WebString web_placeholder = src.placeholder(nameFrom, descriptionFrom);
+  if (!web_placeholder.isEmpty())
+    dst->AddStringAttribute(ui::AX_ATTR_PLACEHOLDER, web_placeholder.utf8());
 
   std::string value;
   if (src.valueDescription().length()) {
     dst->AddStringAttribute(ui::AX_ATTR_VALUE, src.valueDescription().utf8());
   } else {
     dst->AddStringAttribute(ui::AX_ATTR_VALUE, src.stringValue().utf8());
   }
 
   if (dst->role == ui::AX_ROLE_COLOR_WELL)
     dst->AddIntAttribute(ui::AX_ATTR_COLOR_VALUE, src.colorValue());
 
 
   // Text attributes.
   if (src.backgroundColor())
     dst->AddIntAttribute(ui::AX_ATTR_BACKGROUND_COLOR, src.backgroundColor());
 
   if (src.color())
     dst->AddIntAttribute(ui::AX_ATTR_COLOR, src.color());
 
   // Font size is in pixels.
   if (src.fontSize())
     dst->AddFloatAttribute(ui::AX_ATTR_FONT_SIZE, src.fontSize());
 
   if (src.invalidState()) {
     dst->AddIntAttribute(ui::AX_ATTR_INVALID_STATE,
                          AXInvalidStateFromBlink(src.invalidState()));
   }
   if (src.invalidState() == blink::WebAXInvalidStateOther) {
     dst->AddStringAttribute(
-        ui::AX_ATTR_ARIA_INVALID_VALUE,
-        src.ariaInvalidValue().utf8());
+        ui::AX_ATTR_ARIA_INVALID_VALUE, src.ariaInvalidValue().utf8());
   }
 
   if (src.textDirection()) {
     dst->AddIntAttribute(ui::AX_ATTR_TEXT_DIRECTION,
                          AXTextDirectionFromBlink(src.textDirection()));
   }
 
   if (src.textStyle()) {
     dst->AddIntAttribute(ui::AX_ATTR_TEXT_STYLE,
                          AXTextStyleFromBlink(src.textStyle()));
@@ skipping 34 matching lines @@
   if (src.ariaAutoComplete().length())
     dst->AddStringAttribute(
         ui::AX_ATTR_AUTO_COMPLETE,
         src.ariaAutoComplete().utf8());
   if (src.isAriaReadOnly())
     dst->AddBoolAttribute(ui::AX_ATTR_ARIA_READONLY, true);
   if (src.isButtonStateMixed())
     dst->AddBoolAttribute(ui::AX_ATTR_BUTTON_MIXED, true);
   if (src.canSetValueAttribute())
     dst->AddBoolAttribute(ui::AX_ATTR_CAN_SET_VALUE, true);
-  if (src.deprecatedAccessibilityDescription().length()) {
-    dst->AddStringAttribute(
-        ui::AX_ATTR_DESCRIPTION,
-        src.deprecatedAccessibilityDescription().utf8());
-  }
   if (src.hasComputedStyle()) {
     dst->AddStringAttribute(
-        ui::AX_ATTR_DISPLAY,
-        src.computedStyleDisplay().utf8());
-  }
-  if (src.deprecatedHelpText().length())
-    dst->AddStringAttribute(ui::AX_ATTR_HELP, src.deprecatedHelpText().utf8());
-  if (src.deprecatedPlaceholder().length()) {
-    dst->AddStringAttribute(
-        ui::AX_ATTR_PLACEHOLDER,
-        src.deprecatedPlaceholder().utf8());
+        ui::AX_ATTR_DISPLAY, src.computedStyleDisplay().utf8());
   }
   if (src.keyboardShortcut().length()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_SHORTCUT,
         src.keyboardShortcut().utf8());
   }
-  if (!src.deprecatedTitleUIElement().isDetached()) {
-    dst->AddIntAttribute(ui::AX_ATTR_TITLE_UI_ELEMENT,
-                         src.deprecatedTitleUIElement().axID());
-  }
   if (!src.ariaActiveDescendant().isDetached()) {
     dst->AddIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID,
                          src.ariaActiveDescendant().axID());
   }
 
   if (!src.url().isEmpty())
     dst->AddStringAttribute(ui::AX_ATTR_URL, src.url().spec());
 
   if (dst->role == ui::AX_ROLE_HEADING)
     dst->AddIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL, src.headingLevel());
@@ skipping 120 matching lines @@
       dst->role == ui::AX_ROLE_SCROLL_BAR ||
       dst->role == ui::AX_ROLE_SLIDER ||
       dst->role == ui::AX_ROLE_SPIN_BUTTON) {
     dst->AddFloatAttribute(ui::AX_ATTR_VALUE_FOR_RANGE, src.valueForRange());
     dst->AddFloatAttribute(ui::AX_ATTR_MAX_VALUE_FOR_RANGE,
                            src.maxValueForRange());
     dst->AddFloatAttribute(ui::AX_ATTR_MIN_VALUE_FOR_RANGE,
                            src.minValueForRange());
   }
 
-  if (dst->role == ui::AX_ROLE_WEB_AREA) {
+  if (dst->role == ui::AX_ROLE_WEB_AREA)
     dst->AddStringAttribute(ui::AX_ATTR_HTML_TAG, "#document");
-    const WebDocument& document = src.document();
-    if (name.empty())
-      name = document.title().utf8();
-  }
 
   if (dst->role == ui::AX_ROLE_TABLE) {
     int column_count = src.columnCount();
     int row_count = src.rowCount();
     if (column_count > 0 && row_count > 0) {
       std::set<int32> unique_cell_id_set;
       std::vector<int32> cell_ids;
       std::vector<int32> unique_cell_ids;
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_COLUMN_COUNT, column_count);
       dst->AddIntAttribute(ui::AX_ATTR_TABLE_ROW_COUNT, row_count);
@@ skipping 42 matching lines @@
     dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_INDEX, src.cellRowIndex());
     dst->AddIntAttribute(ui::AX_ATTR_TABLE_CELL_ROW_SPAN, src.cellRowSpan());
   }
 
   if ((dst->role == ui::AX_ROLE_ROW_HEADER ||
       dst->role == ui::AX_ROLE_COLUMN_HEADER) && src.sortDirection()) {
     dst->AddIntAttribute(ui::AX_ATTR_SORT_DIRECTION,
                          AXSortDirectionFromBlink(src.sortDirection()));
   }
 
-  dst->AddStringAttribute(ui::AX_ATTR_NAME, name);
-
   // Add the ids of *indirect* children - those who are children of this node,
   // but whose parent is *not* this node. One example is a table
   // cell, which is a child of both a row and a column. Because the cell's
   // parent is the row, the row adds it as a child, and the column adds it
   // as an indirect child.
   int child_count = src.childCount();
   for (int i = 0; i < child_count; ++i) {
     WebAXObject child = src.childAt(i);
     std::vector<int32> indirect_child_ids;
     if (!is_iframe && !child.isDetached() && !IsParentUnignoredOf(src, child))
       indirect_child_ids.push_back(child.axID());
     if (indirect_child_ids.size() > 0) {
       dst->AddIntListAttribute(
           ui::AX_ATTR_INDIRECT_CHILD_IDS, indirect_child_ids);
     }
   }
 
   WebVector<WebAXObject> controls;
   if (src.ariaControls(controls))
     AddIntListAttributeFromWebObjects(ui::AX_ATTR_CONTROLS_IDS, controls, dst);
 
-  WebVector<WebAXObject> describedby;
-  if (src.deprecatedAriaDescribedby(describedby)) {
-    AddIntListAttributeFromWebObjects(
-        ui::AX_ATTR_DESCRIBEDBY_IDS, describedby, dst);
-  }
-
   WebVector<WebAXObject> flowTo;
   if (src.ariaFlowTo(flowTo))
     AddIntListAttributeFromWebObjects(ui::AX_ATTR_FLOWTO_IDS, flowTo, dst);
 
-  WebVector<WebAXObject> labelledby;
-  if (src.deprecatedAriaLabelledby(labelledby)) {
-    AddIntListAttributeFromWebObjects(
-        ui::AX_ATTR_LABELLEDBY_IDS, labelledby, dst);
-  }
-
-  WebVector<WebAXObject> owns;
-  if (src.ariaOwns(owns))
-    AddIntListAttributeFromWebObjects(ui::AX_ATTR_OWNS_IDS, owns, dst);
-
-
   if (src.isScrollableContainer()) {
     const gfx::Point& scrollOffset = src.scrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X, scrollOffset.x());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y, scrollOffset.y());
 
     const gfx::Point& minScrollOffset = src.minimumScrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MIN, minScrollOffset.x());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MIN, minScrollOffset.y());
 
     const gfx::Point& maxScrollOffset = src.maximumScrollOffset();
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_X_MAX, maxScrollOffset.x());
     dst->AddIntAttribute(ui::AX_ATTR_SCROLL_Y_MAX, maxScrollOffset.y());
   }
 }
 
 blink::WebDocument BlinkAXTreeSource::GetMainDocument() const {
   if (render_frame_ && render_frame_->GetWebFrame())
     return render_frame_->GetWebFrame()->document();
   return WebDocument();
 }
 
 }  // namespace content