corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 592193 - add dexpcom version of nsIAccessible::role, part1: change GetRoleInternal, r=marcoz, a=davidb

Browse Source
This commit is contained in:
Alexander Surkov
2010-09-05 11:14:01 +09:00
parent ad086512ce
commit 498293ff6e
66 changed files with 465 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
accessible/src/atk/nsMaiInterfaceAction.cpp
View File

@@ -124,11 +124,9 @@ getKeyBindingCB(AtkAction *aAction, gint aActionIndex)
nsresult rv = accWrap->GetKeyboardShortcut(accessKey);
if (NS_SUCCEEDED(rv) && !accessKey.IsEmpty()) {
nsCOMPtr<nsIAccessible> parentAccessible;
accWrap->GetParent(getter_AddRefs(parentAccessible));
if (parentAccessible) {
PRUint32 geckoRole = nsAccUtils::RoleInternal(parentAccessible);
PRUint32 atkRole = atkRoleMap[geckoRole];
nsAccessible* parent = accWrap->GetParent();
if (parent) {
PRUint32 atkRole = atkRoleMap[parent->NativeRole()];
if (atkRole == ATK_ROLE_MENU_BAR) {
//it is topmenu, change from "Alt+f" to "f;<Alt>f"
@@ -140,11 +138,11 @@ getKeyBindingCB(AtkAction *aAction, gint aActionIndex)
else if ((atkRole == ATK_ROLE_MENU) || (atkRole == ATK_ROLE_MENU_ITEM)) {
//it is submenu, change from "s" to "s;<Alt>f:s"
nsAutoString allKey = accessKey;
nsCOMPtr<nsIAccessible> grandParentAcc = parentAccessible;
nsAccessible* grandParent = parent;
while ((grandParentAcc) && (atkRole != ATK_ROLE_MENU_BAR)) {
do {
nsAutoString grandParentKey;
grandParentAcc->GetKeyboardShortcut(grandParentKey);
grandParent->GetKeyboardShortcut(grandParentKey);
if (!grandParentKey.IsEmpty()) {
nsAutoString rightChar;
@@ -152,11 +150,9 @@ getKeyBindingCB(AtkAction *aAction, gint aActionIndex)
allKey = rightChar + NS_LITERAL_STRING(":") + allKey;
}
nsCOMPtr<nsIAccessible> tempAcc = grandParentAcc;
tempAcc->GetParent(getter_AddRefs(grandParentAcc));
geckoRole = nsAccUtils::RoleInternal(grandParentAcc);
atkRole = atkRoleMap[geckoRole];
}
} while ((grandParent = grandParent->GetParent()) &&
atkRoleMap[grandParent->NativeRole()] != ATK_ROLE_MENU_BAR);
allKeyBinding = accessKey + NS_LITERAL_STRING(";<Alt>") +
allKey;
}

8
accessible/src/atk/nsMaiInterfaceText.cpp
View File

@@ -80,9 +80,7 @@ textInterfaceInitCB(AtkTextIface *aIface)
void ConvertTexttoAsterisks(nsAccessibleWrap* accWrap, nsAString& aString)
{
// convert each char to "*" when it's "password text"
PRUint32 accRole = 0;
accWrap->GetRoleInternal(&accRole);
PRUint32 atkRole = atkRoleMap[accRole];
PRUint32 atkRole = atkRoleMap[accWrap->NativeRole()];
if (atkRole == ATK_ROLE_PASSWORD_TEXT) {
for (PRUint32 i = 0; i < aString.Length(); i++)
aString.Replace(i, 1, NS_LITERAL_STRING("*"));
@@ -189,9 +187,7 @@ getCharacterAtOffsetCB(AtkText *aText, gint aOffset)
accText->GetCharacterAtOffset(aOffset, &uniChar);
// convert char to "*" when it's "password text"
PRUint32 accRole;
accWrap->GetRoleInternal(&accRole);
PRUint32 atkRole = atkRoleMap[accRole];
PRUint32 atkRole = atkRoleMap[accWrap->NativeRole()];
if (atkRole == ATK_ROLE_PASSWORD_TEXT)
uniChar = '*';

17
accessible/src/base/nsAccUtils.cpp
View File

@@ -578,23 +578,6 @@ nsAccUtils::GetRoleMapEntry(nsINode *aNode)
return &nsARIAMap::gLandmarkRoleMap;
}
PRUint32
nsAccUtils::RoleInternal(nsIAccessible *aAcc)
{
PRUint32 role = nsIAccessibleRole::ROLE_NOTHING;
if (aAcc) {
nsAccessible* accessible = nsnull;
CallQueryInterface(aAcc, &accessible);
if (accessible) {
accessible->GetRoleInternal(&role);
NS_RELEASE(accessible);
}
}
return role;
}
PRUint8
nsAccUtils::GetAttributeCharacteristics(nsIAtom* aAtom)
{

5
accessible/src/base/nsAccUtils.h
View File

@@ -297,11 +297,6 @@ public:
return role;
}
/**
* Return the role from native markup of the given accessible.
*/
static PRUint32 RoleInternal(nsIAccessible *aAcc);
/**
* Return the state for the given accessible.
*/

19
accessible/src/base/nsAccessible.cpp
View File

@@ -1308,7 +1308,8 @@ nsAccessible::GetRole(PRUint32 *aRole)
return NS_OK;
}
return GetRoleInternal(aRole);
*aRole = NativeRole();
return NS_OK;
}
NS_IMETHODIMP
@@ -1852,19 +1853,11 @@ nsAccessible::GetKeyBindings(PRUint8 aActionIndex,
return NS_OK;
}
/* unsigned long getRole (); */
nsresult
nsAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_NOTHING;
if (IsDefunct())
return NS_ERROR_FAILURE;
if (nsCoreUtils::IsXLink(mContent))
*aRole = nsIAccessibleRole::ROLE_LINK;
return NS_OK;
return nsCoreUtils::IsXLink(mContent) ?
nsIAccessibleRole::ROLE_LINK : nsIAccessibleRole::ROLE_NOTHING;
}
// readonly attribute PRUint8 numActions

4
accessible/src/base/nsAccessible.h
View File

@@ -146,10 +146,8 @@ public:
/**
* Returns enumerated accessible role from native markup (see constants in
* nsIAccessibleRole). Doesn't take into account ARIA roles.
*
* @param aRole [out] accessible role.
*/
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
/**
* Return the state of accessible that doesn't take into account ARIA states.

11
accessible/src/base/nsApplicationAccessible.cpp
View File

@@ -143,7 +143,9 @@ NS_IMETHODIMP
nsApplicationAccessible::GetRole(PRUint32 *aRole)
{
NS_ENSURE_ARG_POINTER(aRole);
return GetRoleInternal(aRole);
*aRole = NativeRole();
return NS_OK;
}
NS_IMETHODIMP
@@ -379,11 +381,10 @@ nsApplicationAccessible::GetARIAState(PRUint32 *aState, PRUint32 *aExtraState)
return NS_OK;
}
nsresult
nsApplicationAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsApplicationAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_APP_ROOT;
return NS_OK;
return nsIAccessibleRole::ROLE_APP_ROOT;
}
nsresult

2
accessible/src/base/nsApplicationAccessible.h
View File

@@ -113,7 +113,7 @@ public:
// nsAccessible
virtual nsresult GetARIAState(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual void InvalidateChildren();

7
accessible/src/base/nsBaseWidgetAccessible.cpp
View File

@@ -302,9 +302,8 @@ nsEnumRoleAccessible::
NS_IMPL_ISUPPORTS_INHERITED0(nsEnumRoleAccessible, nsAccessible)
nsresult
nsEnumRoleAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsEnumRoleAccessible::NativeRole()
{
*aRole = mRole;
return NS_OK;
return mRole;
}

2
accessible/src/base/nsBaseWidgetAccessible.h
View File

@@ -135,7 +135,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
protected:
PRUint32 mRole;

28
accessible/src/base/nsDocAccessible.cpp
View File

@@ -203,11 +203,9 @@ nsDocAccessible::GetName(nsAString& aName)
}
// nsAccessible public method
nsresult
nsDocAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsDocAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PANE; // Fall back
nsCOMPtr<nsIDocShellTreeItem> docShellTreeItem =
nsCoreUtils::GetDocShellTreeItemFor(mDocument);
if (docShellTreeItem) {
@@ -217,28 +215,24 @@ nsDocAccessible::GetRoleInternal(PRUint32 *aRole)
docShellTreeItem->GetItemType(&itemType);
if (sameTypeRoot == docShellTreeItem) {
// Root of content or chrome tree
if (itemType == nsIDocShellTreeItem::typeChrome) {
*aRole = nsIAccessibleRole::ROLE_CHROME_WINDOW;
}
else if (itemType == nsIDocShellTreeItem::typeContent) {
if (itemType == nsIDocShellTreeItem::typeChrome)
return nsIAccessibleRole::ROLE_CHROME_WINDOW;
if (itemType == nsIDocShellTreeItem::typeContent) {
#ifdef MOZ_XUL
nsCOMPtr<nsIXULDocument> xulDoc(do_QueryInterface(mDocument));
if (xulDoc) {
*aRole = nsIAccessibleRole::ROLE_APPLICATION;
} else {
*aRole = nsIAccessibleRole::ROLE_DOCUMENT;
}
#else
*aRole = nsIAccessibleRole::ROLE_DOCUMENT;
if (xulDoc)
return nsIAccessibleRole::ROLE_APPLICATION;
#endif
return nsIAccessibleRole::ROLE_DOCUMENT;
}
}
else if (itemType == nsIDocShellTreeItem::typeContent) {
*aRole = nsIAccessibleRole::ROLE_DOCUMENT;
return nsIAccessibleRole::ROLE_DOCUMENT;
}
}
return NS_OK;
return nsIAccessibleRole::ROLE_PANE; // Fall back;
}
// nsAccessible public method

2
accessible/src/base/nsDocAccessible.h
View File

@@ -110,7 +110,7 @@ public:
virtual nsINode* GetNode() const { return mDocument; }
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetARIAState(PRUint32 *aState, PRUint32 *aExtraState);

7
accessible/src/base/nsFormControlAccessible.cpp
View File

@@ -82,10 +82,9 @@ nsRadioButtonAccessible::DoAction(PRUint8 aIndex)
return NS_OK;
}
nsresult
nsRadioButtonAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsRadioButtonAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_RADIOBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_RADIOBUTTON;
}

2
accessible/src/base/nsFormControlAccessible.h
View File

@@ -58,7 +58,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
enum { eAction_Click = 0 };
};

7
accessible/src/base/nsOuterDocAccessible.cpp
View File

@@ -60,11 +60,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsOuterDocAccessible,
////////////////////////////////////////////////////////////////////////////////
// nsAccessible public (DON'T add methods here)
nsresult
nsOuterDocAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsOuterDocAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_INTERNAL_FRAME;
return NS_OK;
return nsIAccessibleRole::ROLE_INTERNAL_FRAME;
}
nsresult

2
accessible/src/base/nsOuterDocAccessible.h
View File

@@ -67,7 +67,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual nsresult GetChildAtPoint(PRInt32 aX, PRInt32 aY,

19
accessible/src/base/nsRootAccessible.cpp
View File

@@ -142,14 +142,9 @@ nsRootAccessible::GetName(nsAString& aName)
return document->GetTitle(aName);
}
/* readonly attribute unsigned long accRole; */
nsresult
nsRootAccessible::GetRoleInternal(PRUint32 *aRole)
{
if (!mDocument) {
return NS_ERROR_FAILURE;
}
PRUint32
nsRootAccessible::NativeRole()
{
// If it's a <dialog> or <wizard>, use nsIAccessibleRole::ROLE_DIALOG instead
dom::Element *root = mDocument->GetRootElement();
if (root) {
@@ -158,13 +153,12 @@ nsRootAccessible::GetRoleInternal(PRUint32 *aRole)
nsAutoString name;
rootElement->GetLocalName(name);
if (name.EqualsLiteral("dialog") || name.EqualsLiteral("wizard")) {
*aRole = nsIAccessibleRole::ROLE_DIALOG; // Always at the root
return NS_OK;
return nsIAccessibleRole::ROLE_DIALOG; // Always at the root
}
}
}
return nsDocAccessibleWrap::GetRoleInternal(aRole);
return nsDocAccessibleWrap::NativeRole();
}
// nsRootAccessible protected member
@@ -395,8 +389,7 @@ nsRootAccessible::FireAccessibleFocusEvent(nsAccessible *aAccessible,
if (role == nsIAccessibleRole::ROLE_MENUITEM) {
if (!mCurrentARIAMenubar) { // Entering menus
// The natural role is the role that this type of element normally has
PRUint32 naturalRole = nsAccUtils::RoleInternal(finalFocusAccessible);
if (role != naturalRole) { // Must be a DHTML menuitem
if (role != finalFocusAccessible->NativeRole()) { // Must be a DHTML menuitem
nsAccessible *menuBarAccessible =
nsAccUtils::GetAncestorWithRole(finalFocusAccessible,
nsIAccessibleRole::ROLE_MENUBAR);

2
accessible/src/base/nsRootAccessible.h
View File

@@ -84,7 +84,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
// nsRootAccessible

7
accessible/src/base/nsTextAccessible.cpp
View File

@@ -50,11 +50,10 @@ nsTextAccessible::
{
}
nsresult
nsTextAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsTextAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_TEXT_LEAF;
return NS_OK;
return nsIAccessibleRole::ROLE_TEXT_LEAF;
}
nsresult

2
accessible/src/base/nsTextAccessible.h
View File

@@ -50,7 +50,7 @@ public:
nsTextAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult AppendTextTo(nsAString& aText, PRUint32 aStartOffset,
PRUint32 aLength);

45
accessible/src/html/nsHTMLFormControlAccessible.cpp
View File

@@ -69,11 +69,10 @@ nsHTMLCheckboxAccessible::
{
}
nsresult
nsHTMLCheckboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLCheckboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_CHECKBUTTON;
}
NS_IMETHODIMP nsHTMLCheckboxAccessible::GetNumActions(PRUint8 *_retval)
@@ -282,11 +281,10 @@ nsHTMLButtonAccessible::GetStateInternal(PRUint32 *aState,
return NS_OK;
}
nsresult
nsHTMLButtonAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLButtonAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -359,11 +357,10 @@ nsHTML4ButtonAccessible::DoAction(PRUint8 aIndex)
return NS_OK;
}
nsresult
nsHTML4ButtonAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTML4ButtonAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -396,16 +393,14 @@ nsHTMLTextFieldAccessible::
NS_IMPL_ISUPPORTS_INHERITED3(nsHTMLTextFieldAccessible, nsAccessible, nsHyperTextAccessible, nsIAccessibleText, nsIAccessibleEditableText)
nsresult
nsHTMLTextFieldAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLTextFieldAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_ENTRY;
if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::password, eIgnoreCase)) {
*aRole = nsIAccessibleRole::ROLE_PASSWORD_TEXT;
return nsIAccessibleRole::ROLE_PASSWORD_TEXT;
}
return NS_OK;
return nsIAccessibleRole::ROLE_ENTRY;
}
nsresult
@@ -588,11 +583,10 @@ nsHTMLGroupboxAccessible::
{
}
nsresult
nsHTMLGroupboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLGroupboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
nsIContent* nsHTMLGroupboxAccessible::GetLegend()
@@ -687,9 +681,8 @@ nsHTMLLegendAccessible::GetRelationByType(PRUint32 aRelationType,
return NS_OK;
}
nsresult
nsHTMLLegendAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLLegendAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LABEL;
return NS_OK;
return nsIAccessibleRole::ROLE_LABEL;
}

