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

firefox-13-fix-cairo-build.patch rediff

Browse source
This commit is contained in:
Alexander Khryukin 2012-08-27 22:21:19 -04:00
parent 06df8760c9
commit 2bad1134d9
1 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
firefox-13-fix-cairo-build.patch
View file

@ -1,12 +1,8 @@
diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp diff --git a/gfx/thebes/gfxPlatform.cpp b/gfx/thebes/gfxPlatform.cpp
--- a/gfx/thebes/gfxPlatform.cpp Sun Mar 04 00:38:41 2012 +0000 index 114cda9..3471966 100644
+++ b/gfx/thebes/gfxPlatform.cpp Wed May 16 17:37:10 2012 +0200 --- a/gfx/thebes/gfxPlatform.cpp
@@ -448,21 +448,19 @@ gfxPlatform::CreateDrawTargetForSurface( +++ b/gfx/thebes/gfxPlatform.cpp
@@ -443,11 +443,10 @@ void SourceBufferDestroy(void *srcBuffer)
cairo_user_data_key_t kSourceSurface;
void SourceBufferDestroy(void *srcBuffer)
{
static_cast<SourceSurface*>(srcBuffer)->Release(); static_cast<SourceSurface*>(srcBuffer)->Release();
} }
@ -15,41 +11,27 @@ diff -r baec1efc87a4 gfx/thebes/gfxPlatform.cpp
{ {
- gfxImageSurface* origSurf = - gfxImageSurface* origSurf =
- static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface)); - static_cast<gfxImageSurface*>(cairo_surface_get_user_data(nullSurf, &kSourceSurface));
-
+ gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf); + gfxImageSurface *origSurf = static_cast<gfxImageSurface*>(nullSurf);
origSurf->SetData(&kSourceSurface, NULL, NULL); origSurf->SetData(&kSourceSurface, NULL, NULL);
} }
RefPtr<SourceSurface> @@ -544,14 +543,9 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurfa
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
{
void *userData = aSurface->GetData(&kSourceSurface);
@@ -524,24 +522,18 @@ gfxPlatform::GetSourceSurfaceForSurface(
NS_RUNTIMEABORT("Invalid surface format!");
} }
srcBuffer = aTarget->CreateSourceSurfaceFromData(imgSurface->Data(),
IntSize(imgSurface->GetSize().width, imgSurface->GetSize().height),
imgSurface->Stride(),
format);
- cairo_surface_t *nullSurf = - cairo_surface_t *nullSurf =
- cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA); - cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
- cairo_surface_set_user_data(nullSurf, - cairo_surface_set_user_data(nullSurf,
- &kSourceSurface, - &kSourceSurface,
- imgSurface, - imgSurface,
- NULL); - NULL);
- cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached); - cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
- cairo_surface_destroy(nullSurf); - cairo_surface_destroy(nullSurf);
+ cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic", + cairo_surface_set_mime_data(imgSurface->CairoSurface(), "mozilla/magic",
+ (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get()); + (const unsigned char *) "data", 4, SourceSnapshotDetached, imgSurface.get());
+
} }
srcBuffer->AddRef(); srcBuffer->AddRef();
aSurface->SetData(&kSourceSurface, srcBuffer, SourceBufferDestroy);
return srcBuffer;
}