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 1154614 - Don't try to pick up the same non-reentrant lock twice. r=dvander a=RyanVM

Browse Source
This commit is contained in:
Kartikaya Gupta 2015-04-15 12:49:28 -04:00
parent afcdc42527
commit 83204f224f
1 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2042,16 +2042,13 @@ CrossProcessCompositorParent::SetConfirmedTargetAPZC(const LayerTransactionParen
{
uint64_t id = aLayerTree->GetId();
MOZ_ASSERT(id != 0);
CompositorParent* parent = nullptr;
{
MonitorAutoLock lock(*sIndirectLayerTreesLock);
const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(id);
if (!state || !state->mParent) {
return;
}
parent = state->mParent;
const CompositorParent::LayerTreeState* state = CompositorParent::GetIndirectShadowTree(id);
if (!state) {
return;
}
parent->SetConfirmedTargetAPZC(aLayerTree, aInputBlockId, aTargets);
MOZ_ASSERT(state->mParent);
state->mParent->SetConfirmedTargetAPZC(aLayerTree, aInputBlockId, aTargets);
}
AsyncCompositionManager*