12
accessible/src/html/nsHTMLFormControlAccessible.h
View File

@@ -59,7 +59,7 @@ public:
NS_IMETHOD DoAction(PRUint8 index);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -99,7 +99,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -121,7 +121,7 @@ public:
NS_IMETHOD DoAction(PRUint8 index);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -150,7 +150,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -169,7 +169,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
protected:
nsIContent* GetLegend();
@@ -189,7 +189,7 @@ public:
nsIAccessibleRelation **aRelation);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
#endif

7
accessible/src/html/nsHTMLImageAccessible.cpp
View File

@@ -120,11 +120,10 @@ nsHTMLImageAccessible::GetNameInternal(nsAString& aName)
return NS_OK;
}
nsresult
nsHTMLImageAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLImageAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GRAPHIC;
return NS_OK;
return nsIAccessibleRole::ROLE_GRAPHIC;
}
////////////////////////////////////////////////////////////////////////////////

2
accessible/src/html/nsHTMLImageAccessible.h
View File

@@ -66,7 +66,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);

7
accessible/src/html/nsHTMLImageMapAccessible.cpp
View File

@@ -68,11 +68,10 @@ NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLImageMapAccessible, nsHTMLImageAccessible)
////////////////////////////////////////////////////////////////////////////////
// nsHTMLImageMapAccessible: nsAccessible public
nsresult
nsHTMLImageMapAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLImageMapAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_IMAGE_MAP;
return NS_OK;
return nsIAccessibleRole::ROLE_IMAGE_MAP;
}
////////////////////////////////////////////////////////////////////////////////

