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

Bug 1255617 - make PutChildrenBack to insert accessibles instead the recaching, r=yzen

Browse Source
This commit is contained in:
Alexander Surkov 2016-03-30 10:47:36 -04:00
parent eb7b329a24
commit 7fcc93f841
2 changed files with 57 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

89
accessible/generic/DocAccessible.cpp
View File

@ -2282,45 +2282,68 @@ DocAccessible::PutChildrenBack(nsTArray<RefPtr<Accessible> >* aChildren,
nsTArray<RefPtr<Accessible> > containers;
for (auto idx = aStartIdx; idx < aChildren->Length(); idx++) {
Accessible* child = aChildren->ElementAt(idx);
// If the child is in the tree then remove it from the owner.
if (child->IsInDocument()) {
Accessible* owner = child->Parent();
if (!owner) {
NS_ERROR("Cannot put the child back. No parent, a broken tree.");
continue;
}
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(owner);
RefPtr<AccMutationEvent> hideEvent = new AccHideEvent(child, false);
reorderEvent->AddSubMutationEvent(hideEvent);
FireDelayedEvent(hideEvent);
{
AutoTreeMutation mut(owner);
owner->RemoveChild(child);
child->SetRelocated(false);
}
MaybeNotifyOfValueChange(owner);
FireDelayedEvent(reorderEvent);
if (!child->IsInDocument()) {
continue;
}
Accessible* container = GetContainerAccessible(child->GetContent());
if (container &&
containers.IndexOf(container) == nsTArray<Accessible*>::NoIndex) {
containers.AppendElement(container);
// Remove the child from the owner
Accessible* owner = child->Parent();
if (!owner) {
NS_ERROR("Cannot put the child back. No parent, a broken tree.");
continue;
}
#ifdef A11Y_LOG
logging::TreeInfo("aria owns put child back", 0,
"old parent", owner, "child", child, nullptr);
#endif
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(owner);
RefPtr<AccMutationEvent> hideEvent = new AccHideEvent(child, false);
reorderEvent->AddSubMutationEvent(hideEvent);
FireDelayedEvent(hideEvent);
{
AutoTreeMutation mut(owner);
owner->RemoveChild(child);
child->SetRelocated(false);
}
MaybeNotifyOfValueChange(owner);
FireDelayedEvent(reorderEvent);
#ifdef A11Y_LOG
logging::TreeInfo("aria owns put child back: old parent tree after",
logging::eVerbose, owner);
#endif
// and put it back where it belongs to.
Accessible* origContainer = GetContainerAccessible(child->GetContent());
if (origContainer) {
TreeWalker walker(origContainer);
if (walker.Seek(child->GetContent())) {
Accessible* prevChild = walker.Prev();
{
AutoTreeMutation mut(origContainer);
origContainer->InsertAfter(child, prevChild);
}
RefPtr<AccReorderEvent> reorderEvent = new AccReorderEvent(origContainer);
RefPtr<AccMutationEvent> showEvent = new AccShowEvent(child);
reorderEvent->AddSubMutationEvent(showEvent);
FireDelayedEvent(showEvent);
MaybeNotifyOfValueChange(origContainer);
FireDelayedEvent(reorderEvent);
#ifdef A11Y_LOG
logging::TreeInfo("aria owns put child back: new parent tree after",
logging::eVerbose, origContainer);
#endif
}
}
}
// And put it back where it belongs to.
aChildren->RemoveElementsAt(aStartIdx, aChildren->Length() - aStartIdx);
for (uint32_t idx = 0; idx < containers.Length(); idx++) {
NS_ASSERTION(containers[idx]->IsInDocument(),
"A container has been destroyed.");
if (containers[idx]->IsInDocument()) {
UpdateTreeOnInsertion(containers[idx]);
}
}
}
void

2
accessible/tests/mochitest/treeupdate/test_ariaowns.html
View File

@ -74,8 +74,8 @@
{
this.eventSeq = [
new invokerChecker(EVENT_HIDE, getNode("t1_button")),
new invokerChecker(EVENT_HIDE, getNode("t1_subdiv")),
new invokerChecker(EVENT_SHOW, getNode("t1_button")),
new invokerChecker(EVENT_HIDE, getNode("t1_subdiv")),
new invokerChecker(EVENT_SHOW, getNode("t1_subdiv")),
new invokerChecker(EVENT_REORDER, getNode("t1_container"))
];