Include relationship ARIA objects in serialized accessibility tree

content/renderer/accessibility/accessibility_node_serializer.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/renderer/accessibility/accessibility_node_serializer.h"
 
 #include <set>
 
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_util.h"
@@ skipping 140 matching lines @@
   if (src.helpText().length())
     dst->AddStringAttribute(ui::AX_ATTR_HELP, UTF16ToUTF8(src.helpText()));
   if (src.keyboardShortcut().length()) {
     dst->AddStringAttribute(ui::AX_ATTR_SHORTCUT,
                             UTF16ToUTF8(src.keyboardShortcut()));
   }
   if (!src.titleUIElement().isDetached()) {
     dst->AddIntAttribute(ui::AX_ATTR_TITLE_UI_ELEMENT,
                          src.titleUIElement().axID());
   }
+  if (!src.activeDescendant().isDetached()) {
+    dst->AddIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID,
+                         src.activeDescendant().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());
   else if ((dst->role == ui::AX_ROLE_TREE_ITEM ||
             dst->role == ui::AX_ROLE_ROW) &&
            src.hierarchicalLevel() > 0) {
     dst->AddIntAttribute(ui::AX_ATTR_HIERARCHICAL_LEVEL,
         src.hierarchicalLevel());
@@ skipping 231 matching lines @@
   }
 
   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();
+  std::vector<int32> indirect_child_ids;
   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);
-    }
+  }
+  if (indirect_child_ids.size() > 0) {
+    dst->AddIntListAttribute(ui::AX_ATTR_INDIRECT_CHILD_IDS,
+                             indirect_child_ids);
+  }
+
+  WebVector<WebAXObject> controls;
+  if (src.controls(controls)) {
+    std::vector<int32> controls_ids;
+    for(size_t i = 0; i < controls.size(); i++)
+      controls_ids.push_back(controls[i].axID());
+    if (controls_ids.size() > 0)
+      dst->AddIntListAttribute(ui::AX_ATTR_CONTROLS_IDS, controls_ids);
+  }
+
+  WebVector<WebAXObject> describedby;
+  if (src.describedby(describedby)) {
+    std::vector<int32> describedby_ids;
+    for(size_t i = 0; i < describedby.size(); i++)

[dmazzoni, 2014/03/11 23:37:52]

Maybe a helper function here too - that goes from WebVector<WebAXObject> and
calls AddIntListAttribute.

[aboxhall, 2014/03/12 17:50:47]

Done.

+      describedby_ids.push_back(describedby[i].axID());
+    if (describedby_ids.size() > 0)
+      dst->AddIntListAttribute(ui::AX_ATTR_DESCRIBEDBY_IDS, describedby_ids);
+  }
+
+  WebVector<WebAXObject> flowTo;
+  if (src.flowTo(flowTo)) {
+    std::vector<int32> flowTo_ids;
+    for(size_t i = 0; i < flowTo.size(); i++)
+      flowTo_ids.push_back(flowTo[i].axID());
+    if (flowTo_ids.size() > 0)
+      dst->AddIntListAttribute(ui::AX_ATTR_FLOWTO_IDS, flowTo_ids);
+  }
+
+  WebVector<WebAXObject> labelledby;
+  if (src.labelledby(labelledby)) {
+    std::vector<int32> labelledby_ids;
+    for(size_t i = 0; i < labelledby.size(); i++)
+      labelledby_ids.push_back(labelledby[i].axID());
+    if (labelledby_ids.size() > 0)
+      dst->AddIntListAttribute(ui::AX_ATTR_LABELLEDBY_IDS, labelledby_ids);
+  }
+
+  WebVector<WebAXObject> owns;
+  if (src.owns(owns)) {
+    std::vector<int32> owns_ids;
+    for(size_t i = 0; i < owns.size(); i++)
+      owns_ids.push_back(owns[i].axID());
+    if (owns_ids.size() > 0)
+      dst->AddIntListAttribute(ui::AX_ATTR_OWNS_IDS, owns_ids);
   }
 }
 
 bool ShouldIncludeChildNode(
     const WebAXObject& parent,
     const WebAXObject& child) {
   // The child may be invalid due to issues in webkit accessibility code.
   // Don't add children that are invalid thus preventing a crash.
   // https://bugs.webkit.org/show_bug.cgi?id=44149
   // TODO(ctguil): We may want to remove this check as webkit stabilizes.
   if (child.isDetached())
     return false;
 
   // Skip children whose parent isn't this - see indirect_child_ids, above.
   // As an exception, include children of an iframe element.
   bool is_iframe = false;
   WebNode node = parent.node();
   if (!node.isNull() && node.isElementNode()) {
     WebElement element = node.to<WebElement>();
     is_iframe = (element.tagName() == base::ASCIIToUTF16("IFRAME"));
   }
 
   return (is_iframe || IsParentUnignoredOf(parent, child));
 }
 
 }  // namespace content