Merge.

Makefile.in

@@ -65,7 +65,7 @@ TIERS += testharness
 
 # test harnesses
 ifdef ENABLE_TESTS
-tier_testharness_dirs += tools/test-harness
+tier_testharness_dirs += testing/xpcshell
 endif
 
 include $(topsrcdir)/config/config.mk

accessible/public/nsIAccessibleRole.idl

@@ -44,7 +44,7 @@
  * @note - When adding a new role, be sure to also add it to nsRoleMap.h for
  *         each platform.
  */
-[scriptable, uuid(8c0f68f8-164a-4078-a9ee-36a7d180f0e4)]
+[scriptable, uuid(6793ca5c-c7cb-41db-9fb9-c16c0525f962)]
 interface nsIAccessibleRole : nsISupports
 {
   /**
@@ -230,8 +230,8 @@ interface nsIAccessibleRole : nsISupports
   const unsigned long ROLE_ROW = 28;
 
   /**
-   * Represents a cell within a table. Is is used for html:td,
-   * role="gridcell". Also, see ROLE_TABLE.
+   * Represents a cell within a table. It is used for html:td,
+   * xul:tree cell and xul:listcell. Also, see ROLE_TABLE.
    */
   const unsigned long ROLE_CELL = 29;
 
@@ -770,9 +770,16 @@ interface nsIAccessibleRole : nsISupports
   const unsigned long ROLE_FLAT_EQUATION = 120;
   
   /**
-   * It's not role actually. This contanst is important to help ensure
+   * Represents a cell within a grid. It is used for role="gridcell". Unlike
+   * ROLE_CELL, it allows the calculation of the accessible name from subtree.
+   * Also, see ROLE_TABLE.
+   */
+  const unsigned long ROLE_GRID_CELL = 121;
+
+  /**
+   * It's not role actually. This constant is important to help ensure
    * nsRoleMap's are synchronized.
    */
-  const unsigned long ROLE_LAST_ENTRY = 121;
+  const unsigned long ROLE_LAST_ENTRY = 122;
 };
 

accessible/src/atk/nsRoleMap.h

@@ -167,6 +167,7 @@ static const PRUint32 atkRoleMap[] = {
     ATK_ROLE_LIST_ITEM,           // nsIAccessibleRole::ROLE_RICH_OPTION          118
     ATK_ROLE_LIST,                // nsIAccessibleRole::ROLE_LISTBOX              119
     ATK_ROLE_UNKNOWN,             // nsIAccessibleRole::ROLE_FLAT_EQUATION        120
+    ATK_ROLE_TABLE_CELL,          // nsIAccessibleRole::ROLE_GRID_CELL            121
     kROLE_ATK_LAST_ENTRY          // nsIAccessibleRole::ROLE_LAST_ENTRY
 };
 

accessible/src/base/nsARIAMap.cpp

@@ -132,7 +132,6 @@ nsRoleMapEntry nsARIAMap::gWAIRoleMap[] =
     nsIAccessibleStates::STATE_COLLAPSED | nsIAccessibleStates::STATE_HASPOPUP,
     // Manually map EXT_STATE_SUPPORTS_AUTOCOMPLETION aria-autocomplete
     {&nsAccessibilityAtoms::aria_readonly, kBoolState, nsIAccessibleStates::STATE_READONLY},
