wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

bug 1120285 - correctly shutdown outer doc accessible proxies r=davidb

Browse Source
This commit is contained in:
Trevor Saunders 2015-01-13 23:42:27 -05:00
parent 7e78186cb9
commit 2c93df25c4
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
accessible/ipc/DocAccessibleParent.cpp
View File

@ -155,10 +155,12 @@ DocAccessibleParent::ShutdownAccessibles(ProxyEntry* entry, void*)
}
void
DocAccessibleParent::ActorDestroy(ActorDestroyReason aWhy)
DocAccessibleParent::Destroy()
{
MOZ_ASSERT(mChildDocs.IsEmpty(),
"why wheren't the child docs destroyed already?");
MOZ_ASSERT(!mShutdown);
mShutdown = true;
mAccessibles.EnumerateEntries(ShutdownAccessibles, nullptr);
ProxyDestroyed(this);

10
accessible/ipc/DocAccessibleParent.h
View File

@ -26,7 +26,7 @@ class DocAccessibleParent : public ProxyAccessible,
{
public:
DocAccessibleParent() :
ProxyAccessible(this), mParentDoc(nullptr)
ProxyAccessible(this), mParentDoc(nullptr), mShutdown(false)
{ MOZ_COUNT_CTOR_INHERITED(DocAccessibleParent, ProxyAccessible); }
~DocAccessibleParent()
{
@ -45,7 +45,12 @@ public:
virtual bool RecvShowEvent(const ShowEventData& aData) MOZ_OVERRIDE;
virtual bool RecvHideEvent(const uint64_t& aRootID) MOZ_OVERRIDE;
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE;
void Destroy();
virtual void ActorDestroy(ActorDestroyReason aWhy) MOZ_OVERRIDE
{
if (!mShutdown)
Destroy();
}
/*
* Return the main processes representation of the parent document (if any)
@ -115,6 +120,7 @@ private:
* proxy object so we can't use a real map.
*/
nsTHashtable<ProxyEntry> mAccessibles;
bool mShutdown;
};
}

5
accessible/ipc/ProxyAccessible.cpp
View File

@ -23,6 +23,11 @@ ProxyAccessible::Shutdown()
uint32_t childCount = mChildren.Length();
for (uint32_t idx = 0; idx < childCount; idx++)
mChildren[idx]->Shutdown();
} else {
if (mChildren.Length() != 1)
MOZ_CRASH("outer doc doesn't own adoc!");
static_cast<DocAccessibleParent*>(mChildren[0])->Destroy();
}
mChildren.Clear();