gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.patch@97036ab72558 (annotated)
gfx/skia/patches/0025-Bug-896049-Add-default-Value-SK_OVERRIDE.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 | diff --git a/gfx/skia/include/core/SkPostConfig.h b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 2 | --- a/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 3 | +++ b/gfx/skia/include/core/SkPostConfig.h |
| michael@0 | 4 | @@ -325,19 +325,19 @@ |
| michael@0 | 5 | // Some documentation suggests we should be using __attribute__((override)), |
| michael@0 | 6 | // but it doesn't work. |
| michael@0 | 7 | #define SK_OVERRIDE override |
| michael@0 | 8 | #elif defined(__has_extension) |
| michael@0 | 9 | #if __has_extension(cxx_override_control) |
| michael@0 | 10 | #define SK_OVERRIDE override |
| michael@0 | 11 | #endif |
| michael@0 | 12 | #endif |
| michael@0 | 13 | - #else |
| michael@0 | 14 | - // Linux GCC ignores "__attribute__((override))" and rejects "override". |
| michael@0 | 15 | - #define SK_OVERRIDE |
| michael@0 | 16 | + #endif |
| michael@0 | 17 | + #ifndef SK_OVERRIDE |
| michael@0 | 18 | + #define SK_OVERRIDE |
| michael@0 | 19 | #endif |
| michael@0 | 20 | #endif |
| michael@0 | 21 | |
| michael@0 | 22 | ////////////////////////////////////////////////////////////////////// |
| michael@0 | 23 | |
| michael@0 | 24 | #ifndef SK_PRINTF_LIKE |
| michael@0 | 25 | #if defined(__clang__) || defined(__GNUC__) |
| michael@0 | 26 | #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B)))) |
