Bug 754329 - Crash with cairo mutexes enabled. r=joe

--HG--
extra : rebase_source : d2ae2005ebe4b525f44bdf9951f4279af7b34f5e

gfx/thebes/gfxPlatform.cpp

@@ -365,6 +365,8 @@ gfxPlatform::Shutdown()
 
 gfxPlatform::~gfxPlatform()
 {
+    mScreenReferenceSurface = nsnull;
+
     // The cairo folks think we should only clean up in debug builds,
     // but we're generally in the habit of trying to shut down as
     // cleanly as possible even in production code, so call this

toolkit/library/nsStaticXULComponents.cpp

@@ -184,10 +184,10 @@
     MODULE(nsRDFModule)                      \
     MODULE(nsWindowDataSourceModule)         \
     MODULE(nsParserModule)                   \
+    MODULE(nsImageLib2Module)                \
     MODULE(nsGfxModule)                      \
     PROFILER_MODULE                          \
     WIDGET_MODULES                           \
-    MODULE(nsImageLib2Module)                \
     ICON_MODULE                              \
     MODULE(nsPluginModule)                   \
     MODULE(nsLayoutModule)                   \