bug 1262563 - stop passing an event to FireShowHideEvent() r=davidb

Later we will call this for proxies where we don't have an event, and anyway
  all we need the event for is if it came from user input.
This commit is contained in:
Trevor Saunders 2016-04-05 15:47:26 -04:00
Родитель 1e53398a23
Коммит 78ec591787
2 изменённых файлов: 7 добавлений и 8 удалений

Просмотреть файл

@ -1354,7 +1354,7 @@ AccessibleWrap::HandleAccEvent(AccEvent* aEvent)
break;
case nsIAccessibleEvent::EVENT_SHOW:
return FireAtkShowHideEvent(aEvent, atkObj, true);
return FireAtkShowHideEvent(atkObj, true, aEvent->IsFromUserInput());
case nsIAccessibleEvent::EVENT_HIDE:
// XXX - Handle native dialog accessibles.
@ -1363,7 +1363,7 @@ AccessibleWrap::HandleAccEvent(AccEvent* aEvent)
guint id = g_signal_lookup("deactivate", MAI_TYPE_ATK_OBJECT);
g_signal_emit(atkObj, id, 0);
}
return FireAtkShowHideEvent(aEvent, atkObj, false);
return FireAtkShowHideEvent(atkObj, false, aEvent->IsFromUserInput());
/*
* Because dealing with menu is very different between nsIAccessible
@ -1577,15 +1577,14 @@ static const char *kMutationStrings[2][2] = {
};
nsresult
AccessibleWrap::FireAtkShowHideEvent(AccEvent* aEvent,
AtkObject* aObject, bool aIsAdded)
AccessibleWrap::FireAtkShowHideEvent(AtkObject* aObject, bool aIsAdded,
bool aFromUser)
{
int32_t indexInParent = getIndexInParentCB(aObject);
AtkObject *parentObject = getParentCB(aObject);
NS_ENSURE_STATE(parentObject);
bool isFromUserInput = aEvent->IsFromUserInput();
const char *signal_name = kMutationStrings[isFromUserInput][aIsAdded];
const char *signal_name = kMutationStrings[aFromUser][aIsAdded];
g_signal_emit_by_name(parentObject, signal_name, indexInParent, aObject, nullptr);
return NS_OK;

Просмотреть файл

@ -79,8 +79,8 @@ protected:
nsresult FireAtkStateChangeEvent(AccEvent* aEvent, AtkObject *aObject);
nsresult FireAtkTextChangedEvent(AccEvent* aEvent, AtkObject *aObject);
nsresult FireAtkShowHideEvent(AccEvent* aEvent, AtkObject *aObject,
bool aIsAdded);
nsresult FireAtkShowHideEvent(AtkObject *aObject, bool aIsAdded,
bool aFromUser);
AtkObject *mAtkObject;