Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-26 12:20:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cfc8e7a8f4a4 (bug 1402951) for failures in test_ariaowns.html a=backout

Browse Source 
MozReview-Commit-ID: EYzo4FvzoXe
This commit is contained in:
Wes Kocher 2017-09-29 13:34:21 -07:00
parent ab3a405019
commit 65903a9c18
7 changed files with 8 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
accessible/generic/DocAccessible.cpp
View File

@ -1536,15 +1536,13 @@ DocAccessible::DoInitialUpdate()
ParentDocument()->FireDelayedEvent(reorderEvent);
}
if (IPCAccessibilityActive()) {
DocAccessibleChild* ipcDoc = IPCDoc();
MOZ_ASSERT(ipcDoc);
if (ipcDoc) {
for (auto idx = 0U; idx < mChildren.Length(); idx++) {
ipcDoc->InsertIntoIpcTree(this, mChildren.ElementAt(idx), idx);
}
}
TreeMutation mt(this);
uint32_t childCount = ChildCount();
for (uint32_t i = 0; i < childCount; i++) {
Accessible* child = GetChildAt(i);
mt.AfterInsertion(child);
}
mt.Done();
}
void

15
accessible/ipc/DocAccessibleChildBase.cpp
View File

@ -80,19 +80,6 @@ DocAccessibleChildBase::SerializeTree(Accessible* aRoot,
}
}
void
DocAccessibleChildBase::InsertIntoIpcTree(Accessible* aParent,
Accessible* aChild,
uint32_t aIdxInParent)
{
uint64_t parentID = aParent->IsDoc() ?
0 : reinterpret_cast<uint64_t>(aParent->UniqueID());
nsTArray<AccessibleData> shownTree;
ShowEventData data(parentID, aIdxInParent, shownTree, true);
SerializeTree(aChild, data.NewTree());
MaybeSendShowEvent(data, false);
}
void
DocAccessibleChildBase::ShowEvent(AccShowEvent* aShowEvent)
{
@ -100,7 +87,7 @@ DocAccessibleChildBase::ShowEvent(AccShowEvent* aShowEvent)
uint64_t parentID = parent->IsDoc() ? 0 : reinterpret_cast<uint64_t>(parent->UniqueID());
uint32_t idxInParent = aShowEvent->GetAccessible()->IndexInParent();
nsTArray<AccessibleData> shownTree;
ShowEventData data(parentID, idxInParent, shownTree, false);
ShowEventData data(parentID, idxInParent, shownTree);
SerializeTree(aShowEvent->GetAccessible(), data.NewTree());
MaybeSendShowEvent(data, aShowEvent->IsFromUserInput());
}

5
accessible/ipc/DocAccessibleChildBase.h
View File

@ -45,11 +45,6 @@ public:
SendShutdown();
}
/**
* Serializes a shown tree and sends it to the chrome process.
*/
void InsertIntoIpcTree(Accessible* aParent,
Accessible* aChild, uint32_t aIdxInParent);
void ShowEvent(AccShowEvent* aShowEvent);
virtual void ActorDestroy(ActorDestroyReason) override

5
accessible/ipc/DocAccessibleParent.cpp
View File

@ -79,11 +79,6 @@ DocAccessibleParent::RecvShowEvent(const ShowEventData& aData,
MOZ_ASSERT(CheckDocTree());
// Just update, no events.
if (aData.EventSuppressed()) {
return IPC_OK();
}
ProxyAccessible* target = parent->ChildAt(newChildIdx);
ProxyShowHideEvent(target, parent, true, aFromUser);

1
accessible/ipc/other/PDocAccessible.ipdl
View File

@ -29,7 +29,6 @@ struct ShowEventData
uint64_t ID;
uint32_t Idx;
AccessibleData[] NewTree;
bool EventSuppressed;
};
struct Attribute

3
accessible/ipc/win/DocAccessibleChild.h
View File

@ -111,8 +111,7 @@ private:
SerializedShow(DocAccessibleChild* aTarget,
ShowEventData& aEventData, bool aFromUser)
: DeferredEvent(aTarget)
, mEventData(aEventData.ID(), aEventData.Idx(),
nsTArray<AccessibleData>(), aEventData.EventSuppressed())
, mEventData(aEventData.ID(), aEventData.Idx(), nsTArray<AccessibleData>())
, mFromUser(aFromUser)
{
// Since IPDL doesn't generate a move constructor for ShowEventData,

1
accessible/ipc/win/PDocAccessible.ipdl
View File

@ -29,7 +29,6 @@ struct ShowEventData
uint64_t ID;
uint32_t Idx;
AccessibleData[] NewTree;
bool EventSuppressed;
};
struct Attribute