Djam/firefox-esr91
1
0
Fork 0
mirror of https://abf.rosa.ru/djam/firefox-esr91.git synced 2025-02-24 17:42:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

update cairo patch

Browse source
This commit is contained in:
Tigro 2013-02-13 14:52:55 +04:00
parent a0ec2bbba9
commit 321242ce1e
1 changed files with 35 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
firefox-18-fix-cairo-build.patch Normal file
View file

@ -0,0 +1,35 @@
diff -urN mozilla-release.orig/gfx/thebes/gfxPlatform.cpp mozilla-release/gfx/thebes/gfxPlatform.cpp
--- mozilla-release.orig/gfx/thebes/gfxPlatform.cpp 2013-02-11 17:09:53.685871126 +0400
+++ mozilla-release/gfx/thebes/gfxPlatform.cpp 2013-02-11 17:14:06.844574090 +0400
@@ -507,11 +507,10 @@
delete static_cast<SourceSurfaceUserData*>(srcSurfUD);
}
-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);
}
@@ -626,14 +625,9 @@
}
- 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());
+
}
SourceSurfaceUserData *srcSurfUD = new SourceSurfaceUserData;