-    {&nsAccessibilityAtoms::aria_expanded, kBoolState, nsIAccessibleStates::STATE_EXPANDED},
     kEndEntry
   },
   {
@@ -171,12 +170,10 @@ nsRoleMapEntry nsARIAMap::gWAIRoleMap[] =
   },
   {
     "gridcell",
-    nsIAccessibleRole::ROLE_CELL,
+    nsIAccessibleRole::ROLE_GRID_CELL,
     eNoValue,
     eNoAction,
     kNoReqStates,
-    {&nsAccessibilityAtoms::aria_expanded, kBoolState, nsIAccessibleStates::STATE_EXPANDED},
-    {&nsAccessibilityAtoms::aria_expanded, "false", nsIAccessibleStates::STATE_COLLAPSED},
     {&nsAccessibilityAtoms::aria_selected, kBoolState, nsIAccessibleStates::STATE_SELECTED | nsIAccessibleStates::STATE_SELECTABLE},
     {&nsAccessibilityAtoms::aria_selected, "false", nsIAccessibleStates::STATE_SELECTABLE},
     {&nsAccessibilityAtoms::aria_readonly, kBoolState, nsIAccessibleStates::STATE_READONLY},
@@ -371,8 +368,6 @@ nsRoleMapEntry nsARIAMap::gWAIRoleMap[] =
     kNoReqStates,
     {&nsAccessibilityAtoms::aria_selected, kBoolState, nsIAccessibleStates::STATE_SELECTED | nsIAccessibleStates::STATE_SELECTABLE},
     {&nsAccessibilityAtoms::aria_selected, "false", nsIAccessibleStates::STATE_SELECTABLE},
-    {&nsAccessibilityAtoms::aria_expanded, kBoolState, nsIAccessibleStates::STATE_EXPANDED},
-    {&nsAccessibilityAtoms::aria_expanded, "false", nsIAccessibleStates::STATE_COLLAPSED},
     kEndEntry
   },
   {
@@ -510,8 +505,6 @@ nsRoleMapEntry nsARIAMap::gWAIRoleMap[] =
     kNoReqStates,
     {&nsAccessibilityAtoms::aria_selected, kBoolState, nsIAccessibleStates::STATE_SELECTED | nsIAccessibleStates::STATE_SELECTABLE},
     {&nsAccessibilityAtoms::aria_selected, "false", nsIAccessibleStates::STATE_SELECTABLE},
-    {&nsAccessibilityAtoms::aria_expanded, kBoolState, nsIAccessibleStates::STATE_EXPANDED},
-    {&nsAccessibilityAtoms::aria_expanded, "false", nsIAccessibleStates::STATE_COLLAPSED},
     {&nsAccessibilityAtoms::aria_checked, kBoolState, nsIAccessibleStates::STATE_CHECKED | nsIAccessibleStates::STATE_CHECKABLE},
     {&nsAccessibilityAtoms::aria_checked, "mixed", nsIAccessibleStates::STATE_MIXED | nsIAccessibleStates::STATE_CHECKABLE},
     {&nsAccessibilityAtoms::aria_checked, "false", nsIAccessibleStates::STATE_CHECKABLE},
@@ -550,6 +543,8 @@ nsStateMapEntry nsARIAMap::gWAIUnivStateMap[] = {
   {&nsAccessibilityAtoms::aria_busy,     "true",     nsIAccessibleStates::STATE_BUSY},
   {&nsAccessibilityAtoms::aria_busy,     "error",    nsIAccessibleStates::STATE_INVALID},
   {&nsAccessibilityAtoms::aria_disabled, kBoolState, nsIAccessibleStates::STATE_UNAVAILABLE},
+  {&nsAccessibilityAtoms::aria_expanded, kBoolState, nsIAccessibleStates::STATE_EXPANDED},
+  {&nsAccessibilityAtoms::aria_expanded, "false", nsIAccessibleStates::STATE_COLLAPSED},
   kEndEntry
 };
 

accessible/src/base/nsAccessibilityService.h

@@ -269,7 +269,8 @@ static const char kRoleNames[][20] = {
   "listbox option",      //ROLE_OPTION
   "listbox rich option", //ROLE_RICH_OPTION
   "listbox",             //ROLE_LISTBOX
-  "flat equation"        //ROLE_FLAT_EQUATION  
+  "flat equation",       //ROLE_FLAT_EQUATION  
+  "gridcell"             //ROLE_GRID_CELL
 };
 
 /**

accessible/src/base/nsAccessible.cpp

@@ -112,10 +112,10 @@ NS_IMPL_ISUPPORTS1(nsAccessibleDOMStringList, nsIDOMDOMStringList)
 NS_IMETHODIMP
 nsAccessibleDOMStringList::Item(PRUint32 aIndex, nsAString& aResult)
 {
-  if (aIndex >= (PRUint32)mNames.Count()) {
+  if (aIndex >= mNames.Length()) {
     SetDOMStringToNull(aResult);
   } else {
-    mNames.StringAt(aIndex, aResult);
+    aResult = mNames.ElementAt(aIndex);
   }
 
   return NS_OK;
@@ -124,7 +124,7 @@ nsAccessibleDOMStringList::Item(PRUint32 aIndex, nsAString& aResult)
 NS_IMETHODIMP
 nsAccessibleDOMStringList::GetLength(PRUint32 *aLength)
 {
-  *aLength = (PRUint32)mNames.Count();
+  *aLength = mNames.Length();
 
   return NS_OK;
 }
@@ -132,7 +132,7 @@ nsAccessibleDOMStringList::GetLength(PRUint32 *aLength)
 NS_IMETHODIMP
 nsAccessibleDOMStringList::Contains(const nsAString& aString, PRBool *aResult)
 {
-  *aResult = mNames.IndexOf(aString) > -1;
+  *aResult = mNames.Contains(aString);
 
   return NS_OK;
 }

accessible/src/base/nsAccessible.h

@@ -55,6 +55,7 @@
 #include "nsINameSpaceManager.h"
 #include "nsWeakReference.h"
 #include "nsString.h"
+#include "nsTArray.h"
 #include "nsIDOMDOMStringList.h"
 #include "nsARIAMap.h"
 
@@ -88,11 +89,11 @@ public:
   NS_DECL_NSIDOMDOMSTRINGLIST
 
   PRBool Add(const nsAString& aName) {
-    return mNames.AppendString(aName);
+    return mNames.AppendElement(aName) != nsnull;
   }
 
 private:
-  nsStringArray mNames;
+  nsTArray<nsString> mNames;
 };
 
 

accessible/src/base/nsNameUtils.cpp

@@ -73,7 +73,7 @@ PRUint32 nsNameUtils::gRoleToNameRulesMap[] =
   eFromSubtree,      // ROLE_ROWHEADER
   eFromSubtree,      // ROLE_COLUMN
   eFromSubtree,      // ROLE_ROW
-  eFromSubtree,      // ROLE_CELL
+  eNoRule,           // ROLE_CELL
   eFromSubtree,      // ROLE_LINK
   eFromSubtree,      // ROLE_HELPBALLOON
   eNoRule,           // ROLE_CHARACTER
@@ -164,5 +164,6 @@ PRUint32 nsNameUtils::gRoleToNameRulesMap[] =
   eFromSubtree,      // ROLE_OPTION
   eFromSubtree,      // ROLE_RICH_OPTION
   eNoRule,           // ROLE_LISTBOX
-  eNoRule            // ROLE_FLAT_EQUATION
+  eNoRule,           // ROLE_FLAT_EQUATION
+  eFromSubtree       // ROLE_GRID_CELL
 };

accessible/src/mac/nsRoleMap.h

@@ -163,5 +163,6 @@ static const NSString* AXRoles [] = {
   NSAccessibilityRowRole,                       // ROLE_RICH_OPTION
   NSAccessibilityListRole,                      // ROLE_LISTBOX
   NSAccessibilityUnknownRole,                   // ROLE_FLAT_EQUATION
+  NSAccessibilityGroupRole,                     // ROLE_GRID_CELL
   @"ROLE_LAST_ENTRY"                            // ROLE_LAST_ENTRY. bogus role that will never be shown (just marks the end of this array)!
 };

accessible/src/msaa/nsRoleMap.h

@@ -437,6 +437,9 @@ static const WindowsRoleMapItem gWindowsRoleMap[] = {
   // nsIAccessibleRole::ROLE_FLAT_EQUATION
   { ROLE_SYSTEM_EQUATION, ROLE_SYSTEM_EQUATION },
   
+  // nsIAccessibleRole::ROLE_GRID_CELL
+  { ROLE_SYSTEM_CELL, ROLE_SYSTEM_CELL },
+
   // nsIAccessibleRole::ROLE_LAST_ENTRY
   { ROLE_WINDOWS_LAST_ENTRY, ROLE_WINDOWS_LAST_ENTRY }
 };