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 774388 - Patch 8: Avoid a deadlock between shutdown of CompositorParent and of CompositorThreadHolder - r=mattwoodrow

Browse Source
This commit is contained in:
Benoit Jacob 2014-07-03 14:53:29 -04:00
parent ada1f420aa
commit a88b8b44ad
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gfx/layers/ipc/CompositorParent.cpp
View File

@ -321,9 +321,10 @@ CompositorParent::RecvWillStop()
return true;
}
static void DeferredDeleteCompositorParentOnMainThread(CompositorParent* aNowReadyToDie)
void DeferredDeleteCompositorParentOnMainThread(CompositorParent* aNowReadyToDie)
{
MOZ_ASSERT(NS_IsMainThread());
aNowReadyToDie->mCompositorThreadHolder = nullptr;
aNowReadyToDie->Release();
}

4
gfx/layers/ipc/CompositorParent.h
View File

@ -311,9 +311,11 @@ protected:
nsRefPtr<APZCTreeManager> mApzcTreeManager;
const nsRefPtr<CompositorThreadHolder> mCompositorThreadHolder;
nsRefPtr<CompositorThreadHolder> mCompositorThreadHolder;
DISALLOW_EVIL_CONSTRUCTORS(CompositorParent);
friend void DeferredDeleteCompositorParentOnMainThread(CompositorParent* aNowReadyToDie);
};
} // layers