Commit 0f1e57f2 authored by aaronleventhal%moonset.net's avatar aaronleventhal%moonset.net
Browse files

Bug 347022. Use ATK_ROLE_EMBEDDED for wairole:application. r=evan.yan

parent fd2413a6

accessible/public/nsIAccessible.idl

+1 −1
Original line number Diff line number Diff line
@@ -434,7 +434,7 @@ interface nsIAccessible : nsISupports 
  const unsigned long ROLE_FILE_CHOOSER = 73;

  const unsigned long ROLE_FILLER = 74;

  const unsigned long ROLE_FONT_CHOOSER = 75;

  const unsigned long ROLE_FRAME = 76;

  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;

accessible/src/atk/nsRoleMap.h

+3 −3
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ PRUint32 atkRoleMap[] = { 
    ATK_ROLE_MENU,                // nsIAccessible::ROLE_MENUPOPUP         11

    ATK_ROLE_MENU_ITEM,           // nsIAccessible::ROLE_MENUITEM          12

    ATK_ROLE_TOOL_TIP,            // nsIAccessible::ROLE_TOOLTIP           13

    ATK_ROLE_FRAME,               // nsIAccessible::ROLE_APPLICATION       14

    ATK_ROLE_EMBEDDED,            // nsIAccessible::ROLE_APPLICATION       14

#ifdef USE_ATK_ROLE_DOCUMENT_FRAME 

    ATK_ROLE_DOCUMENT_FRAME,      // nsIAccessible::ROLE_DOCUMENT          15

#else
@@ -134,7 +134,7 @@ PRUint32 atkRoleMap[] = { 
    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_FRAME             76

    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

accessible/src/base/nsDocAccessible.cpp

+1 −1
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ NS_IMETHODIMP nsDocAccessible::GetRole(PRUint32 *aRole) 
      PRInt32 itemType;

      docShellTreeItem->GetItemType(&itemType);

      if (itemType == nsIDocShellTreeItem::typeChrome) {

        *aRole = ROLE_APPLICATION;

        *aRole = ROLE_CHROME_WINDOW;

      }

      else if (itemType == nsIDocShellTreeItem::typeContent) {

#ifdef MOZ_XUL

accessible/src/msaa/nsRoleMap.h

+1 −1
Original line number Diff line number Diff line
@@ -135,7 +135,7 @@ PRUint32 msaaRoleMap[] = { 
    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FILE_CHOOSER

    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FILLER

    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FONT_CHOOSER

    USE_ROLE_STRING,                 // nsIAccessible::ROLE_FRAME

    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