2
accessible/src/html/nsHTMLImageMapAccessible.h
View File

@@ -58,7 +58,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
// HyperLinkAccessible
virtual PRUint32 AnchorCount();

7
accessible/src/html/nsHTMLLinkAccessible.cpp
View File

@@ -60,11 +60,10 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLLinkAccessible, nsHyperTextAccessibleWrap,
////////////////////////////////////////////////////////////////////////////////
// nsIAccessible
nsresult
nsHTMLLinkAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLLinkAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LINK;
return NS_OK;
return nsIAccessibleRole::ROLE_LINK;
}
nsresult

2
accessible/src/html/nsHTMLLinkAccessible.h
View File

@@ -57,7 +57,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
// HyperLinkAccessible

34
accessible/src/html/nsHTMLSelectAccessible.cpp
View File

@@ -101,15 +101,13 @@ nsHTMLSelectListAccessible::GetStateInternal(PRUint32 *aState,
return NS_OK;
}
nsresult
nsHTMLSelectListAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLSelectListAccessible::NativeRole()
{
if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX)
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
else
*aRole = nsIAccessibleRole::ROLE_LISTBOX;
return nsIAccessibleRole::ROLE_COMBOBOX_LIST;
return NS_OK;
return nsIAccessibleRole::ROLE_LISTBOX;
}
////////////////////////////////////////////////////////////////////////////////
@@ -198,15 +196,13 @@ nsHTMLSelectOptionAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsHTMLSelectOptionAccessible: nsAccessible public
nsresult
nsHTMLSelectOptionAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLSelectOptionAccessible::NativeRole()
{
if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST)
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
else
*aRole = nsIAccessibleRole::ROLE_OPTION;
return nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
return NS_OK;
return nsIAccessibleRole::ROLE_OPTION;
}
nsresult
@@ -621,11 +617,10 @@ nsHTMLSelectOptGroupAccessible::
{
}
nsresult
nsHTMLSelectOptGroupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLSelectOptGroupAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_HEADING;
return NS_OK;
return nsIAccessibleRole::ROLE_HEADING;
}
nsresult
@@ -681,11 +676,10 @@ nsHTMLComboboxAccessible::
{
}
nsresult
nsHTMLComboboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLComboboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_COMBOBOX;
return NS_OK;
return nsIAccessibleRole::ROLE_COMBOBOX;
}
void

8
accessible/src/html/nsHTMLSelectAccessible.h
View File

@@ -73,7 +73,7 @@ public:
virtual ~nsHTMLSelectListAccessible() {}
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
// SelectAccessible
@@ -113,7 +113,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRInt32 GetLevelInternal();
@@ -158,7 +158,7 @@ public:
NS_IMETHOD GetNumActions(PRUint8 *_retval);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:
@@ -194,7 +194,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:

54
accessible/src/html/nsHTMLTableAccessible.cpp
View File

@@ -86,11 +86,10 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsHTMLTableCellAccessible,
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableCellAccessible: nsAccessible implementation
nsresult
nsHTMLTableCellAccessible::GetRoleInternal(PRUint32 *aResult)
PRUint32
nsHTMLTableCellAccessible::NativeRole()
{
*aResult = nsIAccessibleRole::ROLE_CELL;
return NS_OK;
return nsIAccessibleRole::ROLE_CELL;
}
nsresult
@@ -372,8 +371,8 @@ nsHTMLTableHeaderCellAccessible::
////////////////////////////////////////////////////////////////////////////////
// nsHTMLTableHeaderAccessible: nsAccessible implementation
nsresult
nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLTableHeaderCellAccessible::NativeRole()
{
// Check value of @scope attribute.
static nsIContent::AttrValuesArray scopeValues[] =
@@ -384,17 +383,18 @@ nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
switch (valueIdx) {
case 0:
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_COLUMNHEADER;
case 1:
*aRole = nsIAccessibleRole::ROLE_ROWHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_ROWHEADER;
}
// Assume it's columnheader if there are headers in siblings, oterwise
// rowheader.
nsIContent *parent = mContent->GetParent();
NS_ENSURE_STATE(parent);
if (!parent) {
NS_ERROR("Deattached content on alive accessible?");
return nsIAccessibleRole::ROLE_NOTHING;
}
PRInt32 indexInParent = parent->IndexOf(mContent);
@@ -402,11 +402,8 @@ nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
nsIContent* sibling = parent->GetChildAt(idx);
if (sibling && sibling->IsElement()) {
if (nsCoreUtils::IsHTMLTableHeader(sibling))
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
else
*aRole = nsIAccessibleRole::ROLE_ROWHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_COLUMNHEADER;
return nsIAccessibleRole::ROLE_ROWHEADER;
}
}
@@ -415,19 +412,14 @@ nsHTMLTableHeaderCellAccessible::GetRoleInternal(PRUint32 *aRole)
nsIContent* sibling = parent->GetChildAt(idx);
if (sibling && sibling->IsElement()) {
if (nsCoreUtils::IsHTMLTableHeader(sibling))
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
else
*aRole = nsIAccessibleRole::ROLE_ROWHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_COLUMNHEADER;
return nsIAccessibleRole::ROLE_ROWHEADER;
}
}
// No elements in siblings what means the table has one column only. Therefore
// it should be column header.
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_COLUMNHEADER;
}
////////////////////////////////////////////////////////////////////////////////
@@ -470,11 +462,10 @@ nsHTMLTableAccessible::CacheChildren()
}
}
nsresult
nsHTMLTableAccessible::GetRoleInternal(PRUint32 *aResult)
PRUint32
nsHTMLTableAccessible::NativeRole()
{
*aResult = nsIAccessibleRole::ROLE_TABLE;
return NS_OK;
return nsIAccessibleRole::ROLE_TABLE;
}
nsresult
@@ -1560,9 +1551,8 @@ nsHTMLCaptionAccessible::GetRelationByType(PRUint32 aRelationType,
return NS_OK;
}
nsresult
nsHTMLCaptionAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLCaptionAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CAPTION;
return NS_OK;
return nsIAccessibleRole::ROLE_CAPTION;
}

