diff -p -up comm-beta/mozilla/gfx/thebes/gfxPlatform.cpp.system-cairo comm-beta/mozilla/gfx/thebes/gfxPlatform.cpp
--- comm-beta/mozilla/gfx/thebes/gfxPlatform.cpp.system-cairo	2012-07-21 19:53:36.000000000 +0200
+++ comm-beta/mozilla/gfx/thebes/gfxPlatform.cpp	2012-07-22 21:04:52.434029222 +0200
@@ -429,11 +429,9 @@ void SourceBufferDestroy(void *srcBuffer
   static_cast<SourceSurface*>(srcBuffer)->Release();
 }
 
-void SourceSnapshotDetached(cairo_surface_t *nullSurf)
+void SourceSnapshotDetached(void *nullSurf)
 {
-  gfxImageSurface* origSurf =
-    static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
-
+  gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
   origSurf->SetData(&kSourceSurface, NULL, NULL);
 }
 
@@ -530,14 +528,8 @@ gfxPlatform::GetSourceSurfaceForSurface(
 
     }
 
-    cairo_surface_t *nullSurf =
-	cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
-    cairo_surface_set_user_data(nullSurf,
-                                &kSourceSurface,
-                                imgSurface,
-                                NULL);
-    cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
-    cairo_surface_destroy(nullSurf);
+    cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
+		(const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
   }
 
   srcBuffer->AddRef();