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
+std::string ToUTF8(const blink::WebString& str) {
+  return UTF16ToUTF8(base::StringPiece16(str));
+}
+
+}  // namespace
 
 BlinkAXTreeSource::BlinkAXTreeSource(RenderFrameImpl* render_frame)
     : render_frame_(render_frame),
       accessibility_focus_id_(-1) {
 }
 
 BlinkAXTreeSource::~BlinkAXTreeSource() {
 }
 
 void BlinkAXTreeSource::SetRoot(blink::WebAXObject root) {
@@ skipping 17 matching lines @@
   const blink::WebAXObject& root = GetRoot();
 
   tree_data.title = document.title().utf8();
   tree_data.url = document.url().spec();
   tree_data.mimetype = document.isXHTMLDocument() ? "text/xhtml" : "text/html";
   tree_data.loaded = root.isLoaded();
   tree_data.loading_progress = root.estimatedLoadingProgress();
 
   const WebDocumentType& doctype = document.doctype();
   if (!doctype.isNull())
-    tree_data.doctype = UTF16ToUTF8(base::StringPiece16(doctype.name()));
+    tree_data.doctype = ToUTF8(doctype.name());
 
   WebAXObject anchor_object, focus_object;
   int anchor_offset, focus_offset;
   root.selection(anchor_object, anchor_offset, focus_object, focus_offset);
   if (!anchor_object.isNull() && !focus_object.isNull() &&
       anchor_offset >= 0 && focus_offset >= 0) {
     int32 anchor_id = anchor_object.axID();
     int32 focus_id = focus_object.axID();
     tree_data.sel_anchor_object_id = anchor_id;
     tree_data.sel_anchor_offset = anchor_offset;
@@ skipping 96 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 = UTF16ToUTF8(base::StringPiece16(src.deprecatedTitle()));
+
+  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, ToUTF8(web_name));
+    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(

[aboxhall, 2015/11/13 23:13:49]

more spaces??

[dmazzoni, 2015/11/16 18:52:04]

Same - the code looks fine to me. Is codereview.chromium.org hiding underscores?
It does that for me sometimes.

[aboxhall, 2015/11/16 22:03:27]

Super weird. Yeah, it looks fine now.

+      nameFrom, descriptionFrom, descriptionObjects);
+  if (!web_description.isEmpty()) {
+    dst->AddStringAttribute(ui::AX_ATTR_DESCRIPTION, ToUTF8(web_description));
+    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, ToUTF8(web_placeholder));
 
   std::string value;
   if (src.valueDescription().length()) {
-    dst->AddStringAttribute(ui::AX_ATTR_VALUE,
-                            UTF16ToUTF8(base::StringPiece16(
-                                src.valueDescription())));
+    dst->AddStringAttribute(ui::AX_ATTR_VALUE, ToUTF8(src.valueDescription()));
   } else {
-    dst->AddStringAttribute(
-        ui::AX_ATTR_VALUE,
-        UTF16ToUTF8(base::StringPiece16(src.stringValue())));
+    dst->AddStringAttribute(ui::AX_ATTR_VALUE, ToUTF8(src.stringValue()));
   }
 
   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,
-        UTF16ToUTF8(base::StringPiece16(src.ariaInvalidValue())));
+        ui::AX_ATTR_ARIA_INVALID_VALUE, ToUTF8(src.ariaInvalidValue()));
   }
 
   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 18 matching lines @@
     word_ends.reserve(src_word_starts.size());
     for (size_t i = 0; i < src_word_starts.size(); ++i) {
       word_starts.push_back(src_word_starts[i]);
       word_ends.push_back(src_word_ends[i]);
     }
     dst->AddIntListAttribute(ui::AX_ATTR_WORD_STARTS, word_starts);
     dst->AddIntListAttribute(ui::AX_ATTR_WORD_ENDS, word_ends);
   }
 
   if (src.accessKey().length()) {
-    dst->AddStringAttribute(ui::AX_ATTR_ACCESS_KEY,
-    UTF16ToUTF8(base::StringPiece16(src.accessKey())));
+    dst->AddStringAttribute(ui::AX_ATTR_ACCESS_KEY, ToUTF8(src.accessKey()));
   }
 
   if (src.actionVerb().length())
-    dst->AddStringAttribute(
-        ui::AX_ATTR_ACTION,
-        UTF16ToUTF8(base::StringPiece16(src.actionVerb())));
+    dst->AddStringAttribute(ui::AX_ATTR_ACTION, ToUTF8(src.actionVerb()));
   if (src.ariaAutoComplete().length())
     dst->AddStringAttribute(
-        ui::AX_ATTR_AUTO_COMPLETE,
-        UTF16ToUTF8(base::StringPiece16(src.ariaAutoComplete())));
+        ui::AX_ATTR_AUTO_COMPLETE, ToUTF8(src.ariaAutoComplete()));
   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,
