Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-23 10:15:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 346906. GetLinkIndex() is off by 1. r=neo.liu

Browse Source
This commit is contained in:
aaronleventhal%moonset.net 2006-08-03 03:32:32 +00:00
parent a8676968d1
commit d542e8384a
2 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
accessible/public/nsIAccessibleHyperText.idl
View File

@ -49,6 +49,11 @@ interface nsIAccessibleHyperText : nsISupports
nsIAccessibleHyperLink getLink (in long index);
/*
* Return the link index at this character index.
* Return value of -1 indicates no link at that index.
*/
long getLinkIndex (in long charIndex);
long getSelectedLinkIndex ();
};

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

@ -846,15 +846,17 @@ NS_IMETHODIMP nsHyperTextAccessible::GetLink(PRInt32 aIndex, nsIAccessibleHyperL
NS_IMETHODIMP nsHyperTextAccessible::GetLinkIndex(PRInt32 aCharIndex, PRInt32 *aLinkIndex)
{
*aLinkIndex = -1;
*aLinkIndex = -1; // API says this magic value means 'not found'
PRInt32 characterCount = 0;
PRInt32 linkIndex = 0;
if (!mDOMNode) {
return NS_ERROR_FAILURE;
}
nsCOMPtr<nsIAccessible> accessible;
while (NextChild(accessible)) {
while (NextChild(accessible) && characterCount < aCharIndex) {
PRUint32 role = Role(accessible);
if (role == ROLE_TEXT_LEAF) {
nsCOMPtr<nsPIAccessNode> accessNode(do_QueryInterface(accessible));
@ -864,19 +866,16 @@ NS_IMETHODIMP nsHyperTextAccessible::GetLinkIndex(PRInt32 aCharIndex, PRInt32 *a
}
}
else {
if (characterCount == aCharIndex) {
return NS_OK;
if (characterCount ++ == aCharIndex) {
*aLinkIndex = linkIndex;
break;
}
else if (characterCount > aCharIndex) {
return NS_ERROR_FAILURE;
}
++ characterCount;
if (role != ROLE_WHITESPACE) {
++ *aLinkIndex;
++ linkIndex;
}
}
}
return NS_ERROR_FAILURE;
return NS_OK;
}
NS_IMETHODIMP nsHyperTextAccessible::GetSelectedLinkIndex(PRInt32 *aSelectedLinkIndex)