Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-24 16:54:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 245931. Fix focus issues in accessibility APIs. r=pkw, sr=bryner

Browse Source
This commit is contained in:
aaronleventhal%moonset.net 2004-06-15 02:31:20 +00:00
parent a7e650a21b
commit 91699967e2
4 changed files with 42 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -565,8 +565,10 @@ NS_IMETHODIMP nsAccessible::GetState(PRUint32 *aState)
else {
*aState |= STATE_FOCUSABLE;
nsCOMPtr<nsIDOMNode> focusedNode;
if (NS_SUCCEEDED(GetFocusedNode(mDOMNode, getter_AddRefs(focusedNode))) && focusedNode == mDOMNode)
if (gLastFocusedNode == mDOMNode ||
(NS_SUCCEEDED(GetFocusedNode(mDOMNode, getter_AddRefs(focusedNode))) && focusedNode == mDOMNode)) {
*aState |= STATE_FOCUSED;
}
}
}

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

@ -138,6 +138,28 @@ NS_IMETHODIMP nsRootAccessible::GetRole(PRUint32 *aRole)
return NS_OK;
}
NS_IMETHODIMP nsRootAccessible::GetState(PRUint32 *aState)
{
nsresult rv = NS_ERROR_FAILURE;
if (mDOMNode) {
rv = nsDocAccessibleWrap::GetState(aState);
}
if (NS_FAILED(rv)) {
return rv;
}
NS_ASSERTION(mDocument, "mDocument should not be null unless mDOMNode is");
if (gLastFocusedNode) {
nsCOMPtr<nsIDOMDocument> rootAccessibleDoc(do_QueryInterface(mDocument));
nsCOMPtr<nsIDOMDocument> focusedDoc;
gLastFocusedNode->GetOwnerDocument(getter_AddRefs(focusedDoc));
if (rootAccessibleDoc == focusedDoc) {
*aState |= STATE_FOCUSED;
}
}
return NS_OK;
}
void
nsRootAccessible::GetChromeEventHandler(nsIDOMEventTarget **aChromeTarget)
{
@ -258,8 +280,8 @@ void nsRootAccessible::FireAccessibleFocusEvent(nsIAccessible *focusAccessible,
{
if (focusAccessible && focusNode && gLastFocusedNode != focusNode) {
nsCOMPtr<nsPIAccessible> privateFocusAcc(do_QueryInterface(focusAccessible));
privateFocusAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS, focusAccessible, nsnull);
NS_IF_RELEASE(gLastFocusedNode);
gLastFocusedNode = nsnull;
PRUint32 role = ROLE_NOTHING;
focusAccessible->GetRole(&role);
if (role != ROLE_MENUITEM && role != ROLE_LISTITEM) {
@ -267,6 +289,7 @@ void nsRootAccessible::FireAccessibleFocusEvent(nsIAccessible *focusAccessible,
gLastFocusedNode = focusNode;
NS_ADDREF(gLastFocusedNode);
}
privateFocusAcc->FireToolkitEvent(nsIAccessibleEvent::EVENT_FOCUS, focusAccessible, nsnull);
if (mCaretAccessible)
mCaretAccessible->AttachNewSelectionListener(focusNode);
}
@ -542,15 +565,18 @@ void nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsIDOMNode **aTargetNo
nsCOMPtr<nsIDOMEventTarget> domEventTarget;
nsevent->GetOriginalTarget(getter_AddRefs(domEventTarget));
nsCOMPtr<nsIContent> content(do_QueryInterface(domEventTarget));
if (content && content->IsContentOfType(nsIContent::eHTML)) {
// Kind of a hack. If we're on an HTML element we want to make sure that it wasn't
// inserted via XBL. In that case we want the "original explicit event target".
// The difference is not 100% clear from the API docs,
// but this combination gets the following important cases correct:
nsIContent *bindingParent;
if (content && content->IsContentOfType(nsIContent::eHTML) &&
(bindingParent = content->GetBindingParent()) != nsnull) {
// Use binding parent when the event occurs in
// anonymous HTML content.
// This gets the following important cases correct:
// 1. Inserted <dialog> buttons like OK, Cancel, Help.
// 2. XUL menulists and comboboxes.
// 3. The focused radio button in a group.
nsevent->GetExplicitOriginalTarget(getter_AddRefs(domEventTarget));
CallQueryInterface(bindingParent, aTargetNode);
NS_ASSERTION(*aTargetNode, "No target node for binding parent of anonymous event target");
return;
}
if (domEventTarget) {
CallQueryInterface(domEventTarget, aTargetNode);

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

@ -66,6 +66,7 @@ class nsRootAccessible : public nsDocAccessibleWrap,
/* attribute wstring accName; */
NS_IMETHOD GetParent(nsIAccessible * *aParent);
NS_IMETHOD GetRole(PRUint32 *aRole);
NS_IMETHOD GetState(PRUint32 *aState);
// ----- nsIDOMEventListener --------------------------
NS_IMETHOD HandleEvent(nsIDOMEvent* aEvent);

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

@ -664,7 +664,11 @@ NS_IMETHODIMP nsXULTextFieldAccessible::GetState(PRUint32 *aState)
// to get the accessible state from. Doesn't add to cache
// because Init() is not called.
nsHTMLTextFieldAccessible tempAccessible(inputField, mWeakShell);
return tempAccessible.GetState(aState);
nsresult rv = tempAccessible.GetState(aState);
if (gLastFocusedNode == mDOMNode) {
*aState |= STATE_FOCUSED;
}
return rv;
}