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:
Carsten "Tomcat" Book 2014-05-05 16:19:22 +02:00
parent 919d02722d
commit 0f82c9229c
2 changed files with 4 additions and 4 deletions

View File

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

View File

@ -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;
}