-        UTF16ToUTF8(base::StringPiece16(
-            src.deprecatedAccessibilityDescription())));
-  }
   if (src.hasComputedStyle()) {
     dst->AddStringAttribute(
-        ui::AX_ATTR_DISPLAY,
-        UTF16ToUTF8(base::StringPiece16(src.computedStyleDisplay())));
-  }
-  if (src.deprecatedHelpText().length())
-    dst->AddStringAttribute(
-        ui::AX_ATTR_HELP,
-        UTF16ToUTF8(base::StringPiece16((src.deprecatedHelpText()))));
-  if (src.deprecatedPlaceholder().length()) {
-    dst->AddStringAttribute(
-        ui::AX_ATTR_PLACEHOLDER,
-        UTF16ToUTF8(base::StringPiece16(src.deprecatedPlaceholder())));
+        ui::AX_ATTR_DISPLAY, ToUTF8(src.computedStyleDisplay()));
   }
   if (src.keyboardShortcut().length()) {
     dst->AddStringAttribute(
         ui::AX_ATTR_SHORTCUT,
         UTF16ToUTF8(base::StringPiece16(src.keyboardShortcut())));
   }
-  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 29 matching lines @@
     // TODO(ctguil): The tagName in WebKit is lower cased but
     // HTMLElement::nodeName calls localNameUpper. Consider adding
     // a WebElement method that returns the original lower cased tagName.
     dst->AddStringAttribute(
         ui::AX_ATTR_HTML_TAG,
         base::ToLowerASCII(UTF16ToUTF8(
             base::StringPiece16(element.tagName()))));
     for (unsigned i = 0; i < element.attributeCount(); ++i) {
       std::string name = base::ToLowerASCII(UTF16ToUTF8(
           base::StringPiece16(element.attributeLocalName(i))));
-      std::string value =
-          UTF16ToUTF8(base::StringPiece16(element.attributeValue(i)));
+      std::string value = ToUTF8(element.attributeValue(i));
       dst->html_attributes.push_back(std::make_pair(name, value));
     }
 
     if (src.isEditable()) {
       dst->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_START, src.selectionStart());
       dst->AddIntAttribute(ui::AX_ATTR_TEXT_SEL_END, src.selectionEnd());
 
       WebVector<int> src_line_breaks;
       src.lineBreaks(src_line_breaks);
       if (src_line_breaks.size() > 0) {
         std::vector<int32> line_breaks;
         line_breaks.reserve(src_line_breaks.size());
         for (size_t i = 0; i < src_line_breaks.size(); ++i)
           line_breaks.push_back(src_line_breaks[i]);
         dst->AddIntListAttribute(ui::AX_ATTR_LINE_BREAKS, line_breaks);
       }
     }
 
     // ARIA role.
     if (element.hasAttribute("role")) {
       dst->AddStringAttribute(
-          ui::AX_ATTR_ROLE,
-          UTF16ToUTF8(base::StringPiece16(element.getAttribute("role"))));
+          ui::AX_ATTR_ROLE, ToUTF8(element.getAttribute("role")));
     } else {
       std::string role = GetEquivalentAriaRoleString(dst->role);
       if (!role.empty())
         dst->AddStringAttribute(ui::AX_ATTR_ROLE, role);
       else if (dst->role == ui::AX_ROLE_TIME)
         dst->AddStringAttribute(ui::AX_ATTR_ROLE, "time");
     }
 
     // Browser plugin (used in a <webview>).
     BrowserPlugin* browser_plugin = BrowserPlugin::GetFromNode(element);
@@ skipping 18 matching lines @@
     }
   }
 
   if (src.isInLiveRegion()) {
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_ATOMIC, src.liveRegionAtomic());
     dst->AddBoolAttribute(ui::AX_ATTR_LIVE_BUSY, src.liveRegionBusy());
     if (src.liveRegionBusy())
       dst->state |= (1 << ui::AX_STATE_BUSY);
     if (!src.liveRegionStatus().isEmpty()) {
       dst->AddStringAttribute(
-          ui::AX_ATTR_LIVE_STATUS,
-          UTF16ToUTF8(base::StringPiece16(src.liveRegionStatus())));
+          ui::AX_ATTR_LIVE_STATUS, ToUTF8(src.liveRegionStatus()));
     }
     dst->AddStringAttribute(
-        ui::AX_ATTR_LIVE_RELEVANT,
-        UTF16ToUTF8(base::StringPiece16(src.liveRegionRelevant())));
+        ui::AX_ATTR_LIVE_RELEVANT, ToUTF8(src.liveRegionRelevant()));
     dst->AddBoolAttribute(ui::AX_ATTR_CONTAINER_LIVE_ATOMIC,
                           src.containerLiveRegionAtomic());
     dst->AddBoolAttribute(ui::AX_ATTR_CONTAINER_LIVE_BUSY,
                           src.containerLiveRegionBusy());
     dst->AddStringAttribute(
         ui::AX_ATTR_CONTAINER_LIVE_STATUS,
-        UTF16ToUTF8(base::StringPiece16(src.containerLiveRegionStatus())));
+        ToUTF8(src.containerLiveRegionStatus()));
     dst->AddStringAttribute(
         ui::AX_ATTR_CONTAINER_LIVE_RELEVANT,
-        UTF16ToUTF8(base::StringPiece16(src.containerLiveRegionRelevant())));
+        ToUTF8(src.containerLiveRegionRelevant()));
   }
 
   if (dst->role == ui::AX_ROLE_PROGRESS_INDICATOR ||
       dst->role == ui::AX_ROLE_METER ||
       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 = UTF16ToUTF8(base::StringPiece16(document.title()));
-  }
 
   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