gfx/skia/patches/archive/user-config.patch@129ffea94266 (annotated)
gfx/skia/patches/archive/user-config.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.
| michael@0 | 1 | diff --git a/gfx/skia/include/config/SkUserConfig.h b/gfx/skia/include/config/SkUserConfig.h |
| michael@0 | 2 | --- a/gfx/skia/include/config/SkUserConfig.h |
| michael@0 | 3 | +++ b/gfx/skia/include/config/SkUserConfig.h |
| michael@0 | 4 | @@ -140,16 +140,20 @@ |
| michael@0 | 5 | /* If SK_DEBUG is defined, then you can optionally define SK_SUPPORT_UNITTEST |
| michael@0 | 6 | which will run additional self-tests at startup. These can take a long time, |
| michael@0 | 7 | so this flag is optional. |
| michael@0 | 8 | */ |
| michael@0 | 9 | #ifdef SK_DEBUG |
| michael@0 | 10 | //#define SK_SUPPORT_UNITTEST |
| michael@0 | 11 | #endif |
| michael@0 | 12 | |
| michael@0 | 13 | +/* Don't dither 32bit gradients, to match what the canvas test suite expects. |
| michael@0 | 14 | + */ |
| michael@0 | 15 | +#define SK_DISABLE_DITHER_32BIT_GRADIENT |
| michael@0 | 16 | + |
| michael@0 | 17 | /* If your system embeds skia and has complex event logging, define this |
| michael@0 | 18 | symbol to name a file that maps the following macros to your system's |
| michael@0 | 19 | equivalents: |
| michael@0 | 20 | SK_TRACE_EVENT0(event) |
| michael@0 | 21 | SK_TRACE_EVENT1(event, name1, value1) |
| michael@0 | 22 | SK_TRACE_EVENT2(event, name1, value1, name2, value2) |
| michael@0 | 23 | src/utils/SkDebugTrace.h has a trivial implementation that writes to |
| michael@0 | 24 | the debug output stream. If SK_USER_TRACE_INCLUDE_FILE is not defined, |
| michael@0 | 25 | @@ -161,9 +165,15 @@ |
| michael@0 | 26 | */ |
| michael@0 | 27 | #ifdef SK_SAMPLES_FOR_X |
| michael@0 | 28 | #define SK_R32_SHIFT 16 |
| michael@0 | 29 | #define SK_G32_SHIFT 8 |
| michael@0 | 30 | #define SK_B32_SHIFT 0 |
| michael@0 | 31 | #define SK_A32_SHIFT 24 |
| michael@0 | 32 | #endif |
| michael@0 | 33 | |
| michael@0 | 34 | +/* Don't include stdint.h on windows as it conflicts with our build system. |
| michael@0 | 35 | + */ |
| michael@0 | 36 | +#ifdef SK_BUILD_FOR_WIN32 |
| michael@0 | 37 | + #define SK_IGNORE_STDINT_DOT_H |
| michael@0 | 38 | +#endif |
| michael@0 | 39 | + |
| michael@0 | 40 | #endif |
