617089342c
- see http://www.mozilla.org/en-US/firefox/15.0/releasenotes/ - add -Os hack to fix a relocation error when linking on ppc (as was done in tb since 10..) - garbage collect nsSound.cpp, the original one uses libcanberra properly and thus sndio. - remove patch from #750620, merged upstream (mfbt/double-conversion) - remove patches from #747257, merged upstream (gstreamer fix) - remove patches from #691898, merged upstream (yarr jit ppc)
37 lines
1.2 KiB
Plaintext
37 lines
1.2 KiB
Plaintext
$OpenBSD: patch-gfx_thebes_gfxPlatform_cpp,v 1.4 2012/09/01 13:56:45 landry Exp $
|
|
https://bugzilla.mozilla.org/show_bug.cgi?id=715658
|
|
--- gfx/thebes/gfxPlatform.cpp.orig Wed Aug 15 07:47:27 2012
|
|
+++ gfx/thebes/gfxPlatform.cpp Sun Aug 19 13:30:27 2012
|
|
@@ -443,6 +443,7 @@ void SourceBufferDestroy(void *srcBuffer)
|
|
static_cast<SourceSurface*>(srcBuffer)->Release();
|
|
}
|
|
|
|
+#ifdef MOZ_TREE_CAIRO
|
|
void SourceSnapshotDetached(cairo_surface_t *nullSurf)
|
|
{
|
|
gfxImageSurface* origSurf =
|
|
@@ -450,6 +451,7 @@ void SourceSnapshotDetached(cairo_surface_t *nullSurf)
|
|
|
|
origSurf->SetData(&kSourceSurface, NULL, NULL);
|
|
}
|
|
+#endif
|
|
|
|
RefPtr<SourceSurface>
|
|
gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aTarget, gfxASurface *aSurface)
|
|
@@ -544,6 +546,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
|
|
|
|
}
|
|
|
|
+ #ifdef MOZ_TREE_CAIRO
|
|
cairo_surface_t *nullSurf =
|
|
cairo_null_surface_create(CAIRO_CONTENT_COLOR_ALPHA);
|
|
cairo_surface_set_user_data(nullSurf,
|
|
@@ -552,6 +555,7 @@ gfxPlatform::GetSourceSurfaceForSurface(DrawTarget *aT
|
|
NULL);
|
|
cairo_surface_attach_snapshot(imgSurface->CairoSurface(), nullSurf, SourceSnapshotDetached);
|
|
cairo_surface_destroy(nullSurf);
|
|
+ #endif
|
|
}
|
|
|
|
srcBuffer->AddRef();
|