Aria-details takes an ID reference, not an ID reference list

BUG=644766

Review-Url: https://codereview.chromium.org/2946673003
Cr-Commit-Position: refs/heads/master@{#480877}

content/browser/accessibility/browser_accessibility_com_win.cc

@@ -3801,8 +3801,14 @@ void BrowserAccessibilityComWin::UpdateStep1ComputeWinAttributes() {
                             ui::AX_ATTR_FLOWTO_IDS);
   AddBidirectionalRelations(IA2_RELATION_LABELLED_BY, IA2_RELATION_LABEL_FOR,
                             ui::AX_ATTR_LABELLEDBY_IDS);
-  AddBidirectionalRelations(IA2_RELATION_DETAILS, IA2_RELATION_DETAILS_FOR,
-                            ui::AX_ATTR_DETAILS_IDS);
+
+  int32_t details_id;
+  if (GetIntAttribute(ui::AX_ATTR_DETAILS_ID, &details_id)) {
+    std::vector<int32_t> details_ids;
+    details_ids.push_back(details_id);
+    AddBidirectionalRelations(IA2_RELATION_DETAILS, IA2_RELATION_DETAILS_FOR,
+                              details_ids);
+  }
 
   int member_of_id;
   if (owner()->GetIntAttribute(ui::AX_ATTR_MEMBER_OF_ID, &member_of_id))
@@ -4813,6 +4819,13 @@ void BrowserAccessibilityComWin::AddBidirectionalRelations(
 
   const std::vector<int32_t>& target_ids =
       owner()->GetIntListAttribute(attribute);
+  AddBidirectionalRelations(relation_type, reverse_relation_type, target_ids);
+}
+
+void BrowserAccessibilityComWin::AddBidirectionalRelations(
+    const base::string16& relation_type,
+    const base::string16& reverse_relation_type,
+    const std::vector<int32_t>& target_ids) {
   // Reflexive relations don't need to be exposed through IA2.
   std::vector<int32_t> filtered_target_ids;
   int32_t current_id = owner()->GetId();

content/browser/accessibility/browser_accessibility_com_win.h

@@ -909,6 +909,9 @@ class __declspec(uuid("562072fe-3390-43b1-9e2c-dd4118f5ac79"))
   void AddBidirectionalRelations(const base::string16& relation_type,
                                  const base::string16& reverse_relation_type,
                                  ui::AXIntListAttribute attribute);
+  void AddBidirectionalRelations(const base::string16& relation_type,
+                                 const base::string16& reverse_relation_type,
+                                 const std::vector<int32_t>& target_ids);
   // Clears all the forward relations from this object to any other object and
   // the associated  reverse relations on the other objects, but leaves any
   // reverse relations on this object alone.

content/renderer/accessibility/blink_ax_tree_source.cc

@@ -103,6 +103,9 @@ class AXContentNodeDataSparseAttributeAdapter
       case WebAXObjectAttribute::kAriaActiveDescendant:
         dst_->AddIntAttribute(ui::AX_ATTR_ACTIVEDESCENDANT_ID, value.AxID());
         break;
+      case WebAXObjectAttribute::kAriaDetails:
+        dst_->AddIntAttribute(ui::AX_ATTR_DETAILS_ID, value.AxID());
+        break;
       case WebAXObjectAttribute::kAriaErrorMessage:
         dst_->AddIntAttribute(ui::AX_ATTR_ERRORMESSAGE_ID, value.AxID());
         break;
@@ -119,10 +122,6 @@ class AXContentNodeDataSparseAttributeAdapter
         AddIntListAttributeFromWebObjects(ui::AX_ATTR_CONTROLS_IDS, value,
                                           dst_);
         break;
-      case WebAXObjectVectorAttribute::kAriaDetails:
-        AddIntListAttributeFromWebObjects(ui::AX_ATTR_DETAILS_IDS, value,
-                                          dst_);
-        break;
       case WebAXObjectVectorAttribute::kAriaFlowTo:
         AddIntListAttributeFromWebObjects(ui::AX_ATTR_FLOWTO_IDS, value, dst_);
         break;

content/test/data/accessibility/aria/aria-details-expected-blink.txt

 rootWebArea
 ++genericContainer
-++++textField detailsIds=paragraph
+++++textField detailsId=paragraph
 ++paragraph
 ++++staticText name='Details'
 ++++++inlineTextBox name='Details'

third_party/WebKit/LayoutTests/inspector-protocol/accessibility/accessibility-aria-1.1-expected.txt

@@ -2,8 +2,7 @@
 This text field has an error!
 
 
-Details 1
-Details 2
+Details
 Select All  
 {
   "nodeId": "<string>",
@@ -129,16 +128,11 @@ Select All
     {
       "name": "details",
       "value": {
-        "type": "idrefList",
-        "value": "",
+        "type": "idref",
         "relatedNodes": [
           {
-            "idref": "d1",
-            "nodeResult": "div#d1"
-          },
-          {
-            "idref": "d2",
-            "nodeResult": "div#d2"
+            "idref": "d",
+            "nodeResult": "div#d"
           }
         ]
       }

third_party/WebKit/LayoutTests/inspector-protocol/accessibility/accessibility-aria-1.1.html

@@ -18,9 +18,8 @@ function test()
   <input data-dump aria-errormessage="err">
   <h3 id="err">This text field has an error!</h3>
 
-  <img data-dump aria-details="d1 d2" aria-label="Label">
-  <div id="d1">Details 1</div>
-  <div id="d2">Details 2</div>
+  <img data-dump aria-details="d" aria-label="Label">
+  <div id="d">Details</div>
 
   <button data-dump aria-keyshortcuts="Ctrl+A">Select All</button>
 

third_party/WebKit/Source/modules/accessibility/AXNodeObject.cpp

@@ -200,7 +200,7 @@ static AXSparseAttributeSetterMap& GetSparseAttributeSetterMap() {
         new ObjectVectorAttributeSetter(AXObjectVectorAttribute::kAriaFlowTo));
     ax_sparse_attribute_setter_map.Set(
         aria_detailsAttr,
-        new ObjectVectorAttributeSetter(AXObjectVectorAttribute::kAriaDetails));
+        new ObjectAttributeSetter(AXObjectAttribute::kAriaDetails));
     ax_sparse_attribute_setter_map.Set(
         aria_errormessageAttr,
         new ObjectAttributeSetter(AXObjectAttribute::kAriaErrorMessage));

third_party/WebKit/Source/modules/accessibility/AXObject.cpp

@@ -246,8 +246,8 @@ STATIC_ASSERT_ENUM(WebAXObjectAttribute::kAriaErrorMessage,
                    AXObjectAttribute::kAriaErrorMessage);
 STATIC_ASSERT_ENUM(WebAXObjectVectorAttribute::kAriaControls,
                    AXObjectVectorAttribute::kAriaControls);
-STATIC_ASSERT_ENUM(WebAXObjectVectorAttribute::kAriaDetails,
-                   AXObjectVectorAttribute::kAriaDetails);
+STATIC_ASSERT_ENUM(WebAXObjectAttribute::kAriaDetails,
+                   AXObjectAttribute::kAriaDetails);
 STATIC_ASSERT_ENUM(WebAXObjectVectorAttribute::kAriaFlowTo,
                    AXObjectVectorAttribute::kAriaFlowTo);
 #undef STATIC_ASSERT_ENUM

third_party/WebKit/Source/modules/accessibility/AXObject.h

@@ -246,12 +246,12 @@ enum class AXStringAttribute {
 
 enum class AXObjectAttribute {
   kAriaActiveDescendant,
+  kAriaDetails,
   kAriaErrorMessage,
 };
 
 enum class AXObjectVectorAttribute {
   kAriaControls,
-  kAriaDetails,
   kAriaFlowTo,
 };
 

third_party/WebKit/Source/modules/accessibility/InspectorAccessibilityAgent.cpp

@@ -355,6 +355,11 @@ class SparseAttributeAXPropertyAdapter
             CreateProperty(AXRelationshipAttributesEnum::Activedescendant,
                            CreateRelatedNodeListValue(object)));
         break;
+      case AXObjectAttribute::kAriaDetails:
+        properties_.addItem(
+            CreateProperty(AXRelationshipAttributesEnum::Details,
+                           CreateRelatedNodeListValue(object)));
+        break;
       case AXObjectAttribute::kAriaErrorMessage:
         properties_.addItem(
             CreateProperty(AXRelationshipAttributesEnum::Errormessage,
@@ -371,11 +376,6 @@ class SparseAttributeAXPropertyAdapter
             AXRelationshipAttributesEnum::Controls, objects, aria_controlsAttr,
             *ax_object_));
         break;
-      case AXObjectVectorAttribute::kAriaDetails:
-        properties_.addItem(CreateRelatedNodeListProperty(
-            AXRelationshipAttributesEnum::Details, objects, aria_controlsAttr,
-            *ax_object_));
-        break;
       case AXObjectVectorAttribute::kAriaFlowTo:
         properties_.addItem(CreateRelatedNodeListProperty(
             AXRelationshipAttributesEnum::Flowto, objects, aria_flowtoAttr,

third_party/WebKit/public/web/WebAXEnums.h

@@ -379,6 +379,7 @@ enum class WebAXStringAttribute {
 // sparse attribute the default value must be the null WebAXObject.
 enum class WebAXObjectAttribute {
   kAriaActiveDescendant,
+  kAriaDetails,
   kAriaErrorMessage,
 };
 
@@ -388,7 +389,6 @@ enum class WebAXObjectAttribute {
 // empty vector.
 enum class WebAXObjectVectorAttribute {
   kAriaControls,
-  kAriaDetails,
   kAriaFlowTo,
 };
 

ui/accessibility/ax_enums.idl

@@ -404,6 +404,7 @@
 
     // Relationships between this element and other elements.
     activedescendant_id,
+    details_id,
     errormessage_id,
     in_page_link_target_id,
     member_of_id,
@@ -486,7 +487,6 @@
     // Relationships between this element and other elements.
     controls_ids,
     describedby_ids,
-    details_ids,
     flowto_ids,
     labelledby_ids,
     radio_group_ids,

ui/accessibility/ax_node_data.cc

@@ -92,6 +92,7 @@ typename std::vector<std::pair<FirstType, SecondType>>::const_iterator
 bool IsNodeIdIntAttribute(AXIntAttribute attr) {
   switch (attr) {
     case AX_ATTR_ACTIVEDESCENDANT_ID:
+    case AX_ATTR_DETAILS_ID:
     case AX_ATTR_ERRORMESSAGE_ID:
     case AX_ATTR_IN_PAGE_LINK_TARGET_ID:
     case AX_ATTR_MEMBER_OF_ID:
@@ -157,7 +158,6 @@ bool IsNodeIdIntListAttribute(AXIntListAttribute attr) {
     case AX_ATTR_CELL_IDS:
     case AX_ATTR_CONTROLS_IDS:
     case AX_ATTR_DESCRIBEDBY_IDS:
-    case AX_ATTR_DETAILS_IDS:
     case AX_ATTR_FLOWTO_IDS:
     case AX_ATTR_INDIRECT_CHILD_IDS:
     case AX_ATTR_LABELLEDBY_IDS:
@@ -624,6 +624,9 @@ std::string AXNodeData::ToString() const {
       case AX_ATTR_ACTIVEDESCENDANT_ID:
         result += " activedescendant=" + value;
         break;
+      case AX_ATTR_DETAILS_ID:
+        result += " details=" + value;
+        break;
       case AX_ATTR_ERRORMESSAGE_ID:
         result += " errormessage=" + value;
         break;
@@ -892,9 +895,6 @@ std::string AXNodeData::ToString() const {
       case AX_ATTR_DESCRIBEDBY_IDS:
         result += " describedby_ids=" + IntVectorToString(values);
         break;
-      case AX_ATTR_DETAILS_IDS:
-        result += " details_ids=" + IntVectorToString(values);
-        break;
       case AX_ATTR_FLOWTO_IDS:
         result += " flowto_ids=" + IntVectorToString(values);
         break;

ui/accessibility/ax_tree_unittest.cc

@@ -749,7 +749,7 @@ TEST(AXTreeTest, IntListChangeCallbacks) {
   initial_state.nodes.resize(1);
   initial_state.nodes[0].id = 1;
   initial_state.nodes[0].AddIntListAttribute(AX_ATTR_CONTROLS_IDS, one);
-  initial_state.nodes[0].AddIntListAttribute(AX_ATTR_DETAILS_IDS, two);
+  initial_state.nodes[0].AddIntListAttribute(AX_ATTR_RADIO_GROUP_IDS, two);
   AXTree tree(initial_state);
 
   FakeAXTreeDelegate fake_delegate;
@@ -761,14 +761,14 @@ TEST(AXTreeTest, IntListChangeCallbacks) {
   update0.nodes.resize(1);
   update0.nodes[0].id = 1;
   update0.nodes[0].AddIntListAttribute(AX_ATTR_CONTROLS_IDS, two);
-  update0.nodes[0].AddIntListAttribute(AX_ATTR_DETAILS_IDS, three);
+  update0.nodes[0].AddIntListAttribute(AX_ATTR_RADIO_GROUP_IDS, three);
   EXPECT_TRUE(tree.Unserialize(update0));
 
   const std::vector<std::string>& change_log =
       fake_delegate.attribute_change_log();
   ASSERT_EQ(2U, change_log.size());
   EXPECT_EQ("controlsIds changed from 1 to 2,2", change_log[0]);
-  EXPECT_EQ("detailsIds changed from 2,2 to 3", change_log[1]);
+  EXPECT_EQ("radioGroupIds changed from 2,2 to 3", change_log[1]);
 
   FakeAXTreeDelegate fake_delegate2;
   tree.SetDelegate(&fake_delegate2);
@@ -778,7 +778,7 @@ TEST(AXTreeTest, IntListChangeCallbacks) {
   update1.root_id = 1;
   update1.nodes.resize(1);
   update1.nodes[0].id = 1;
-  update1.nodes[0].AddIntListAttribute(AX_ATTR_DETAILS_IDS, two);
+  update1.nodes[0].AddIntListAttribute(AX_ATTR_RADIO_GROUP_IDS, two);
   update1.nodes[0].AddIntListAttribute(AX_ATTR_FLOWTO_IDS, three);
   EXPECT_TRUE(tree.Unserialize(update1));
 
@@ -786,7 +786,7 @@ TEST(AXTreeTest, IntListChangeCallbacks) {
       fake_delegate2.attribute_change_log();
   ASSERT_EQ(3U, change_log2.size());
   EXPECT_EQ("controlsIds changed from 2,2 to ", change_log2[0]);
-  EXPECT_EQ("detailsIds changed from 3 to 2,2", change_log2[1]);
+  EXPECT_EQ("radioGroupIds changed from 3 to 2,2", change_log2[1]);
   EXPECT_EQ("flowtoIds changed from  to 3", change_log2[2]);
 
   tree.SetDelegate(NULL);