bug 664376 - table rows of xul trees no longer containing the content of cells as accessible name r=marcoz

accessible/src/xul/nsXULTreeGridAccessible.cpp

@@ -673,14 +673,19 @@ nsXULTreeGridRowAccessible::GetName(nsAString& aName)
   if (IsDefunct())
     return NS_ERROR_FAILURE;
 
-  nsCOMPtr<nsITreeColumns> columns;
-  mTree->GetColumns(getter_AddRefs(columns));
-  if (columns) {
-    nsCOMPtr<nsITreeColumn> primaryColumn;
-    columns->GetPrimaryColumn(getter_AddRefs(primaryColumn));
-    if (primaryColumn)
-      GetCellName(primaryColumn, aName);
+  // XXX: the row name sholdn't be a concatenation of cell names (bug 664384).
+  nsCOMPtr<nsITreeColumn> column = nsCoreUtils::GetFirstSensibleColumn(mTree);
+  while (column) {
+    if (!aName.IsEmpty())
+      aName.AppendLiteral(" ");
+
+    nsAutoString cellName;
+    GetCellName(column, cellName);
+    aName.Append(cellName);
+
+    column = nsCoreUtils::GetNextSensibleColumn(column);
   }
+
   return NS_OK;
 }
 

accessible/tests/mochitest/name/test_tree.xul

@@ -86,7 +86,7 @@
       }
     }
 
-    function tableTester(aID)
+    function tableTester(aID, aIsTable, aCol1ID, aCol2ID)
     {
       this.DOMNode = getNode(aID);
 
@@ -98,7 +98,7 @@
       this.check = function tableTester_check(aEvent)
       {
         var tree = {
-          role: ROLE_TREE_TABLE,
+          role: aIsTable ? ROLE_TABLE : ROLE_TREE_TABLE,
           children: [
             {
               role: ROLE_LIST
@@ -109,15 +109,15 @@
                 {
                   role: ROLE_GRID_CELL,
                   children: [],
-                  name: "row0_col1"
+                  name: "row0_" + aCol1ID
                 },
                 {
                   role: ROLE_GRID_CELL,
                   children: [],
-                  name: "row0_col2"
+                  name: "row0_" + aCol2ID
                 }
               ],
-              name: "row0_col1"
+              name: "row0_" + aCol1ID + " row0_" + aCol2ID
             },
             {
               role: ROLE_ROW,
@@ -125,15 +125,15 @@
                 {
                   role: ROLE_GRID_CELL,
                   children: [],
-                  name: "row1_col1"
+                  name: "row1_" + aCol1ID
                 },
                 {
                   role: ROLE_GRID_CELL,
                   children: [],
-                  name: "row1_col2"
+                  name: "row1_" + aCol2ID
                 }
               ],
-              name: "row1_col1"
+              name: "row1_" + aCol1ID + " row1_" + aCol2ID
             }
           ]
         };
@@ -152,7 +152,8 @@
       var gQueue = new eventQueue(EVENT_REORDER);
 
       gQueue.push(new treeTester("tree"));
-      gQueue.push(new tableTester("table"));
+      gQueue.push(new tableTester("table", true, "t_col1", "t_col2"));
+      gQueue.push(new tableTester("treetable", false, "tt_col1", "tt_col2"));
 
       gQueue.invoke(); // Will call SimpleTest.finish()
     }
@@ -170,7 +171,12 @@
        title="Treegrid row accessible shouldn't inherit name from tree accessible">
       Mozilla Bug 546812
     </a>
-  <p id="display"></p>
+    <a target="_blank"
+       href="https://bugzilla.mozilla.org/show_bug.cgi?id=664376"
+       title="Table rows of XUL trees no longer containing cell content as accessible name">
+      Mozilla Bug 664376
+    </a>
+    <p id="display"></p>
     <div id="content" style="display: none">
     </div>
     <pre id="test">
@@ -188,8 +194,16 @@
 
   <tree id="table" flex="1">
     <treecols>
-      <treecol id="col1" flex="1" label="column" primary="true"/>
-      <treecol id="col2" flex="1" label="column 2"/>
+      <treecol id="t_col1" flex="1" label="column"/>
+      <treecol id="t_col2" flex="1" label="column 2"/>
+    </treecols>
+    <treechildren/>
+  </tree>
+
+  <tree id="treetable" flex="1">
+    <treecols>
+      <treecol id="tt_col1" flex="1" label="column" primary="true"/>
+      <treecol id="tt_col2" flex="1" label="column 2"/>
     </treecols>
     <treechildren/>
   </tree>

accessible/tests/mochitest/treeview.js

@@ -18,7 +18,11 @@ function nsTreeTreeView()
   ];
 }
 
-function nsTreeView() { }
+function nsTreeView()
+{
+  this.mTree = null;
+  this.mData = [];
+}
 
 nsTreeView.prototype =
 {
@@ -205,8 +209,6 @@ nsTreeView.prototype =
     return rowIdx;
   },
 
-  mTree: null,
-  mData: [],
   mCyclerStates: [
     createAtom("cyclerState1"),
     createAtom("cyclerState2"),