From 2406e613ccbcc6ea404d26868be7788f6258be8f Mon Sep 17 00:00:00 2001
From: Matt Woodrow <mwoodrow@mozilla.com>
Date: Tue, 18 Jan 2011 12:00:43 +1300
Subject: [PATCH] Bug 586683 - ImageContainers can have no manager. r=Bas
 a=bustage

---
 gfx/layers/ImageLayers.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gfx/layers/ImageLayers.h b/gfx/layers/ImageLayers.h
index c5ae989b6ecd..47ba6637e060 100644
--- a/gfx/layers/ImageLayers.h
+++ b/gfx/layers/ImageLayers.h
@@ -220,7 +220,7 @@ public:
    */
   void SetContainer(ImageContainer* aContainer) 
   {
-    NS_ASSERTION(aContainer->Manager() == Manager(), 
+    NS_ASSERTION(!aContainer->Manager() || aContainer->Manager() == Manager(), 
                  "ImageContainer must have the same manager as the ImageLayer");
     mContainer = aContainer;  
   }