summaryrefslogtreecommitdiffstats
path: root/gfx/cairo/quartz-cg-layers-fix-fallback.patch
diff options
context:
space:
mode:
authorwolfbeast <mcwerewolf@wolfbeast.com>2019-11-06 21:06:15 +0100
committerwolfbeast <mcwerewolf@wolfbeast.com>2019-11-07 14:49:48 +0100
commit7efd71616ec5efedbe626a986a707c35d3cac323 (patch)
tree0223e8271d9d18763efd743f43f98b8b8b9e5c2e /gfx/cairo/quartz-cg-layers-fix-fallback.patch
parentbbc2206a0fda053a6f5071b457bd209dab9ed268 (diff)
downloadUXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.gz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.lz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.tar.xz
UXP-7efd71616ec5efedbe626a986a707c35d3cac323.zip
Issue #1274 - Part 1: Adopt the cairo version as our own.
- Move header licensing from tri-license to MPL 2.0. MPL-compatible other licensing has been retained where originally present. - Remove individual superseded licensing terms. - Remove patches, outdated readmes & incomplete patch summaries. - Remove incomplete cairo release notes (only went up to 1.6.4 anyway). - Rewrite COPYING to indicate the current state of the library in tree.
Diffstat (limited to 'gfx/cairo/quartz-cg-layers-fix-fallback.patch')
-rw-r--r--gfx/cairo/quartz-cg-layers-fix-fallback.patch42
1 files changed, 0 insertions, 42 deletions
diff --git a/gfx/cairo/quartz-cg-layers-fix-fallback.patch b/gfx/cairo/quartz-cg-layers-fix-fallback.patch
deleted file mode 100644
index bcebab350..000000000
--- a/gfx/cairo/quartz-cg-layers-fix-fallback.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Bug 572912. Fix surface type passed to cairo_quartz_surface_create during fallback for CGLayers. r=jrmuizel
-
-diff --git a/gfx/cairo/cairo/src/cairo-quartz-surface.c b/gfx/cairo/cairo/src/cairo-quartz-surface.c
---- a/gfx/cairo/cairo/src/cairo-quartz-surface.c
-+++ b/gfx/cairo/cairo/src/cairo-quartz-surface.c
-@@ -2026,17 +2026,17 @@ _cairo_quartz_surface_acquire_image (voi
-
- /* ND((stderr, "%p _cairo_quartz_surface_acquire_image\n", surface)); */
-
- status = _cairo_quartz_get_image (surface, image_out);
-
- if (status == CAIRO_INT_STATUS_UNSUPPORTED && surface->cgLayer) {
- /* copy the layer into a Quartz bitmap context so we can get the data */
- cairo_surface_t *tmp =
-- cairo_quartz_surface_create (CAIRO_CONTENT_COLOR_ALPHA,
-+ cairo_quartz_surface_create (CAIRO_FORMAT_ARGB32,
- surface->extents.width,
- surface->extents.height);
- cairo_quartz_surface_t *tmp_surface = (cairo_quartz_surface_t *) tmp;
-
- /* if surface creation failed, we won't have a Quartz surface here */
- if (cairo_surface_get_type (tmp) == CAIRO_SURFACE_TYPE_QUARTZ &&
- tmp_surface->imageSurfaceEquiv) {
- CGContextSaveGState (tmp_surface->cgContext);
-@@ -2049,16 +2049,17 @@ _cairo_quartz_surface_acquire_image (voi
- CGContextDrawLayerAtPoint (tmp_surface->cgContext,
- CGPointMake (0.0, 0.0),
- surface->cgLayer);
- CGContextRestoreGState (tmp_surface->cgContext);
-
- *image_out = (cairo_image_surface_t*)
- cairo_surface_reference(tmp_surface->imageSurfaceEquiv);
- *image_extra = tmp;
-+ status = CAIRO_STATUS_SUCCESS;
- } else {
- cairo_surface_destroy (tmp);
- }
- }
-
- if (status)
- return _cairo_error (CAIRO_STATUS_NO_MEMORY);
-