gfx/cairo/fix-cairo-surface-wrapper-flush-build-warning.patch

Tue, 06 Jan 2015 21:39:09 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Tue, 06 Jan 2015 21:39:09 +0100
branch
TOR_BUG_9701
changeset 8
97036ab72558
permissions
-rw-r--r--

Conditionally force memory storage according to privacy.thirdparty.isolate;
This solves Tor bug #9701, complying with disk avoidance documented in
https://www.torproject.org/projects/torbrowser/design/#disk-avoidance.

michael@0 1 # HG changeset patch
michael@0 2 # Parent 5479a346b95b82162c72419a95cbb4022cbbfe4d
michael@0 3 # User Ed Morley <bmo@edmorley.co.uk>
michael@0 4 Bug 631155 - undefined return value in function '_cairo_surface_wrapper_flush'; r=jrmuizel
michael@0 5
michael@0 6 diff --git a/gfx/cairo/cairo/src/cairo-surface-wrapper.c b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
michael@0 7 --- a/gfx/cairo/cairo/src/cairo-surface-wrapper.c
michael@0 8 +++ b/gfx/cairo/cairo/src/cairo-surface-wrapper.c
michael@0 9 @@ -712,9 +712,10 @@ _cairo_surface_wrapper_fini (cairo_surfa
michael@0 10 }
michael@0 11
michael@0 12 cairo_status_t
michael@0 13 _cairo_surface_wrapper_flush (cairo_surface_wrapper_t *wrapper)
michael@0 14 {
michael@0 15 if (wrapper->target->backend->flush) {
michael@0 16 return wrapper->target->backend->flush(wrapper->target);
michael@0 17 }
michael@0 18 + return CAIRO_STATUS_SUCCESS;
michael@0 19 }

mercurial