Bommels05/Mozilla
Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accessibility crash with image map areas. r=surkov, a=dsicore

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@232435 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
aaronleventhal%moonset.net 2007-08-21 03:18:26 +00:00
parent 6d0a6d53f8
commit 1836f7113c
2 changed files with 9 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mozilla/accessible/src/html/nsHTMLImageAccessible.cpp
View File

@ -144,10 +144,8 @@ NS_IMETHODIMP nsHTMLImageAccessible::GetName(nsAString& aName)
/* wstring getRole (); */
NS_IMETHODIMP nsHTMLImageAccessible::GetRole(PRUint32 *_retval)
{
PRInt32 numChildren;
GetChildCount(&numChildren);
*_retval = (numChildren > 0) ? nsIAccessibleRole::ROLE_IMAGE_MAP :
nsIAccessibleRole::ROLE_GRAPHIC;
*_retval = mMapElement ? nsIAccessibleRole::ROLE_IMAGE_MAP :
nsIAccessibleRole::ROLE_GRAPHIC;
return NS_OK;
}

15
mozilla/accessible/src/html/nsHyperTextAccessible.cpp
View File

@ -90,10 +90,13 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
}
PRUint32 role = Role(this);
if (role == nsIAccessibleRole::ROLE_GRAPHIC ||
role == nsIAccessibleRole::ROLE_IMAGE_MAP ||
role == nsIAccessibleRole::ROLE_TEXT_LEAF) {
return nsAccessible::QueryInterface(aIID, aInstancePtr);
}
if (aIID.Equals(NS_GET_IID(nsIAccessibleText))) {
if (role == nsIAccessibleRole::ROLE_TEXT_LEAF) {
return NS_ERROR_NO_INTERFACE;
}
*aInstancePtr = static_cast<nsIAccessibleText*>(this);
NS_ADDREF_THIS();
return NS_OK;
@ -101,8 +104,7 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
if (aIID.Equals(NS_GET_IID(nsIAccessibleHyperText))) {
if (role == nsIAccessibleRole::ROLE_ENTRY ||
role == nsIAccessibleRole::ROLE_PASSWORD_TEXT ||
role == nsIAccessibleRole::ROLE_TEXT_LEAF) {
role == nsIAccessibleRole::ROLE_PASSWORD_TEXT) {
return NS_ERROR_NO_INTERFACE;
}
*aInstancePtr = static_cast<nsIAccessibleHyperText*>(this);
@ -111,9 +113,6 @@ nsresult nsHyperTextAccessible::QueryInterface(REFNSIID aIID, void** aInstancePt
}
if (aIID.Equals(NS_GET_IID(nsIAccessibleEditableText))) {
if (role == nsIAccessibleRole::ROLE_TEXT_LEAF) {
return NS_ERROR_NO_INTERFACE;
}
*aInstancePtr = static_cast<nsIAccessibleEditableText*>(this);
NS_ADDREF_THIS();
return NS_OK;