8
accessible/src/html/nsHTMLTableAccessible.h
View File

@@ -61,7 +61,7 @@ public:
NS_DECL_NSIACCESSIBLETABLECELL
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
@@ -99,7 +99,7 @@ public:
nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
@@ -137,7 +137,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
@@ -215,7 +215,7 @@ public:
nsIAccessibleRelation **aRelation);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
#endif

55
accessible/src/html/nsHTMLTextAccessible.cpp
View File

@@ -68,18 +68,17 @@ nsHTMLTextAccessible::GetName(nsAString& aName)
return AppendTextTo(aName, 0, PR_UINT32_MAX);
}
nsresult
nsHTMLTextAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLTextAccessible::NativeRole()
{
nsIFrame *frame = GetFrame();
// Don't return on null frame -- we still return a role
// after accessible is shutdown/DEFUNCT
if (frame && frame->IsGeneratedContentFrame()) {
*aRole = nsIAccessibleRole::ROLE_STATICTEXT;
return NS_OK;
return nsIAccessibleRole::ROLE_STATICTEXT;
}
return nsTextAccessible::GetRoleInternal(aRole);
return nsTextAccessible::NativeRole();
}
nsresult
@@ -103,9 +102,7 @@ nsHTMLTextAccessible::GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState)
nsresult
nsHTMLTextAccessible::GetAttributesInternal(nsIPersistentProperties *aAttributes)
{
PRUint32 role;
GetRoleInternal(&role);
if (role == nsIAccessibleRole::ROLE_STATICTEXT) {
if (NativeRole() == nsIAccessibleRole::ROLE_STATICTEXT) {
nsAutoString oldValueUnused;
aAttributes->SetStringProperty(NS_LITERAL_CSTRING("auto-generated"),
NS_LITERAL_STRING("true"), oldValueUnused);
@@ -125,11 +122,10 @@ nsHTMLHRAccessible::
{
}
nsresult
nsHTMLHRAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLHRAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_SEPARATOR;
return NS_OK;
return nsIAccessibleRole::ROLE_SEPARATOR;
}
@@ -143,11 +139,10 @@ nsHTMLBRAccessible::
{
}
nsresult
nsHTMLBRAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLBRAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_WHITESPACE;
return NS_OK;
return nsIAccessibleRole::ROLE_WHITESPACE;
}
nsresult
@@ -194,11 +189,10 @@ nsHTMLLabelAccessible::GetNameInternal(nsAString& aName)
return nsTextEquivUtils::GetNameFromSubtree(this, aName);
}
nsresult
nsHTMLLabelAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLLabelAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LABEL;
return NS_OK;
return nsIAccessibleRole::ROLE_LABEL;
}
////////////////////////////////////////////////////////////////////////////////
@@ -232,11 +226,10 @@ nsHTMLLIAccessible::Shutdown()
mBulletAccessible = nsnull;
}
nsresult
nsHTMLLIAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLLIAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LISTITEM;
return NS_OK;
return nsIAccessibleRole::ROLE_LISTITEM;
}
nsresult
@@ -315,11 +308,10 @@ nsHTMLListBulletAccessible::GetName(nsAString &aName)
return NS_OK;
}
nsresult
nsHTMLListBulletAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLListBulletAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_STATICTEXT;
return NS_OK;
return nsIAccessibleRole::ROLE_STATICTEXT;
}
nsresult
@@ -357,11 +349,10 @@ nsHTMLListAccessible::
NS_IMPL_ISUPPORTS_INHERITED0(nsHTMLListAccessible, nsHyperTextAccessible)
nsresult
nsHTMLListAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLListAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LIST;
return NS_OK;
return nsIAccessibleRole::ROLE_LIST;
}
nsresult

14
accessible/src/html/nsHTMLTextAccessible.h
View File

@@ -60,7 +60,7 @@ public:
// nsAccessible
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -73,7 +73,7 @@ public:
nsHTMLHRAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -86,7 +86,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -102,7 +102,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -124,7 +124,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult AppendTextTo(nsAString& aText, PRUint32 aStartOffset,
PRUint32 aLength);
@@ -151,7 +151,7 @@ public:
NS_DECL_ISUPPORTS_INHERITED
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -174,7 +174,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:

57
accessible/src/html/nsHyperTextAccessible.cpp
View File

