diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-01-12 18:06:34 -0500 |
commit | 330c0a9ff2e05b86f69f0209b3265cb003e0c98d (patch) | |
tree | 34cccc67370ca8d178c21556bc6c6a894bef1f84 /libre/icecat/cairo.patch | |
parent | 3a5380856fae97f3358dc00522656c9f1fc26187 (diff) | |
parent | dc26483bfd644bb2ad6dd25e3bb5ca9e2bbe1099 (diff) | |
download | abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.gz abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.tar.bz2 abslibre-330c0a9ff2e05b86f69f0209b3265cb003e0c98d.zip |
Merge branch 'wip-merge'
Conflicts:
libre/dpkg/PKGBUILD
libre/iceweasel-i18n/PKGBUILD
libre/iceweasel-libre/PKGBUILD
Diffstat (limited to 'libre/icecat/cairo.patch')
-rw-r--r-- | libre/icecat/cairo.patch | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/libre/icecat/cairo.patch b/libre/icecat/cairo.patch deleted file mode 100644 index a1fabee90..000000000 --- a/libre/icecat/cairo.patch +++ /dev/null @@ -1,33 +0,0 @@ ---- a/gfx/thebes/gfxPlatform.cpp -+++ b/gfx/thebes/gfxPlatform.cpp -@@ -459,11 +459,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); - } - -@@ -535,14 +533,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(); |