596419 - ThebesLayerD3D9 can outlive LayerManager

Status: RESOLVED FIXED

(Core :: Graphics, defect)

Description

[Bas Schouten (:bas.schouten)]

Attachment: Fix up Layer destruction scheme

ThebesLayerD3D9 can currently outlive a layer manager, but might still attempt to access it to unregister itself with the device manager. We should handle a LayerManager destruction and clear everything out while the device manager and the layer manager are still around. At the point Destroy is called we are guaranteed that all ThebesLayers created for a certain layer manager are either destroyed or in the layer manager's layer tree.

Comment 1

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 475305 [details] [diff] [review]
Fix up Layer destruction scheme

># HG changeset patch
># Parent 5f2250cb58c9eb1aa0d3f5515931f640152f2c1d
>
>diff --git a/gfx/layers/d3d9/CanvasLayerD3D9.cpp b/gfx/layers/d3d9/CanvasLayerD3D9.cpp
>--- a/gfx/layers/d3d9/CanvasLayerD3D9.cpp
>+++ b/gfx/layers/d3d9/CanvasLayerD3D9.cpp
>@@ -42,17 +42,17 @@
> #include "gfxWindowsSurface.h"
> #include "gfxWindowsPlatform.h"
> 
> namespace mozilla {
> namespace layers {
> 
> CanvasLayerD3D9::~CanvasLayerD3D9()
> {
>-  if (mD3DManager->deviceManager()) {
>+  if (mD3DManager && mD3DManager->deviceManager()) {
>     mD3DManager->deviceManager()->mLayersWithResources.RemoveElement(this);
>   }
> }

We shouldn't need to check for mD3DManager->deviceManager() (you do this other places too)

Comment 2

[Jeff Muizelaar [:jrmuizel]]

Comment on attachment 475305 [details] [diff] [review]
Fix up Layer destruction scheme

>+CanvasLayerD3D9::LayerManagerDestroyed()
>+{
>+  if (mD3DManager->deviceManager()) {

We shouldn't need to check deviceManager() here.

Comment 3

[Joe Drew (not getting mail)]

http://hg.mozilla.org/mozilla-central/rev/4407c9329f8d