@@ -126,42 +126,35 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
return nsAccessible::QueryInterface(aIID, aInstancePtr);
}
nsresult
nsHyperTextAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHyperTextAccessible::NativeRole()
{
if (IsDefunct())
return NS_ERROR_FAILURE;
nsIAtom *tag = mContent->Tag();
if (tag == nsAccessibilityAtoms::form) {
*aRole = nsIAccessibleRole::ROLE_FORM;
if (tag == nsAccessibilityAtoms::form)
return nsIAccessibleRole::ROLE_FORM;
if (tag == nsAccessibilityAtoms::div ||
tag == nsAccessibilityAtoms::blockquote)
return nsIAccessibleRole::ROLE_SECTION;
if (tag == nsAccessibilityAtoms::h1 ||
tag == nsAccessibilityAtoms::h2 ||
tag == nsAccessibilityAtoms::h3 ||
tag == nsAccessibilityAtoms::h4 ||
tag == nsAccessibilityAtoms::h5 ||
tag == nsAccessibilityAtoms::h6)
return nsIAccessibleRole::ROLE_HEADING;
nsIFrame *frame = GetFrame();
if (frame && frame->GetType() == nsAccessibilityAtoms::blockFrame &&
frame->GetContent()->Tag() != nsAccessibilityAtoms::input) {
// An html:input @type="file" is the only input that is exposed as a
// blockframe. It must be exposed as ROLE_TEXT_CONTAINER for JAWS.
return nsIAccessibleRole::ROLE_PARAGRAPH;
}
else if (tag == nsAccessibilityAtoms::div ||
tag == nsAccessibilityAtoms::blockquote) {
*aRole = nsIAccessibleRole::ROLE_SECTION;
}
else if (tag == nsAccessibilityAtoms::h1 ||
tag == nsAccessibilityAtoms::h2 ||
tag == nsAccessibilityAtoms::h3 ||
tag == nsAccessibilityAtoms::h4 ||
tag == nsAccessibilityAtoms::h5 ||
tag == nsAccessibilityAtoms::h6) {
*aRole = nsIAccessibleRole::ROLE_HEADING;
}
else {
nsIFrame *frame = GetFrame();
if (frame && frame->GetType() == nsAccessibilityAtoms::blockFrame &&
frame->GetContent()->Tag() != nsAccessibilityAtoms::input) {
// An html:input @type="file" is the only input that is exposed as a
// blockframe. It must be exposed as ROLE_TEXT_CONTAINER for JAWS.
*aRole = nsIAccessibleRole::ROLE_PARAGRAPH;
}
else {
*aRole = nsIAccessibleRole::ROLE_TEXT_CONTAINER; // In ATK this works
}
}
return NS_OK;
return nsIAccessibleRole::ROLE_TEXT_CONTAINER; // In ATK this works
}
nsresult

2
accessible/src/html/nsHyperTextAccessible.h
View File

@@ -86,7 +86,7 @@ public:
// nsAccessible
virtual PRInt32 GetLevelInternal();
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual void InvalidateChildren();

9
accessible/src/msaa/nsHTMLWin32ObjectAccessible.cpp
View File

@@ -64,13 +64,10 @@ nsHTMLWin32ObjectOwnerAccessible::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsHTMLWin32ObjectOwnerAccessible: nsAccessible implementation
nsresult
nsHTMLWin32ObjectOwnerAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsHTMLWin32ObjectOwnerAccessible::NativeRole()
{
NS_ENSURE_ARG_POINTER(aRole);
*aRole = nsIAccessibleRole::ROLE_EMBEDDED_OBJECT;
return NS_OK;
return nsIAccessibleRole::ROLE_EMBEDDED_OBJECT;
}
nsresult

2
accessible/src/msaa/nsHTMLWin32ObjectAccessible.h
View File

@@ -61,7 +61,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:

7
accessible/src/xforms/nsXFormsAccessible.cpp
View File

@@ -244,11 +244,10 @@ nsXFormsContainerAccessible::
{
}
nsresult
nsXFormsContainerAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsContainerAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
PRBool

2
accessible/src/xforms/nsXFormsAccessible.h
View File

@@ -128,7 +128,7 @@ public:
nsXFormsContainerAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
// Allows accessible nodes in anonymous content of xforms element by
// always returning PR_TRUE value.

98
accessible/src/xforms/nsXFormsFormControlsAccessible.cpp
View File

@@ -50,11 +50,10 @@ nsXFormsLabelAccessible::
{
}
nsresult
nsXFormsLabelAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsLabelAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LABEL;
return NS_OK;
return nsIAccessibleRole::ROLE_LABEL;
}
nsresult
@@ -86,11 +85,10 @@ nsXFormsOutputAccessible::
{
}
nsresult
nsXFormsOutputAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsOutputAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_STATICTEXT;
return NS_OK;
return nsIAccessibleRole::ROLE_STATICTEXT;
}
@@ -104,11 +102,10 @@ nsXFormsTriggerAccessible::
{
}
nsresult
nsXFormsTriggerAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsTriggerAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
NS_IMETHODIMP
@@ -160,11 +157,10 @@ nsXFormsInputAccessible::
NS_IMPL_ISUPPORTS_INHERITED3(nsXFormsInputAccessible, nsAccessible, nsHyperTextAccessible, nsIAccessibleText, nsIAccessibleEditableText)
nsresult
nsXFormsInputAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsInputAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_ENTRY;
return NS_OK;
return nsIAccessibleRole::ROLE_ENTRY;
}
NS_IMETHODIMP
@@ -207,11 +203,10 @@ nsXFormsInputBooleanAccessible::
{
}
nsresult
nsXFormsInputBooleanAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsInputBooleanAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_CHECKBUTTON;
}
nsresult
@@ -281,11 +276,10 @@ nsXFormsInputDateAccessible::
{
}
nsresult
nsXFormsInputDateAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsInputDateAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_DROPLIST;
return NS_OK;
return nsIAccessibleRole::ROLE_DROPLIST;
}
@@ -299,11 +293,10 @@ nsXFormsSecretAccessible::
{
}
nsresult
nsXFormsSecretAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsSecretAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PASSWORD_TEXT;
return NS_OK;
return nsIAccessibleRole::ROLE_PASSWORD_TEXT;
}
nsresult
@@ -334,11 +327,10 @@ nsXFormsRangeAccessible::
{
}
nsresult
nsXFormsRangeAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsRangeAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_SLIDER;
return NS_OK;
return nsIAccessibleRole::ROLE_SLIDER;
}
nsresult
@@ -460,11 +452,10 @@ nsXFormsChoicesAccessible::
{
}
nsresult
nsXFormsChoicesAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsChoicesAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
NS_IMETHODIMP
@@ -491,11 +482,10 @@ nsXFormsSelectFullAccessible::
{
}
nsresult
nsXFormsSelectFullAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsSelectFullAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
void
@@ -515,11 +505,10 @@ nsXFormsItemCheckgroupAccessible::
{
}
nsresult
nsXFormsItemCheckgroupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsItemCheckgroupAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_CHECKBUTTON;
}
nsresult
@@ -561,11 +550,10 @@ nsXFormsItemRadiogroupAccessible::
{
}
nsresult
nsXFormsItemRadiogroupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsItemRadiogroupAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_RADIOBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_RADIOBUTTON;
}
nsresult
@@ -603,11 +591,10 @@ nsXFormsSelectComboboxAccessible::
{
}
nsresult
nsXFormsSelectComboboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsSelectComboboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_COMBOBOX;
return NS_OK;
return nsIAccessibleRole::ROLE_COMBOBOX;
}
nsresult
@@ -650,11 +637,10 @@ nsXFormsItemComboboxAccessible::
{
}
nsresult
nsXFormsItemComboboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsItemComboboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LISTITEM;
return NS_OK;
return nsIAccessibleRole::ROLE_LISTITEM;
}
nsresult

28
accessible/src/xforms/nsXFormsFormControlsAccessible.h
View File

@@ -55,7 +55,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -68,7 +68,7 @@ public:
nsXFormsOutputAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -88,7 +88,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -108,7 +108,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -126,7 +126,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -140,7 +140,7 @@ public:
nsXFormsInputDateAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -156,7 +156,7 @@ public:
NS_IMETHOD GetValue(nsAString& aValue);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -177,7 +177,7 @@ public:
NS_IMETHOD GetCurrentValue(double *aCurrentValue);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -210,7 +210,7 @@ public:
NS_IMETHOD GetValue(nsAString& aValue);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
protected:
// nsAccessible
@@ -229,7 +229,7 @@ public:
nsXFormsSelectFullAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
protected:
// nsAccessible
@@ -253,7 +253,7 @@ public:
NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -274,7 +274,7 @@ public:
NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -291,7 +291,7 @@ public:
nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRBool GetAllowsAnonChildAccessibles();
};
@@ -313,7 +313,7 @@ public:
NS_IMETHOD GetActionName(PRUint8 aIndex, nsAString& aName);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};

21
accessible/src/xforms/nsXFormsWidgetsAccessible.cpp
View File

@@ -49,11 +49,10 @@ nsXFormsDropmarkerWidgetAccessible::
{
}
nsresult
nsXFormsDropmarkerWidgetAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsDropmarkerWidgetAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -134,11 +133,10 @@ nsXFormsCalendarWidgetAccessible(nsIContent *aContent, nsIWeakReference *aShell)
{
}
nsresult
nsXFormsCalendarWidgetAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsCalendarWidgetAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CALENDAR;
return NS_OK;
return nsIAccessibleRole::ROLE_CALENDAR;
}
@@ -153,11 +151,10 @@ nsXFormsComboboxPopupWidgetAccessible::
{
}
nsresult
nsXFormsComboboxPopupWidgetAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXFormsComboboxPopupWidgetAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LIST;
return NS_OK;
return nsIAccessibleRole::ROLE_LIST;
}
nsresult

6
accessible/src/xforms/nsXFormsWidgetsAccessible.h
View File

@@ -60,7 +60,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -75,7 +75,7 @@ public:
nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
@@ -95,7 +95,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:

7
accessible/src/xul/nsXULAlertAccessible.cpp
View File

@@ -50,11 +50,10 @@ nsXULAlertAccessible::
NS_IMPL_ISUPPORTS_INHERITED0(nsXULAlertAccessible, nsAccessible)
nsresult
nsXULAlertAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULAlertAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_ALERT;
return NS_OK;
return nsIAccessibleRole::ROLE_ALERT;
}
nsresult

2
accessible/src/xul/nsXULAlertAccessible.h
View File

@@ -55,7 +55,7 @@ public:
NS_IMETHOD GetName(nsAString& aName);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};

14
accessible/src/xul/nsXULColorPickerAccessible.cpp
View File

@@ -73,11 +73,10 @@ nsXULColorPickerTileAccessible::GetValue(nsAString& aValue)
////////////////////////////////////////////////////////////////////////////////
// nsXULColorPickerTileAccessible: nsAccessible
nsresult
nsXULColorPickerTileAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULColorPickerTileAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -149,11 +148,10 @@ nsXULColorPickerAccessible::GetStateInternal(PRUint32 *aState,
return NS_OK;
}
nsresult
nsXULColorPickerAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULColorPickerAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_BUTTONDROPDOWNGRID;
return NS_OK;
return nsIAccessibleRole::ROLE_BUTTONDROPDOWNGRID;
}
////////////////////////////////////////////////////////////////////////////////

