diff --git a/gfx/layers/ipc/CompositorChild.cpp b/gfx/layers/ipc/CompositorChild.cpp index 8de7b19f1ac..a58d24d05d3 100644 --- a/gfx/layers/ipc/CompositorChild.cpp +++ b/gfx/layers/ipc/CompositorChild.cpp @@ -22,6 +22,7 @@ * * Contributor(s): * Benoit Girard + * Ali Juma * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -59,13 +60,13 @@ CompositorChild::CompositorChild(Thread *aCompositorThread, LayerManager *aLayer CompositorChild::~CompositorChild() { - printf("del compositor child\n"); MOZ_COUNT_DTOR(CompositorChild); } void CompositorChild::Destroy() { + mLayerManager = NULL; SendStop(); } @@ -112,7 +113,6 @@ CompositorChild::AllocPLayers(const LayersBackend &backend, const WidgetDescript bool CompositorChild::DeallocPLayers(PLayersChild* actor) { - printf("actor destroy\n"); delete actor; return true; } diff --git a/gfx/layers/ipc/CompositorChild.h b/gfx/layers/ipc/CompositorChild.h index de886dda143..a312138e6f1 100644 --- a/gfx/layers/ipc/CompositorChild.h +++ b/gfx/layers/ipc/CompositorChild.h @@ -75,13 +75,12 @@ protected: private: Thread *mCompositorThread; - LayerManager *mLayerManager; - nsRefPtr mCompositorParent; + nsRefPtr mLayerManager; DISALLOW_EVIL_CONSTRUCTORS(CompositorChild); }; -} // lauers +} // layers } // mozilla #endif // mozilla_layers_CompositorChild_h diff --git a/gfx/layers/ipc/CompositorParent.cpp b/gfx/layers/ipc/CompositorParent.cpp index c0b384cf7ab..c0c0544887b 100644 --- a/gfx/layers/ipc/CompositorParent.cpp +++ b/gfx/layers/ipc/CompositorParent.cpp @@ -22,6 +22,7 @@ * * Contributor(s): * Benoit Girard + * Ali Juma * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or @@ -45,7 +46,6 @@ namespace mozilla { namespace layers { CompositorParent::CompositorParent() - : mLayerManager(NULL) { MOZ_COUNT_CTOR(CompositorParent); @@ -53,7 +53,6 @@ CompositorParent::CompositorParent() CompositorParent::~CompositorParent() { - printf("delete parent\n"); MOZ_COUNT_DTOR(CompositorParent); } diff --git a/gfx/layers/ipc/CompositorParent.h b/gfx/layers/ipc/CompositorParent.h index cfdcab4118d..eeba0aab45c 100644 --- a/gfx/layers/ipc/CompositorParent.h +++ b/gfx/layers/ipc/CompositorParent.h @@ -22,6 +22,7 @@ * * Contributor(s): * Benoit Girard + * Ali Juma * * Alternatively, the contents of this file may be used under the terms of * either the GNU General Public License Version 2 or later (the "GPL"), or diff --git a/gfx/layers/ipc/ShadowLayersChild.cpp b/gfx/layers/ipc/ShadowLayersChild.cpp index 612e0fe86f6..05a5daa540f 100644 --- a/gfx/layers/ipc/ShadowLayersChild.cpp +++ b/gfx/layers/ipc/ShadowLayersChild.cpp @@ -47,7 +47,6 @@ namespace layers { void ShadowLayersChild::Destroy() { - printf("Destroy shadow layers\n"); NS_ABORT_IF_FALSE(0 == ManagedPLayerChild().Length(), "layers should have been cleaned up by now"); PLayersChild::Send__delete__(this);