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

Sat, 03 Jan 2015 20:18:00 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Sat, 03 Jan 2015 20:18:00 +0100
branch
TOR_BUG_3246
changeset 7
129ffea94266
permissions
-rw-r--r--

Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.

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

mercurial