Sat, 03 Jan 2015 20:18:00 +0100
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.
michael@0 | 1 | diff --git a/gfx/cairo/cairo/src/cairo-win32-surface.c b/gfx/cairo/cairo/src/cairo-win32-surface.c |
michael@0 | 2 | --- a/gfx/cairo/cairo/src/cairo-win32-surface.c |
michael@0 | 3 | +++ b/gfx/cairo/cairo/src/cairo-win32-surface.c |
michael@0 | 4 | @@ -1892,21 +1892,22 @@ cairo_win32_surface_get_dc (cairo_surfac |
michael@0 | 5 | return winsurf->dc; |
michael@0 | 6 | } |
michael@0 | 7 | |
michael@0 | 8 | if (_cairo_surface_is_paginated (surface)) { |
michael@0 | 9 | cairo_surface_t *target; |
michael@0 | 10 | |
michael@0 | 11 | target = _cairo_paginated_surface_get_target (surface); |
michael@0 | 12 | |
michael@0 | 13 | +#ifndef CAIRO_OMIT_WIN32_PRINTING |
michael@0 | 14 | if (_cairo_surface_is_win32_printing (target)) { |
michael@0 | 15 | winsurf = (cairo_win32_surface_t *) target; |
michael@0 | 16 | - |
michael@0 | 17 | return winsurf->dc; |
michael@0 | 18 | } |
michael@0 | 19 | +#endif |
michael@0 | 20 | } |
michael@0 | 21 | |
michael@0 | 22 | return NULL; |
michael@0 | 23 | } |
michael@0 | 24 | |
michael@0 | 25 | /** |
michael@0 | 26 | * cairo_win32_surface_get_image |
michael@0 | 27 | * @surface: a #cairo_surface_t |