зеркало из https://github.com/mozilla/gecko-dev.git
Родитель
e9f81f8499
Коммит
1402b75367
|
@ -242,8 +242,11 @@ nsresult nsRootAccessible::RemoveEventListeners()
|
||||||
|
|
||||||
NS_IMETHODIMP nsRootAccessible::GetCaretAccessible(nsIAccessible **aCaretAccessible)
|
NS_IMETHODIMP nsRootAccessible::GetCaretAccessible(nsIAccessible **aCaretAccessible)
|
||||||
{
|
{
|
||||||
*aCaretAccessible = (nsCOMPtr<nsIAccessible>)do_QueryInterface(mCaretAccessible);
|
*aCaretAccessible = nsnull;
|
||||||
NS_IF_ADDREF(*aCaretAccessible);
|
if (mCaretAccessible) {
|
||||||
|
CallQueryInterface(mCaretAccessible, aCaretAccessible);
|
||||||
|
}
|
||||||
|
|
||||||
return NS_OK;
|
return NS_OK;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -258,7 +261,7 @@ void nsRootAccessible::FireAccessibleFocusEvent(nsIAccessible *focusAccessible,
|
||||||
if (role != ROLE_MENUITEM && role != ROLE_LISTITEM) {
|
if (role != ROLE_MENUITEM && role != ROLE_LISTITEM) {
|
||||||
// It must report all focus events on menu and list items
|
// It must report all focus events on menu and list items
|
||||||
gLastFocusedNode = focusNode;
|
gLastFocusedNode = focusNode;
|
||||||
NS_IF_ADDREF(gLastFocusedNode);
|
NS_ADDREF(gLastFocusedNode);
|
||||||
}
|
}
|
||||||
if (mCaretAccessible)
|
if (mCaretAccessible)
|
||||||
mCaretAccessible->AttachNewSelectionListener(focusNode);
|
mCaretAccessible->AttachNewSelectionListener(focusNode);
|
||||||
|
@ -498,13 +501,14 @@ void nsRootAccessible::GetTargetNode(nsIDOMEvent *aEvent, nsIDOMNode **aTargetNo
|
||||||
{
|
{
|
||||||
*aTargetNode = nsnull;
|
*aTargetNode = nsnull;
|
||||||
|
|
||||||
nsCOMPtr<nsIDOMEventTarget> domEventTarget;
|
|
||||||
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
|
nsCOMPtr<nsIDOMNSEvent> nsevent(do_QueryInterface(aEvent));
|
||||||
|
|
||||||
if (nsevent) {
|
if (nsevent) {
|
||||||
|
nsCOMPtr<nsIDOMEventTarget> domEventTarget;
|
||||||
nsevent->GetOriginalTarget(getter_AddRefs(domEventTarget));
|
nsevent->GetOriginalTarget(getter_AddRefs(domEventTarget));
|
||||||
nsCOMPtr<nsIDOMNode> targetNode(do_QueryInterface(domEventTarget));
|
if (domEventTarget) {
|
||||||
NS_IF_ADDREF(*aTargetNode = targetNode);
|
CallQueryInterface(domEventTarget, aTargetNode);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче