mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-10-09 19:35:51 +00:00
Backed out changeset 290f4be587a1 (bug 983489) for suspicion that this caused the m8 and m10 on ics debug on a CLOSED TREE
This commit is contained in:
parent
919d02722d
commit
0f82c9229c
@ -131,6 +131,9 @@ LayerManagerComposite::Destroy()
|
||||
RootLayer()->Destroy();
|
||||
}
|
||||
mRoot = nullptr;
|
||||
|
||||
mCompositor->Destroy();
|
||||
|
||||
mDestroyed = true;
|
||||
}
|
||||
}
|
||||
|
@ -241,11 +241,7 @@ CompositorParent::Destroy()
|
||||
|
||||
// Ensure that the layer manager is destructed on the compositor thread.
|
||||
mLayerManager = nullptr;
|
||||
if (mCompositor) {
|
||||
mCompositor->Destroy();
|
||||
}
|
||||
mCompositor = nullptr;
|
||||
|
||||
mCompositionManager = nullptr;
|
||||
mApzcTreeManager->ClearTree();
|
||||
mApzcTreeManager = nullptr;
|
||||
@ -277,6 +273,7 @@ CompositorParent::RecvWillStop()
|
||||
}
|
||||
mLayerManager->Destroy();
|
||||
mLayerManager = nullptr;
|
||||
mCompositor = nullptr;
|
||||
mCompositionManager = nullptr;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user