4
accessible/src/xul/nsXULColorPickerAccessible.h
View File

@@ -55,7 +55,7 @@ public:
NS_IMETHOD GetValue(nsAString& _retval);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -72,7 +72,7 @@ public:
virtual PRBool Init();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:

17
accessible/src/xul/nsXULComboboxAccessible.cpp
View File

@@ -66,20 +66,13 @@ nsXULComboboxAccessible::Init()
return PR_TRUE;
}
nsresult
nsXULComboboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULComboboxAccessible::NativeRole()
{
if (IsDefunct())
return NS_ERROR_FAILURE;
if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::autocomplete, eIgnoreCase)) {
*aRole = nsIAccessibleRole::ROLE_AUTOCOMPLETE;
} else {
*aRole = nsIAccessibleRole::ROLE_COMBOBOX;
}
return NS_OK;
nsAccessibilityAtoms::autocomplete, eIgnoreCase))
return nsIAccessibleRole::ROLE_AUTOCOMPLETE;
return nsIAccessibleRole::ROLE_COMBOBOX;
}
nsresult

2
accessible/src/xul/nsXULComboboxAccessible.h
View File

@@ -64,7 +64,7 @@ public:
virtual PRBool Init();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRBool GetAllowsAnonChildAccessibles();
};

77
accessible/src/xul/nsXULFormControlAccessible.cpp
View File

@@ -125,11 +125,10 @@ nsXULButtonAccessible::Init()
////////////////////////////////////////////////////////////////////////////////
// nsXULButtonAccessible: nsAccessible
nsresult
nsXULButtonAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULButtonAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -317,14 +316,10 @@ NS_IMETHODIMP nsXULDropmarkerAccessible::DoAction(PRUint8 index)
return NS_ERROR_INVALID_ARG;
}
/**
* We are a pushbutton
*/
nsresult
nsXULDropmarkerAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULDropmarkerAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PUSHBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_PUSHBUTTON;
}
nsresult
@@ -360,11 +355,10 @@ nsXULCheckboxAccessible::
{
}
nsresult
nsXULCheckboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULCheckboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
return NS_OK;
return nsIAccessibleRole::ROLE_CHECKBUTTON;
}
NS_IMETHODIMP nsXULCheckboxAccessible::GetNumActions(PRUint8 *_retval)
@@ -448,11 +442,10 @@ nsXULGroupboxAccessible::
{
}
nsresult
nsXULGroupboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULGroupboxAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
nsresult
@@ -519,11 +512,10 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsXULProgressMeterAccessible,
// nsAccessible
nsresult
nsXULProgressMeterAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULProgressMeterAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PROGRESSBAR;
return NS_OK;
return nsIAccessibleRole::ROLE_PROGRESSBAR;
}
// nsIAccessibleValue
@@ -699,11 +691,10 @@ nsXULRadioGroupAccessible::
{
}
nsresult
nsXULRadioGroupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULRadioGroupAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GROUPING;
return NS_OK;
return nsIAccessibleRole::ROLE_GROUPING;
}
nsresult
@@ -733,11 +724,10 @@ nsXULStatusBarAccessible::
{
}
nsresult
nsXULStatusBarAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULStatusBarAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_STATUSBAR;
return NS_OK;
return nsIAccessibleRole::ROLE_STATUSBAR;
}
@@ -808,11 +798,10 @@ nsXULToolbarAccessible::
{
}
nsresult
nsXULToolbarAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULToolbarAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_TOOLBAR;
return NS_OK;
return nsIAccessibleRole::ROLE_TOOLBAR;
}
nsresult
@@ -840,11 +829,10 @@ nsXULToolbarSeparatorAccessible::
{
}
nsresult
nsXULToolbarSeparatorAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULToolbarSeparatorAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_SEPARATOR;
return NS_OK;
return nsIAccessibleRole::ROLE_SEPARATOR;
}
nsresult
@@ -974,16 +962,13 @@ nsXULTextFieldAccessible::GetStateInternal(PRUint32 *aState,
return NS_OK;
}
nsresult
nsXULTextFieldAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTextFieldAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_ENTRY;
if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::password, eIgnoreCase))
*aRole = nsIAccessibleRole::ROLE_PASSWORD_TEXT;
return NS_OK;
return nsIAccessibleRole::ROLE_PASSWORD_TEXT;
return nsIAccessibleRole::ROLE_ENTRY;
}

20
accessible/src/xul/nsXULFormControlAccessible.h
View File

