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 623728: Don't process transactions on destroyed shadow layer managers, even when the layer manager hasn't been explicitly destroyed. r=jrmuizel a=b

Browse Source
This commit is contained in:
Chris Jones 2011-01-12 14:13:41 -06:00
parent 2c9cc9d190
commit c326a0a9fc
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gfx/layers/ipc/ShadowLayersParent.cpp
View File

@ -122,6 +122,7 @@ ShadowChild(const OpRemoveChild& op)
//-------------------------------------------------- //--------------------------------------------------
// ShadowLayersParent // ShadowLayersParent
ShadowLayersParent::ShadowLayersParent(ShadowLayerManager* aManager) ShadowLayersParent::ShadowLayersParent(ShadowLayerManager* aManager)
: mDestroyed(false)
{ {
MOZ_COUNT_CTOR(ShadowLayersParent); MOZ_COUNT_CTOR(ShadowLayersParent);
mLayerManager = aManager; mLayerManager = aManager;
@ -135,6 +136,7 @@ ShadowLayersParent::~ShadowLayersParent()
void void
ShadowLayersParent::Destroy() ShadowLayersParent::Destroy()
{ {
mDestroyed = true;
for (size_t i = 0; i < ManagedPLayerParent().Length(); ++i) { for (size_t i = 0; i < ManagedPLayerParent().Length(); ++i) {
ShadowLayerParent* slp = ShadowLayerParent* slp =
static_cast<ShadowLayerParent*>(ManagedPLayerParent()[i]); static_cast<ShadowLayerParent*>(ManagedPLayerParent()[i]);
@ -148,7 +150,7 @@ ShadowLayersParent::RecvUpdate(const InfallibleTArray<Edit>& cset,
{ {
MOZ_LAYERS_LOG(("[ParentSide] recieved txn with %d edits", cset.Length())); MOZ_LAYERS_LOG(("[ParentSide] recieved txn with %d edits", cset.Length()));
if (layer_manager()->IsDestroyed()) { if (mDestroyed || layer_manager()->IsDestroyed()) {
return true; return true;
} }

14
gfx/layers/ipc/ShadowLayersParent.h
View File

@ -86,6 +86,20 @@ private:
// Hold the root because it might be grafted under various // Hold the root because it might be grafted under various
// containers in the "real" layer tree // containers in the "real" layer tree
nsRefPtr<ContainerLayer> mRoot; nsRefPtr<ContainerLayer> mRoot;
// When the widget/frame/browser stuff in this process begins its
// destruction process, we need to Disconnect() all the currently
// live shadow layers, because some of them might be orphaned from
// the layer tree. This happens in Destroy() above. After we
// Destroy() ourself, there's a window in which that information
// hasn't yet propagated back to the child side and it might still
// send us layer transactions. We want to ignore those transactions
// because they refer to "zombie layers" on this side. So, we track
// that state with |mDestroyed|. This is similar to, but separate
// from, |mLayerManager->IsDestroyed()|; we might have had Destroy()
// called on us but the mLayerManager might not be destroyed, or
// vice versa. In both cases though, we want to ignore shadow-layer
// transactions posted by the child.
bool mDestroyed;
}; };
} // namespace layers } // namespace layers