diff options
author | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-06-17 13:23:56 -0300 |
---|---|---|
committer | André Fabian Silva Delgado <andre@pc-01.localdomain> | 2012-06-17 13:23:56 -0300 |
commit | 7326e5293727cc1461fa92c2ba6868fba49456ae (patch) | |
tree | 5c1f045179d5166b921db4e3101f4d80e5aab5da /libre/icecat/cairo.patch | |
parent | 51326121eaee8da99ca23154ff56f97b0e987cb9 (diff) | |
parent | 2beb195e6425506ec1de35160cb820a73b7b9e0b (diff) |
Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre
Diffstat (limited to 'libre/icecat/cairo.patch')
-rw-r--r-- | libre/icecat/cairo.patch | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch new file mode 100644 index 000000000..981eff883 --- /dev/null +++ b/libre/icecat/cairo.patch @@ -0,0 +1,43 @@ +From: Uli Schlachter <psychon@znc.in> +Date: Thu, 17 May 2012 10:51:11 +0200 +Subject: Bug 722975 - Make system cairo work again + +--- + gfx/thebes/gfxPlatform.cpp | 16 ++++------------ + 1 file changed, 4 insertions(+), 12 deletions(-) + +diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp +index fb06fba..a0edefc 100644 +--- a/gfx/thebes/gfxPlatform.cpp ++++ b/gfx/thebes/gfxPlatform.cpp +@@ -436,11 +436,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); + } + +@@ -512,14 +510,8 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa + 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(); |