@@ -70,7 +70,7 @@ public:
virtual PRBool Init();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:
@@ -98,7 +98,7 @@ public:
NS_IMETHOD DoAction(PRUint8 index);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -117,7 +117,7 @@ public:
NS_IMETHOD DoAction(PRUint8 index);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
private:
@@ -137,7 +137,7 @@ public:
nsIAccessibleRelation **aRelation);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetNameInternal(nsAString& aName);
};
@@ -154,7 +154,7 @@ public:
NS_IMETHOD GetValue(nsAString &aValue);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -181,7 +181,7 @@ public:
nsXULRadioGroupAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -194,7 +194,7 @@ public:
nsXULStatusBarAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
/**
@@ -222,7 +222,7 @@ public:
nsXULToolbarAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetNameInternal(nsAString& aName);
};
@@ -236,7 +236,7 @@ public:
nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -263,7 +263,7 @@ public:
// nsAccessible
virtual nsresult GetARIAState(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRBool GetAllowsAnonChildAccessibles();

65
accessible/src/xul/nsXULListboxAccessible.cpp
View File

@@ -57,11 +57,10 @@ nsXULColumnsAccessible::
{
}
nsresult
nsXULColumnsAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULColumnsAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LIST;
return NS_OK;
return nsIAccessibleRole::ROLE_LIST;
}
nsresult
@@ -97,11 +96,10 @@ nsXULColumnItemAccessible::
{
}
nsresult
nsXULColumnItemAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULColumnItemAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_COLUMNHEADER;
return NS_OK;
return nsIAccessibleRole::ROLE_COLUMNHEADER;
}
nsresult
@@ -236,24 +234,19 @@ NS_IMETHODIMP nsXULListboxAccessible::GetValue(nsAString& _retval)
return NS_ERROR_FAILURE;
}
nsresult
nsXULListboxAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULListboxAccessible::NativeRole()
{
// A richlistbox is used with the new autocomplete URL bar, and has a parent
// popup <panel>.
nsCOMPtr<nsIDOMXULPopupElement> xulPopup =
do_QueryInterface(mContent->GetParent());
if (xulPopup) {
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
return NS_OK;
}
if (xulPopup)
return nsIAccessibleRole::ROLE_COMBOBOX_LIST;
if (IsMulticolumn())
*aRole = nsIAccessibleRole::ROLE_TABLE;
else
*aRole = nsIAccessibleRole::ROLE_LISTBOX;
return NS_OK;
return nsIAccessibleRole::ROLE_TABLE;
return nsIAccessibleRole::ROLE_LISTBOX;
}
////////////////////////////////////////////////////////////////////////////////
@@ -923,24 +916,25 @@ nsXULListitemAccessible::GetNameInternal(nsAString& aName)
return GetXULName(aName);
}
nsresult
nsXULListitemAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULListitemAccessible::NativeRole()
{
nsAccessible *list = GetListAccessible();
NS_ENSURE_STATE(list);
if (nsAccUtils::Role(list) == nsIAccessibleRole::ROLE_TABLE) {
*aRole = nsIAccessibleRole::ROLE_ROW;
return NS_OK;
if (!list) {
NS_ERROR("No list accessible for listitem accessible!");
return nsIAccessibleRole::ROLE_NOTHING;
}
if (nsAccUtils::Role(list) == nsIAccessibleRole::ROLE_TABLE)
return nsIAccessibleRole::ROLE_ROW;
if (mIsCheckbox)
*aRole = nsIAccessibleRole::ROLE_CHECKBUTTON;
else if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST)
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
else
*aRole = nsIAccessibleRole::ROLE_RICH_OPTION;
return NS_OK;
return nsIAccessibleRole::ROLE_CHECKBUTTON;
if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST)
return nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
return nsIAccessibleRole::ROLE_RICH_OPTION;
}
nsresult
@@ -1228,11 +1222,10 @@ nsXULListCellAccessible::IsSelected(PRBool *aIsSelected)
////////////////////////////////////////////////////////////////////////////////
// nsXULListCellAccessible. nsAccessible implementation
nsresult
nsXULListCellAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULListCellAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_CELL;
return NS_OK;
return nsIAccessibleRole::ROLE_CELL;
}
nsresult

10
accessible/src/xul/nsXULListboxAccessible.h
View File

@@ -58,7 +58,7 @@ public:
nsXULColumnsAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -77,7 +77,7 @@ public:
NS_IMETHOD DoAction(PRUint8 aIndex);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
enum { eAction_Click = 0 };
@@ -100,7 +100,7 @@ public:
NS_IMETHOD GetValue(nsAString& aValue);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
protected:
@@ -127,7 +127,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet,
PRInt32 *aSetSize);
@@ -160,7 +160,7 @@ public:
// nsAccessible
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
#endif

69
accessible/src/xul/nsXULMenuAccessible.cpp
View File

@@ -428,7 +428,7 @@ nsXULMenuitemAccessible::GetKeyboardShortcut(nsAString& aAccessKey)
nsAccessible* parentAcc = GetParent();
if (parentAcc) {
if (nsAccUtils::RoleInternal(parentAcc) == nsIAccessibleRole::ROLE_MENUBAR) {
if (parentAcc->NativeRole() == nsIAccessibleRole::ROLE_MENUBAR) {
// If top level menu item, add Alt+ or whatever modifier text to string
// No need to cache pref service, this happens rarely
if (gMenuAccesskeyModifier == -1) {
@@ -479,34 +479,28 @@ nsXULMenuitemAccessible::GetDefaultKeyBinding(nsAString& aKeyBinding)
return NS_OK;
}
nsresult
nsXULMenuitemAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULMenuitemAccessible::NativeRole()
{
nsCOMPtr<nsIDOMXULContainerElement> xulContainer(do_QueryInterface(mContent));
if (xulContainer) {
*aRole = nsIAccessibleRole::ROLE_PARENT_MENUITEM;
return NS_OK;
}
if (xulContainer)
return nsIAccessibleRole::ROLE_PARENT_MENUITEM;
if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST) {
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
return NS_OK;
}
if (nsAccUtils::Role(mParent) == nsIAccessibleRole::ROLE_COMBOBOX_LIST)
return nsIAccessibleRole::ROLE_COMBOBOX_OPTION;
if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::radio, eCaseMatters)) {
*aRole = nsIAccessibleRole::ROLE_RADIO_MENU_ITEM;
} else if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::checkbox,
eCaseMatters)) {
*aRole = nsIAccessibleRole::ROLE_CHECK_MENU_ITEM;
} else {
*aRole = nsIAccessibleRole::ROLE_MENUITEM;
return nsIAccessibleRole::ROLE_RADIO_MENU_ITEM;
}
return NS_OK;
if (mContent->AttrValueIs(kNameSpaceID_None, nsAccessibilityAtoms::type,
nsAccessibilityAtoms::checkbox,
eCaseMatters)) {
return nsIAccessibleRole::ROLE_CHECK_MENU_ITEM;
}
return nsIAccessibleRole::ROLE_MENUITEM;
}
PRInt32
@@ -587,11 +581,10 @@ nsXULMenuSeparatorAccessible::GetNameInternal(nsAString& aName)
return NS_OK;
}
nsresult
nsXULMenuSeparatorAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULMenuSeparatorAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_SEPARATOR;
return NS_OK;
return nsIAccessibleRole::ROLE_SEPARATOR;
}
NS_IMETHODIMP nsXULMenuSeparatorAccessible::DoAction(PRUint8 index)
@@ -667,8 +660,8 @@ nsXULMenupopupAccessible::GetNameInternal(nsAString& aName)
return NS_OK;
}
nsresult
nsXULMenupopupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULMenupopupAccessible::NativeRole()
{
// If accessible is not bound to the tree (this happens while children are
// cached) return general role.
@@ -676,21 +669,18 @@ nsXULMenupopupAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32 role = nsAccUtils::Role(mParent);
if (role == nsIAccessibleRole::ROLE_COMBOBOX ||
role == nsIAccessibleRole::ROLE_AUTOCOMPLETE) {
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
return NS_OK;
return nsIAccessibleRole::ROLE_COMBOBOX_LIST;
}
} else if (role == nsIAccessibleRole::ROLE_PUSHBUTTON) {
if (role == nsIAccessibleRole::ROLE_PUSHBUTTON) {
// Some widgets like the search bar have several popups, owned by buttons.
nsAccessible* grandParent = mParent->GetParent();
if (nsAccUtils::Role(grandParent) == nsIAccessibleRole::ROLE_AUTOCOMPLETE) {
*aRole = nsIAccessibleRole::ROLE_COMBOBOX_LIST;
return NS_OK;
}
if (nsAccUtils::Role(grandParent) == nsIAccessibleRole::ROLE_AUTOCOMPLETE)
return nsIAccessibleRole::ROLE_COMBOBOX_LIST;
}
}
*aRole = nsIAccessibleRole::ROLE_MENUPOPUP;
return NS_OK;
return nsIAccessibleRole::ROLE_MENUPOPUP;
}
@@ -724,10 +714,9 @@ nsXULMenubarAccessible::GetNameInternal(nsAString& aName)
return NS_OK;
}
nsresult
nsXULMenubarAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULMenubarAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_MENUBAR;
return NS_OK;
return nsIAccessibleRole::ROLE_MENUBAR;
}

8
accessible/src/xul/nsXULMenuAccessible.h
View File

@@ -94,7 +94,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRInt32 GetLevelInternal();
virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet,
@@ -118,7 +118,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -133,7 +133,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -147,7 +147,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};

17
accessible/src/xul/nsXULSliderAccessible.cpp
View File

@@ -62,11 +62,10 @@ NS_IMPL_ISUPPORTS_INHERITED1(nsXULSliderAccessible,
// nsAccessible
nsresult
nsXULSliderAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULSliderAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_SLIDER;
return NS_OK;
return nsIAccessibleRole::ROLE_SLIDER;
}
nsresult
@@ -300,12 +299,12 @@ nsXULThumbAccessible::
{
}
// nsIAccessible
////////////////////////////////////////////////////////////////////////////////
// nsXULThumbAccessible: nsAccessible
nsresult
nsXULThumbAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULThumbAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_INDICATOR;
return NS_OK;
return nsIAccessibleRole::ROLE_INDICATOR;
}

4
accessible/src/xul/nsXULSliderAccessible.h
View File

@@ -64,7 +64,7 @@ public:
NS_DECL_NSIACCESSIBLEVALUE
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRBool GetAllowsAnonChildAccessibles();
@@ -91,7 +91,7 @@ public:
nsXULThumbAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
#endif

28
accessible/src/xul/nsXULTabAccessible.cpp
View File

@@ -96,11 +96,10 @@ NS_IMETHODIMP nsXULTabAccessible::DoAction(PRUint8 index)
////////////////////////////////////////////////////////////////////////////////
// nsXULTabAccessible: nsAccessible
nsresult
nsXULTabAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTabAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PAGETAB;
return NS_OK;
return nsIAccessibleRole::ROLE_PAGETAB;
}
nsresult
@@ -184,11 +183,10 @@ nsXULTabsAccessible::
{
}
nsresult
nsXULTabsAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTabsAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PAGETABLIST;
return NS_OK;
return nsIAccessibleRole::ROLE_PAGETABLIST;
}
NS_IMETHODIMP
@@ -224,11 +222,10 @@ nsXULTabpanelsAccessible::
{
}
nsresult
nsXULTabpanelsAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTabpanelsAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PANE;
return NS_OK;
return nsIAccessibleRole::ROLE_PANE;
}
@@ -242,11 +239,10 @@ nsXULTabpanelAccessible::
{
}
nsresult
nsXULTabpanelAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTabpanelAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_PROPERTYPAGE;
return NS_OK;
return nsIAccessibleRole::ROLE_PROPERTYPAGE;
}
NS_IMETHODIMP

8
accessible/src/xul/nsXULTabAccessible.h
View File

@@ -63,7 +63,7 @@ public:
// nsAccessible
virtual void GetPositionAndSizeInternal(PRInt32 *aPosInSet,
PRInt32 *aSetSize);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -82,7 +82,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
@@ -95,7 +95,7 @@ public:
nsXULTabpanelsAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
@@ -119,7 +119,7 @@ public:
nsIAccessibleRelation **aRelation);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
};
#endif

21
accessible/src/xul/nsXULTextAccessible.cpp
View File

@@ -71,11 +71,10 @@ nsXULTextAccessible::GetNameInternal(nsAString& aName)
return NS_OK;
}
nsresult
nsXULTextAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTextAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LABEL;
return NS_OK;
return nsIAccessibleRole::ROLE_LABEL;
}
nsresult
@@ -137,11 +136,10 @@ nsXULTooltipAccessible::GetStateInternal(PRUint32 *aState,
return NS_OK;
}
nsresult
nsXULTooltipAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTooltipAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_TOOLTIP;
return NS_OK;
return nsIAccessibleRole::ROLE_TOOLTIP;
}
@@ -184,11 +182,10 @@ nsXULLinkAccessible::GetNameInternal(nsAString& aName)
return nsTextEquivUtils::GetNameFromSubtree(this, aName);
}
nsresult
nsXULLinkAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULLinkAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_LINK;
return NS_OK;
return nsIAccessibleRole::ROLE_LINK;
}

6
accessible/src/xul/nsXULTextAccessible.h
View File

@@ -58,7 +58,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -72,7 +72,7 @@ public:
nsXULTooltipAccessible(nsIContent *aContent, nsIWeakReference *aShell);
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
};
@@ -93,7 +93,7 @@ public:
// nsAccessible
virtual nsresult GetNameInternal(nsAString& aName);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
// HyperLinkAccessible

24
accessible/src/xul/nsXULTreeAccessible.cpp
View File

@@ -181,12 +181,9 @@ nsXULTreeAccessible::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsXULTreeAccessible: nsAccessible implementation (put methods here)
nsresult
nsXULTreeAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTreeAccessible::NativeRole()
{
if (IsDefunct())
return NS_ERROR_FAILURE;
// No primary column means we're in a list. In fact, history and mail turn off
// the primary flag when switching to a flat view.
@@ -196,11 +193,9 @@ nsXULTreeAccessible::GetRoleInternal(PRUint32 *aRole)
if (cols)
cols->GetPrimaryColumn(getter_AddRefs(primaryCol));
*aRole = primaryCol ?
return primaryCol ?
static_cast<PRUint32>(nsIAccessibleRole::ROLE_OUTLINE) :
static_cast<PRUint32>(nsIAccessibleRole::ROLE_LIST);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
@@ -1159,21 +1154,22 @@ nsXULTreeItemAccessible::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsXULTreeItemAccessible: nsAccessible implementation
nsresult
nsXULTreeItemAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTreeItemAccessible::NativeRole()
{
nsCOMPtr<nsITreeColumns> columns;
mTree->GetColumns(getter_AddRefs(columns));
NS_ENSURE_STATE(columns);
if (!columns) {
NS_ERROR("No tree columns object in the tree!");
return nsIAccessibleRole::ROLE_NOTHING;
}
nsCOMPtr<nsITreeColumn> primaryColumn;
columns->GetPrimaryColumn(getter_AddRefs(primaryColumn));
*aRole = primaryColumn ?
return primaryColumn ?
static_cast<PRUint32>(nsIAccessibleRole::ROLE_OUTLINEITEM) :
static_cast<PRUint32>(nsIAccessibleRole::ROLE_LISTITEM);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////

4
accessible/src/xul/nsXULTreeAccessible.h
View File

@@ -84,7 +84,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual nsresult GetChildAtPoint(PRInt32 aX, PRInt32 aY,
PRBool aDeepestChild,
@@ -275,7 +275,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
// nsXULTreeItemAccessibleBase
virtual void RowInvalidated(PRInt32 aStartColIdx, PRInt32 aEndColIdx);

27
accessible/src/xul/nsXULTreeGridAccessible.cpp
View File

@@ -575,21 +575,22 @@ nsXULTreeGridAccessible::IsProbablyForLayout(PRBool *aIsProbablyForLayout)
////////////////////////////////////////////////////////////////////////////////
// nsXULTreeGridAccessible: nsAccessible implementation
nsresult
nsXULTreeGridAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTreeGridAccessible::NativeRole()
{
nsCOMPtr<nsITreeColumns> treeColumns;
mTree->GetColumns(getter_AddRefs(treeColumns));
NS_ENSURE_STATE(treeColumns);
if (!treeColumns) {
NS_ERROR("No treecolumns object for tree!");
return nsIAccessibleRole::ROLE_NOTHING;
}
nsCOMPtr<nsITreeColumn> primaryColumn;
treeColumns->GetPrimaryColumn(getter_AddRefs(primaryColumn));
*aRole = primaryColumn ?
return primaryColumn ?
static_cast<PRUint32>(nsIAccessibleRole::ROLE_TREE_TABLE) :
static_cast<PRUint32>(nsIAccessibleRole::ROLE_TABLE);
return NS_OK;
}
////////////////////////////////////////////////////////////////////////////////
@@ -656,11 +657,10 @@ nsXULTreeGridRowAccessible::Shutdown()
////////////////////////////////////////////////////////////////////////////////
// nsXULTreeGridRowAccessible: nsAccessible implementation
nsresult
nsXULTreeGridRowAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTreeGridRowAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_ROW;
return NS_OK;
return nsIAccessibleRole::ROLE_ROW;
}
nsresult
@@ -1164,11 +1164,10 @@ nsXULTreeGridCellAccessible::GetAttributesInternal(nsIPersistentProperties *aAtt
return NS_OK;
}
nsresult
nsXULTreeGridCellAccessible::GetRoleInternal(PRUint32 *aRole)
PRUint32
nsXULTreeGridCellAccessible::NativeRole()
{
*aRole = nsIAccessibleRole::ROLE_GRID_CELL;
return NS_OK;
return nsIAccessibleRole::ROLE_GRID_CELL;
}
nsresult

6
accessible/src/xul/nsXULTreeGridAccessible.h
View File

@@ -59,7 +59,7 @@ public:
NS_DECL_NSIACCESSIBLETABLE
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
protected:
@@ -92,7 +92,7 @@ public:
virtual void Shutdown();
// nsAccessible
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetChildAtPoint(PRInt32 aX, PRInt32 aY,
PRBool aDeepestChild,
nsIAccessible **aChild);
@@ -164,7 +164,7 @@ public:
// nsAccessible
virtual nsresult GetAttributesInternal(nsIPersistentProperties *aAttributes);
virtual nsresult GetRoleInternal(PRUint32 *aRole);
virtual PRUint32 NativeRole();
virtual nsresult GetStateInternal(PRUint32 *aState, PRUint32 *aExtraState);
virtual PRInt32 GetIndexInParent() { return GetColumnIndex(); }