Bug 983489 - Delay destroying mCompositor to prevent crash. r=nical

This commit is contained in:
Vincent Chen 2014-05-04 19:52:00 -04:00
parent b511dd2919
commit dfca66c0a2
2 changed files with 4 additions and 4 deletions

View File

@ -132,9 +132,6 @@ LayerManagerComposite::Destroy()
RootLayer()->Destroy();
}
mRoot = nullptr;
mCompositor->Destroy();
mDestroyed = true;
}
}

View File

@ -251,7 +251,11 @@ 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;
@ -283,7 +287,6 @@ CompositorParent::RecvWillStop()
}
mLayerManager->Destroy();
mLayerManager = nullptr;
mCompositor = nullptr;
mCompositionManager = nullptr;
}