Make mozAccessible use mac-native (UA) roles. Remove mozDocAccessible as it's not needed. Implement new |isRoot| method to tell whether an accessible is the root accessible. b=352327, r=surkov

Remove some unused cross-platform roles. b=352357, r=aaronlev
2006-09-19 08:48:33 +00:00 · 2006-09-19 08:48:33 +00:00 · 7b95df2f33
--- a/accessible/public/nsIAccessible.idl
+++ b/accessible/public/nsIAccessible.idl
@ -56,7 +56,7 @@ interface nsIPersistentProperties;
 *
 * @status UNDER_REVIEW
 */
-[scriptable, uuid(3068b82f-1eec-47eb-b407-bf8415c22942)]
+[scriptable, uuid(e420f6cd-3058-44f7-9b4e-61c4ded531e9)]
 interface nsIAccessible : nsISupports
 {
  /**
@ -448,13 +448,11 @@ interface nsIAccessible : nsISupports
  const unsigned long ROLE_DESKTOP_FRAME = 71;
  const unsigned long ROLE_DIRECTORY_PANE = 72;
  const unsigned long ROLE_FILE_CHOOSER = 73;
-  const unsigned long ROLE_FILLER = 74;
  const unsigned long ROLE_FONT_CHOOSER = 75;
  const unsigned long ROLE_CHROME_WINDOW = 76;
  const unsigned long ROLE_GLASS_PANE = 77;
  const unsigned long ROLE_HTML_CONTAINER = 78;
  const unsigned long ROLE_ICON = 79;
-  const unsigned long ROLE_INTERNAL_FRAME = 80;
  const unsigned long ROLE_LABEL = 81;
  const unsigned long ROLE_LAYERED_PANE = 82;
  const unsigned long ROLE_OPTION_PANE = 83;
@ -467,7 +465,7 @@ interface nsIAccessible : nsISupports
  const unsigned long ROLE_TABLE_COLUMN_HEADER = 90;
  const unsigned long ROLE_TABLE_ROW_HEADER = 91;
  const unsigned long ROLE_TEAR_OFF_MENU_ITEM = 92;
-  const unsigned long ROLE_TERMINAL =93;
+  const unsigned long ROLE_TERMINAL = 93;
  const unsigned long ROLE_TEXT_CONTAINER = 94;
  const unsigned long ROLE_TOGGLE_BUTTON = 95;
  const unsigned long ROLE_TREE_TABLE = 96;
@ -478,7 +476,6 @@ interface nsIAccessible : nsISupports
  const unsigned long ROLE_RULER = 101;
  const unsigned long ROLE_AUTOCOMPLETE = 102;
  const unsigned long ROLE_EDITBAR = 103;
-  const unsigned long ROLE_EMBEDDED = 104;
  const unsigned long ROLE_ENTRY = 105;
  const unsigned long ROLE_CAPTION = 106;
  const unsigned long ROLE_DOCUMENT_FRAME = 107;
--- a/accessible/src/atk/nsRoleMap.h
+++ b/accessible/src/atk/nsRoleMap.h
@ -120,13 +120,11 @@ PRUint32 atkRoleMap[] = {
    ATK_ROLE_DESKTOP_FRAME,       // nsIAccessible::ROLE_DESKTOP_FRAME     71
    ATK_ROLE_DIRECTORY_PANE,      // nsIAccessible::ROLE_DIRECTORY_PANE    72
    ATK_ROLE_FILE_CHOOSER,        // nsIAccessible::ROLE_FILE_CHOOSER      73
-    ATK_ROLE_FILLER,              // nsIAccessible::ROLE_FILLER            74
    ATK_ROLE_FONT_CHOOSER,        // nsIAccessible::ROLE_FONT_CHOOSER      75
    ATK_ROLE_FRAME,               // nsIAccessible::ROLE_CHROME_WINDOW     76
    ATK_ROLE_GLASS_PANE,          // nsIAccessible::ROLE_GLASS_PANE        77
    ATK_ROLE_HTML_CONTAINER,      // nsIAccessible::ROLE_HTML_CONTAINER    78
    ATK_ROLE_ICON,                // nsIAccessible::ROLE_ICON              79
-    ATK_ROLE_INTERNAL_FRAME,      // nsIAccessible::ROLE_INTERNAL_FRAME    80
    ATK_ROLE_LABEL,               // nsIAccessible::ROLE_LABEL             81
    ATK_ROLE_LAYERED_PANE,        // nsIAccessible::ROLE_LAYERED_PANE      82
    ATK_ROLE_OPTION_PANE,         // nsIAccessible::ROLE_OPTION_PANE       83
@ -150,7 +148,6 @@ PRUint32 atkRoleMap[] = {
    ATK_ROLE_RULER,               // nsIAccessible::ROLE_RULER             101
    ATK_ROLE_AUTOCOMPLETE,        // nsIAccessible::ROLE_AUTOCOMPLETE      102
    ATK_ROLE_EDITBAR,             // nsIAccessible::ROLE_EDITBAR           103
-    ATK_ROLE_EMBEDDED,            // nsIAccessible::ROLE_EMBEDDED          104
    ATK_ROLE_ENTRY,               // nsIAccessible::ROLE_ENTRY             105
    ATK_ROLE_CAPTION,             // nsIAccessible::ROLE_CAPTION           106
    ATK_ROLE_DOCUMENT_FRAME,      // nsIAccessible::ROLE_DOCUMENT_FRAME    107
--- a/accessible/src/mac/mozAccessible.mm
+++ b/accessible/src/mac/mozAccessible.mm
@ -277,6 +277,11 @@ ObjectOrUnignoredAncestor(id anObject)
  return self;
 }

+- (BOOL)isRoot
+{
+  return NO;
+}
+
 // gets our native children lazily.
 // returns nil when there are no children.
 - (NSArray*)children
@ -454,7 +459,7 @@ ObjectOrUnignoredAncestor(id anObject)
  
  // if we're the root accessible, our children's AXParent
  // should reference the native view. see mozDocAccessible.h
-  if ([[self role] isEqualToString:@"mozRootAccessible"])
+  if ([self isRoot])
    parentObject = [self ourself];
  else
    parentObject = self;
--- a/accessible/src/mac/mozAccessibleProtocol.h
+++ b/accessible/src/mac/mozAccessibleProtocol.h
@ -52,8 +52,9 @@

@protocol mozAccessible

-// returns this accessible's role name as a string.
- (NSString*)role;
+// returns whether this accessible is the root accessible. there is one
+// root accessible per window.
+- (BOOL)isRoot;

 #ifdef DEBUG
 // debug utility that will print the native accessibility tree, starting
--- a/accessible/src/mac/mozDocAccessible.h
+++ b/accessible/src/mac/mozDocAccessible.h
@ -42,20 +42,11 @@
 // our protocol that we implement (so cocoa widgets can talk to us)
 #import "mozAccessibleProtocol.h"

-/* 
-  Represents a "document", a web area. 
-  Created by nsDocAccessibleWrap 
-*/
-@interface mozDocAccessible : mozAccessible
-{
-}
-@end
-
 /* 
  The root accessible. There is one per window.
  Created by the nsRootAccessibleWrap.
 */
-@interface mozRootAccessible : mozDocAccessible
+@interface mozRootAccessible : mozAccessible
 {
  // the mozView that we're representing.
  // all outside communication goes through the mozView.
--- a/accessible/src/mac/mozDocAccessible.mm
+++ b/accessible/src/mac/mozDocAccessible.mm
@ -52,15 +52,6 @@ static id <mozAccessible, mozView> getNativeViewFromRootAccessible (nsAccessible

 #pragma mark -

-@implementation mozDocAccessible
-
- (NSString*)role
-{
-  return @"mozDocAccessible";
-}
-
-@end
-
@implementation mozRootAccessible

 // return the AXParent that our parallell NSView tells us about.
@ -87,9 +78,9 @@ static id <mozAccessible, mozView> getNativeViewFromRootAccessible (nsAccessible
  return mParallelView;
 }

- (NSString*)role
+- (BOOL)isRoot
 {
-  return @"mozRootAccessible";
+  return YES;
 }

@end
--- a/accessible/src/mac/nsDocAccessibleWrap.h
+++ b/accessible/src/mac/nsDocAccessibleWrap.h
@ -51,8 +51,7 @@ class nsDocAccessibleWrap: public nsDocAccessible
    
    NS_IMETHOD FireToolkitEvent(PRUint32 aEvent, nsIAccessible* aAccessible, 
                                void* aData);
-    
-    objc_class* GetNativeType ();
 };

-#endif
+#endif
+
--- a/accessible/src/mac/nsDocAccessibleWrap.mm
+++ b/accessible/src/mac/nsDocAccessibleWrap.mm
@ -56,8 +56,3 @@ nsDocAccessibleWrap::FireToolkitEvent(PRUint32 aEvent, nsIAccessible* aAccessibl
  return NS_OK;
 }

-objc_class*
-nsDocAccessibleWrap::GetNativeType ()
-{
-  return [mozDocAccessible class];
-}
--- a/accessible/src/mac/nsRoleMap.h
+++ b/accessible/src/mac/nsRoleMap.h
@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
+/* -*- Mode: Objective-C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* vim:expandtab:shiftwidth=2:tabstop=2:
 */
 /* ***** BEGIN LICENSE BLOCK *****
@ -40,121 +40,118 @@
 #import <Foundation/Foundation.h>

 const NSString* AXRoles [] = {
-  @"ROLE_NOTHING", // ROLE_NOTHING
-  @"ROLE_TITLEBAR", // ROLE_TITLEBAR
-  @"ROLE_MENUBAR", // ROLE_MENUBAR
-  @"ROLE_SCROLLBAR", // ROLE_SCROLLBAR
-  @"ROLE_GRIP", // ROLE_GRIP
-  @"ROLE_SOUND", // ROLE_SOUND
-  @"ROLE_CURSOR", // ROLE_CURSOR
-  @"ROLE_CARET", // ROLE_CARET
-  @"ROLE_ALERT", // ROLE_ALERT
-  @"ROLE_WINDOW", // ROLE_WINDOW
-  @"ROLE_CLIENT", // ROLE_CLIENT
-  @"ROLE_MENUPOPUP", // ROLE_MENUPOPUP
-  @"ROLE_MENUITEM", // ROLE_MENUITEM
-  @"ROLE_TOOLTIP", // ROLE_TOOLTIP
-  @"ROLE_APP", // ROLE_APP
-  @"ROLE_DOCUMENT", // ROLE_DOCUMENT
-  @"ROLE_PANE", // ROLE_PANE
-  @"ROLE_CHART", // ROLE_CHART
-  @"ROLE_DIALOG", // ROLE_DIALOG
-  @"ROLE_BORDER", // ROLE_BORDER
-  @"ROLE_GROUPING", // ROLE_GROUPING
-  @"ROLE_SEPARATOR", // ROLE_SEPARATOR
-  @"ROLE_TOOLBAR", // ROLE_TOOLBAR
-  @"ROLE_STATUSBAR", // ROLE_STATUSBAR
-  @"ROLE_TABLE", // ROLE_TABLE
-  @"ROLE_COLUMNHEADER", // ROLE_COLUMNHEADER
-  @"ROLE_ROWHEADER", // ROLE_ROWHEADER
-  @"ROLE_COLUMN", // ROLE_COLUMN
-  @"ROLE_ROW", // ROLE_ROW
-  @"ROLE_CELL", // ROLE_CELL
-  @"ROLE_LINK", // ROLE_LINK
-  @"ROLE_HELPBALLOON", // ROLE_HELPBALLOON
-  @"ROLE_CHARACTER", // ROLE_CHARACTER
-  @"ROLE_LIST", // ROLE_LIST
-  @"ROLE_LISTITEM", // ROLE_LISTITEM
-  @"ROLE_OUTLINE", // ROLE_OUTLINE
-  @"ROLE_OUTLINEITEM", // ROLE_OUTLINEITEM
-  @"ROLE_PAGETAB", // ROLE_PAGETAB
-  @"ROLE_PROPERTYPAGE", // ROLE_PROPERTYPAGE
-  @"ROLE_INDICATOR", // ROLE_INDICATOR
-  @"ROLE_GRAPHIC", // ROLE_GRAPHIC
-  @"ROLE_STATICTEXT", // ROLE_STATICTEXT
-  @"ROLE_TEXT", // ROLE_TEXT
-  @"ROLE_PUSHBUTTON", // ROLE_PUSHBUTTON
-  @"ROLE_CHECKBUTTON", // ROLE_CHECKBUTTON
-  @"ROLE_RADIOBUTTON", // ROLE_RADIOBUTTON
-  @"ROLE_COMBOBOX", // ROLE_COMBOBOX
-  @"ROLE_DROPLIST", // ROLE_DROPLIST
-  @"ROLE_PROGRESSBAR", // ROLE_PROGRESSBAR
-  @"ROLE_DIAL", // ROLE_DIAL
-  @"ROLE_HOTKEYFIELD", // ROLE_HOTKEYFIELD
-  @"ROLE_SLIDER", // ROLE_SLIDER
-  @"ROLE_SPINBUTTON", // ROLE_SPINBUTTON
-  @"ROLE_DIAGRAM", // ROLE_DIAGRAM
-  @"ROLE_ANIMATION", // ROLE_ANIMATION
-  @"ROLE_EQUATION", // ROLE_EQUATION
-  @"ROLE_BUTTONDROPDOWN", // ROLE_BUTTONDROPDOWN
-  @"ROLE_BUTTONMENU", // ROLE_BUTTONMENU
-  @"ROLE_BUTTONDROPDOWNGRID", // ROLE_BUTTONDROPDOWNGRID
-  @"ROLE_WHITESPACE", // ROLE_WHITESPACE
-  @"ROLE_PAGETABLIST", // ROLE_PAGETABLIST
-  @"ROLE_CLOCK", // ROLE_CLOCK
-  @"ROLE_SPLITBUTTON", // ROLE_SPLITBUTTON
-  @"ROLE_IPADDRESS", // ROLE_IPADDRESS
-  @"ROLE_ACCEL", // ROLE_ACCEL
-  @"ROLE_ARROW", // ROLE_ARROW
-  @"ROLE_CANVAS", // ROLE_CANVAS
-  @"ROLE_CHECK", // ROLE_CHECK
-  @"ROLE_COLOR", // ROLE_COLOR
-  @"ROLE_DATE", // ROLE_DATE
-  @"ROLE_DESKTOP", // ROLE_DESKTOP
-  @"ROLE_DESKTOP", // ROLE_DESKTOP
-  @"ROLE_DIRECTORY", // ROLE_DIRECTORY
-  @"ROLE_FILE", // ROLE_FILE
-  @"ROLE_FILLER", // ROLE_FILLER
-  @"ROLE_FONT", // ROLE_FONT
-  @"ROLE_CHROME", // ROLE_CHROME
-  @"ROLE_GLASS", // ROLE_GLASS
-  @"ROLE_HTML", // ROLE_HTML
-  @"ROLE_ICON", // ROLE_ICON
-  @"ROLE_INTERNAL", // ROLE_INTERNAL
-  @"ROLE_LABEL", // ROLE_LABEL
-  @"ROLE_LAYERED", // ROLE_LAYERED
-  @"ROLE_OPTION", // ROLE_OPTION
-  @"ROLE_PASSWORD", // ROLE_PASSWORD
-  @"ROLE_POPUP", // ROLE_POPUP
-  @"ROLE_RADIO", // ROLE_RADIO
-  @"ROLE_ROOT", // ROLE_ROOT
-  @"ROLE_SCROLL", // ROLE_SCROLL
-  @"ROLE_SPLIT", // ROLE_SPLIT
-  @"ROLE_TABLE", // ROLE_TABLE
-  @"ROLE_TABLE", // ROLE_TABLE
-  @"ROLE_TEAR", // ROLE_TEAR
-  @"ROLE_TERMINAL", // ROLE_TERMINAL
-  @"ROLE_TEXT", // ROLE_TEXT
-  @"ROLE_TOGGLE", // ROLE_TOGGLE
-  @"ROLE_TREE", // ROLE_TREE
-  @"ROLE_VIEWPORT", // ROLE_VIEWPORT
-  @"ROLE_HEADER", // ROLE_HEADER
-  @"ROLE_FOOTER", // ROLE_FOOTER
-  @"ROLE_PARAGRAPH", // ROLE_PARAGRAPH
-  @"ROLE_RULER", // ROLE_RULER
-  @"ROLE_AUTOCOMPLETE", // ROLE_AUTOCOMPLETE
-  @"ROLE_EDITBAR", // ROLE_EDITBAR
-  @"ROLE_EMBEDDED", // ROLE_EMBEDDED
-  @"ROLE_ENTRY", // ROLE_ENTRY
-  @"ROLE_CAPTION", // ROLE_CAPTION
-  @"ROLE_DOCUMENT", // ROLE_DOCUMENT
-  @"ROLE_HEADING", // ROLE_HEADING
-  @"ROLE_PAGE", // ROLE_PAGE
-  @"ROLE_SECTION", // ROLE_SECTION
-  @"ROLE_REDUNDANT", // ROLE_REDUNDANT
-  @"ROLE_FORM", // ROLE_FORM
-  @"ROLE_IME", // ROLE_IME
-  @"ROLE_APP", // ROLE_APP
-  @"ROLE_PARENT", // ROLE_PARENT
-  @"ROLE_LAST" // ROLE_LAST
+  NSAccessibilityUnknownRole,                   // ROLE_NOTHING
+  NSAccessibilityUnknownRole,                   // ROLE_TITLEBAR. (irrelevant on OS X; windows are always native.)
+  NSAccessibilityMenuBarRole,                   // ROLE_MENUBAR. (irrelevant on OS X; the menubar will always be native and on the top of the screen.)
+  NSAccessibilityScrollBarRole,                 // ROLE_SCROLLBAR. we might need to make this its own mozAccessible, to support the children objects (valueindicator, down/up buttons).
+  NSAccessibilitySplitterRole,                  // ROLE_GRIP
+  NSAccessibilityUnknownRole,                   // ROLE_SOUND. unused on OS X
+  NSAccessibilityUnknownRole,                   // ROLE_CURSOR. unused on OS X
+  NSAccessibilityUnknownRole,                   // ROLE_CARET. unused on OS X
+  NSAccessibilityUnknownRole,                   // ROLE_ALERT
+  NSAccessibilityWindowRole,                    // ROLE_WINDOW. irrelevant on OS X; all window a11y is handled by the system.
+  NSAccessibilityUnknownRole,                   // ROLE_CLIENT
+  NSAccessibilityPopUpButtonRole,               // ROLE_MENUPOPUP
+  NSAccessibilityMenuItemRole,                  // ROLE_MENUITEM.
+  @"AXHelpTag",                                 // ROLE_TOOLTIP. 10.4+ only, so we re-define the constant.
+  NSAccessibilityApplicationRole,               // ROLE_APPLICATION. unused on OS X. the system will take care of this.
+  NSAccessibilityGroupRole,                     // ROLE_DOCUMENT
+  NSAccessibilityGroupRole,                     // ROLE_PANE
+  NSAccessibilityUnknownRole,                   // ROLE_CHART
+  NSAccessibilityWindowRole,                    // ROLE_DIALOG. there's a dialog subrole.
+  NSAccessibilityUnknownRole,                   // ROLE_BORDER. unused on OS X
+  NSAccessibilityGroupRole,                     // ROLE_GROUPING
+  NSAccessibilityUnknownRole,                   // ROLE_SEPARATOR
+  NSAccessibilityToolbarRole,                   // ROLE_TOOLBAR
+  NSAccessibilityUnknownRole,                   // ROLE_STATUSBAR. doesn't exist on OS X (a status bar is its parts; a progressbar, a label, etc.)
+  NSAccessibilityTableRole,                     // ROLE_TABLE
+  NSAccessibilityUnknownRole,                   // ROLE_COLUMNHEADER
+  NSAccessibilityUnknownRole,                   // ROLE_ROWHEADER
+  NSAccessibilityColumnRole,                    // ROLE_COLUMN
+  NSAccessibilityRowRole,                       // ROLE_ROW
+  NSAccessibilityGroupRole,                     // ROLE_CELL
+  @"AXLink",                                    // ROLE_LINK. 10.4+ the attr first define in SDK 10.4, so we define it here too. ROLE_LINK
+  @"AXHelpTag",                                 // ROLE_HELPBALLOON
+  NSAccessibilityUnknownRole,                   // ROLE_CHARACTER. unusued on OS X
+  NSAccessibilityListRole,                      // ROLE_LIST
+  NSAccessibilityRowRole,                       // ROLE_LISTITEM
+  NSAccessibilityOutlineRole,                   // ROLE_OUTLINE
+  NSAccessibilityRowRole,                       // ROLE_OUTLINEITEM. XXX: use OutlineRow as subrole.
+  NSAccessibilityGroupRole,                     // ROLE_PAGETAB
+  NSAccessibilityGroupRole,                     // ROLE_PROPERTYPAGE
+  NSAccessibilityUnknownRole,                   // ROLE_INDICATOR
+  NSAccessibilityImageRole,                     // ROLE_GRAPHIC
+  NSAccessibilityStaticTextRole,                // ROLE_STATICTEXT
+  NSAccessibilityStaticTextRole,                // ROLE_TEXT_LEAF
+  NSAccessibilityButtonRole,                    // ROLE_PUSHBUTTON
+  NSAccessibilityCheckBoxRole,                  // ROLE_CHECKBUTTON
+  NSAccessibilityRadioButtonRole,               // ROLE_RADIOBUTTON
+  NSAccessibilityComboBoxRole,                  // ROLE_COMBOBOX
+  NSAccessibilityComboBoxRole,                  // ROLE_DROPLIST
+  NSAccessibilityProgressIndicatorRole,         // ROLE_PROGRESSBAR
+  NSAccessibilityUnknownRole,                   // ROLE_DIAL
+  NSAccessibilityUnknownRole,                   // ROLE_HOTKEYFIELD
+  NSAccessibilitySliderRole,                    // ROLE_SLIDER
+  NSAccessibilityIncrementorRole,               // ROLE_SPINBUTTON. subroles: Increment/Decrement.
+  NSAccessibilityUnknownRole,                   // ROLE_DIAGRAM
+  NSAccessibilityUnknownRole,                   // ROLE_ANIMATION
+  NSAccessibilityUnknownRole,                   // ROLE_EQUATION
+  NSAccessibilityPopUpButtonRole,               // ROLE_BUTTONDROPDOWN
+  NSAccessibilityMenuButtonRole,                // ROLE_BUTTONMENU
+  NSAccessibilityGroupRole,                     // ROLE_BUTTONDROPDOWNGRID
+  NSAccessibilityUnknownRole,                   // ROLE_WHITESPACE
+  NSAccessibilityGroupRole,                     // ROLE_PAGETABLIST
+  NSAccessibilityUnknownRole,                   // ROLE_CLOCK. unused on OS X
+  NSAccessibilityButtonRole,                    // ROLE_SPLITBUTTON
+  NSAccessibilityUnknownRole,                   // ROLE_IPADDRESS
+  NSAccessibilityStaticTextRole,                // ROLE_ACCEL_LABEL
+  NSAccessibilityUnknownRole,                   // ROLE_ARROW
+  NSAccessibilityUnknownRole,                   // ROLE_CANVAS
+  NSAccessibilityMenuItemRole,                  // ROLE_CHECK_MENU_ITEM
+  NSAccessibilityColorWellRole,                 // ROLE_COLOR_CHOOSER
+  NSAccessibilityUnknownRole,                   // ROLE_DATE_EDITOR
+  NSAccessibilityImageRole,                     // ROLE_DESKTOP_ICON
+  NSAccessibilityUnknownRole,                   // ROLE_DESKTOP_FRAME
+  NSAccessibilityBrowserRole,                   // ROLE_DIRECTORY_PANE
+  NSAccessibilityUnknownRole,                   // ROLE_FILE_CHOOSER. unused on OS X
+  NSAccessibilityUnknownRole,                   // ROLE_FONT_CHOOSER
+  NSAccessibilityUnknownRole,                   // ROLE_CHROME_WINDOW. unused on OS X
+  NSAccessibilityGroupRole,                     // ROLE_GLASS_PANE
+  NSAccessibilityUnknownRole,                   // ROLE_HTML_CONTAINER
+  NSAccessibilityImageRole,                     // ROLE_ICON
+  NSAccessibilityStaticTextRole,                // ROLE_LABEL
+  NSAccessibilityGroupRole,                     // ROLE_LAYERED_PANE
+  NSAccessibilityGroupRole,                     // ROLE_OPTION_PANE
+  NSAccessibilityTextFieldRole,                 // ROLE_PASSWORD_TEXT
+  NSAccessibilityPopUpButtonRole,               // ROLE_POPUP_MENU
+  NSAccessibilityMenuItemRole,                  // ROLE_RADIO_MENU_ITEM
+  NSAccessibilityGroupRole,                     // ROLE_ROOT_PANE
+  NSAccessibilityScrollAreaRole,                // ROLE_SCROLL_PANE
+  NSAccessibilitySplitGroupRole,                // ROLE_SPLIT_PANE
+  NSAccessibilityUnknownRole,                   // ROLE_TABLE_COLUMN_HEADER
+  NSAccessibilityUnknownRole,                   // ROLE_TABLE_ROW_HEADER
+  NSAccessibilityMenuItemRole,                  // ROLE_TEAR_OFF_MENU_ITEM
+  NSAccessibilityUnknownRole,                   // ROLE_TERMINAL
+  NSAccessibilityGroupRole,                     // ROLE_TEXT_CONTAINER
+  NSAccessibilityButtonRole,                    // ROLE_TOGGLE_BUTTON
+  NSAccessibilityTableRole,                     // ROLE_TREE_TABLE
+  NSAccessibilityUnknownRole,                   // ROLE_VIEWPORT
+  NSAccessibilityStaticTextRole,                // ROLE_HEADER
+  NSAccessibilityStaticTextRole,                // ROLE_FOOTER
+  NSAccessibilityGroupRole,                     // ROLE_PARAGRAPH
+  @"AXRuler",                                   // ROLE_RULER. 10.4+ only, so we re-define the constant.
+  NSAccessibilityUnknownRole,                   // ROLE_AUTOCOMPLETE
+  NSAccessibilityTextFieldRole,                 // ROLE_EDITBAR
+  NSAccessibilityTextFieldRole,                 // ROLE_ENTRY
+  NSAccessibilityStaticTextRole,                // ROLE_CAPTION
+  @"AXWebArea",                                 // ROLE_DOCUMENT_FRAME
+  NSAccessibilityStaticTextRole,                // ROLE_HEADING
+  NSAccessibilityGroupRole,                     // ROLE_PAGE
+  NSAccessibilityGroupRole,                     // ROLE_SECTION
+  NSAccessibilityUnknownRole,                   // ROLE_REDUNDANT_OBJECT
+  NSAccessibilityGroupRole,                     // ROLE_FORM
+  NSAccessibilityUnknownRole,                   // ROLE_IME
+  NSAccessibilityUnknownRole,                   // ROLE_APP_ROOT. unused on OS X
+  NSAccessibilityMenuItemRole,                  // ROLE_PARENT_MENUITEM
+  @"ROLE_LAST_ENTRY"                            // ROLE_LAST_ENTRY. bogus role that will never be shown (just marks the end of this array)!
 };
--- a/accessible/src/msaa/nsRoleMap.h
+++ b/accessible/src/msaa/nsRoleMap.h
@ -133,13 +133,11 @@ PRUint32 msaaRoleMap[] = {
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_DESKTOP_FRAME
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_DIRECTORY_PANE
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FILE_CHOOSER
-    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FILLER
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FONT_CHOOSER
    ROLE_SYSTEM_APPLICATION,         // nsIAccessible::ROLE_CHROME_WINDOW
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_GLASS_PANE
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_HTML_CONTAINER
    ROLE_SYSTEM_PUSHBUTTON,          // nsIAccessible::ROLE_ICON
-    USE_ROLE_STRING,                 // nsIAccessible::ROLE_INTERNAL_FRAME
    ROLE_SYSTEM_STATICTEXT,          // nsIAccessible::ROLE_LABEL
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_LAYERED_PANE
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_OPTION_PANE
@ -163,7 +161,6 @@ PRUint32 msaaRoleMap[] = {
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_RULER
    ROLE_SYSTEM_COMBOBOX,            // nsIAccessible::ROLE_AUTOCOMPLETE
    ROLE_SYSTEM_TEXT,                // nsIAccessible::ROLE_EDITBAR
-    USE_ROLE_STRING,                 // nsIAccessible::ROLE_EMBEDDED
    ROLE_SYSTEM_TEXT,                // nsIAccessible::ROLE_ENTRY
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_CAPTION
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_DOCUMENT_FRAME