--- a/gfx/thebes/gfxPlatform.cpp
+++ b/gfx/thebes/gfxPlatform.cpp
@@ -1325,19 +1325,17 @@ void gfxPlatform::ShutdownLayersIPC() {
 }
 
 void gfxPlatform::WillShutdown() {
   // Destoy these first in case they depend on backend-specific resources.
   // Otherwise, the backend's destructor would be called before the
   // base gfxPlatform destructor.
   mScreenReferenceSurface = nullptr;
   mScreenReferenceDrawTarget = nullptr;
-}
-
-gfxPlatform::~gfxPlatform() {
+
   // 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
   // cairo_debug_* function unconditionally.
   //
   // because cairo can assert and thus crash on shutdown, don't do this in
   // release builds
 #ifdef NS_FREE_PERMANENT_DATA
@@ -1348,16 +1346,19 @@ gfxPlatform::~gfxPlatform() {
 #  endif
 
 #  if MOZ_TREE_CAIRO
   cairo_debug_reset_static_data();
 #  endif
 #endif
 }
 
+gfxPlatform::~gfxPlatform() {
+}
+
 /* static */
 already_AddRefed<DrawTarget> gfxPlatform::CreateDrawTargetForSurface(
     gfxASurface* aSurface, const IntSize& aSize) {
   SurfaceFormat format = aSurface->GetSurfaceFormat();
   RefPtr<DrawTarget> drawTarget = Factory::CreateDrawTargetForCairoSurface(
       aSurface->CairoSurface(), aSize, &format);
   if (!drawTarget) {
     gfxWarning() << "gfxPlatform::CreateDrawTargetForSurface failed in "