Bug 1149118 - Expose radio group with the correct role on OS X, r=surkov

Brli · Mar 30, 2015 · 0e6a7ab · 0e6a7ab
1 parent 5c0ea2c
commit 0e6a7ab
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 6 deletions.
diff --git a/accessible/base/ARIAMap.cpp b/accessible/base/ARIAMap.cpp
@@ -478,7 +478,7 @@ static nsRoleMapEntry sWAIRoleMaps[] =
   },
   { // radiogroup
     &nsGkAtoms::radiogroup,
-    roles::GROUPING,
+    roles::RADIO_GROUP,
     kUseMapRole,
     eNoValue,
     eNoAction,

diff --git a/accessible/base/Role.h b/accessible/base/Role.h
@@ -976,7 +976,12 @@ enum Role {
    */
   MATHML_STACK_LINE = 167,
 
-  LAST_ROLE = MATHML_STACK_LINE
+  /**
+   * A group containing radio buttons
+   */
+  RADIO_GROUP = 168,
+
+  LAST_ROLE = RADIO_GROUP
 };
 
 } // namespace role

diff --git a/accessible/base/RoleMap.h b/accessible/base/RoleMap.h
@@ -1359,3 +1359,11 @@ ROLE(MATHML_STACK_LINE,
      0,
      IA2_ROLE_UNKNOWN,
      eNoNameRule)
+
+ROLE(RADIO_GROUP,
+     "grouping",
+     ATK_ROLE_PANEL,
+     NSAccessibilityRadioGroupRole,
+     ROLE_SYSTEM_GROUPING,
+     ROLE_SYSTEM_GROUPING,
+     eNoNameRule)
diff --git a/accessible/interfaces/nsIAccessibleRole.idl b/accessible/interfaces/nsIAccessibleRole.idl
@@ -8,7 +8,7 @@
 /**
  * Defines cross platform (Gecko) roles.
  */
-[scriptable, uuid(55581ec3-ba6e-4805-8108-260ed34cdcbb)]
+[scriptable, uuid(00f9e831-3198-40b7-9186-5251474d4d7a)]
 interface nsIAccessibleRole : nsISupports
 {
   /**
@@ -969,4 +969,9 @@ interface nsIAccessibleRole : nsISupports
    * A MathML line in a stack (msline in MathML).
    */
   const unsigned long ROLE_MATHML_STACK_LINE = 167;
+
+  /**
+   * A group containing radio buttons
+   */
+  const unsigned long ROLE_RADIO_GROUP = 168;
 };
diff --git a/accessible/tests/mochitest/role.js b/accessible/tests/mochitest/role.js
@@ -96,6 +96,7 @@ const ROLE_PROGRESSBAR = nsIAccessibleRole.ROLE_PROGRESSBAR;
 const ROLE_PROPERTYPAGE = nsIAccessibleRole.ROLE_PROPERTYPAGE;
 const ROLE_PUSHBUTTON = nsIAccessibleRole.ROLE_PUSHBUTTON;
 const ROLE_RADIOBUTTON = nsIAccessibleRole.ROLE_RADIOBUTTON;
+const ROLE_RADIO_GROUP = nsIAccessibleRole.ROLE_RADIO_GROUP;
 const ROLE_RADIO_MENU_ITEM = nsIAccessibleRole.ROLE_RADIO_MENU_ITEM;
 const ROLE_RICH_OPTION = nsIAccessibleRole.ROLE_RICH_OPTION;
 const ROLE_ROW = nsIAccessibleRole.ROLE_ROW;

diff --git a/accessible/tests/mochitest/role/test_aria.html b/accessible/tests/mochitest/role/test_aria.html
@@ -51,7 +51,7 @@
       testRole("aria_presentation", ROLE_TEXT_CONTAINER); // weak role
       testRole("aria_progressbar", ROLE_PROGRESSBAR);
       testRole("aria_radio", ROLE_RADIOBUTTON);
-      testRole("aria_radiogroup", ROLE_GROUPING);
+      testRole("aria_radiogroup", ROLE_RADIO_GROUP);
       testRole("aria_region", ROLE_PANE);
       testRole("aria_row", ROLE_ROW);
       testRole("aria_rowheader", ROLE_ROWHEADER);

diff --git a/accessible/tests/mochitest/tree/test_formctrl.xul b/accessible/tests/mochitest/tree/test_formctrl.xul
@@ -39,7 +39,7 @@
 
       // radiogroup
       accTree = {
-        role: ROLE_GROUPING,
+        role: ROLE_RADIO_GROUP,
         children: [
           {
             role: ROLE_RADIOBUTTON,

diff --git a/accessible/xul/XULFormControlAccessible.cpp b/accessible/xul/XULFormControlAccessible.cpp
@@ -472,7 +472,7 @@ XULRadioGroupAccessible::
 role
 XULRadioGroupAccessible::NativeRole()
 {
-  return roles::GROUPING;
+  return roles::RADIO_GROUP;
 }
 
 uint64_t