Bug 413050 ��� call cairo_debug_reset_static_data in system cairo on shutdown

r=pavlov

configure.in

@@ -6987,6 +6987,8 @@ MOZ_TREE_CAIRO=1 )
 AC_CHECK_HEADERS(stdint.h inttypes.h sys/int_types.h)
 
 if test "$MOZ_TREE_CAIRO"; then
+    AC_DEFINE(MOZ_TREE_CAIRO)
+
     # For now we assume that we will have a uint64_t available through
     # one of the above headers or mozstdint.h.
     AC_DEFINE(HAVE_UINT64_T)

gfx/thebes/src/gfxPlatform.cpp

@@ -191,7 +191,7 @@ gfxPlatform::~gfxPlatform()
     // cairo_debug_* function unconditionally.
     //
     // because cairo can assert and thus crash on shutdown, don't do this in release builds
-#if defined(DEBUG) || defined(NS_BUILD_REFCNT_LOGGING) || defined(NS_TRACE_MALLOC)
+#if MOZ_TREE_CAIRO && (defined(DEBUG) || defined(NS_BUILD_REFCNT_LOGGING) || defined(NS_TRACE_MALLOC))
     cairo_debug_reset_static_data();
 #endif
 

toolkit/xre/nsAppRunner.cpp

@@ -2366,6 +2366,10 @@ static void MOZ_gdk_display_close(GdkDisplay *display)
   }
   else {
     gdk_display_close(display);
+#if GTK_CHECK_VERSION(2,8,0) && \
+  (defined(DEBUG) || defined(NS_BUILD_REFCNT_LOGGING) || defined(NS_TRACE_MALLOC))
+    cairo_debug_reset_static_data();
+#endif
   }
 }
 #endif // MOZ_WIDGET_GTK2