--- mozilla-release/gfx/thebes/gfxPlatform.cpp.orig 2012-07-24 15:46:33.855661405 +0200 +++ mozilla-release/gfx/thebes/gfxPlatform.cpp 2012-07-24 15:48:32.017177942 +0200 @@ -459,11 +459,10 @@ 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); } @@ -535,14 +534,8 @@ imgSurface->Stride(), format); - 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();