gfx/skia/patches/archive/0009-Bug-777614-Re-apply-759683-Handle-compilers-that-don.patch@129ffea94266 (annotated)
gfx/skia/patches/archive/0009-Bug-777614-Re-apply-759683-Handle-compilers-that-don.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 | From 2c5a8cebc806ed287ce7c3723ea64a233266cd9e Mon Sep 17 00:00:00 2001 |
| michael@0 | 2 | From: George Wright <gw@gwright.org.uk> |
| michael@0 | 3 | Date: Thu, 13 Sep 2012 14:55:33 -0400 |
| michael@0 | 4 | Subject: [PATCH 9/9] Bug 777614 - Re-apply 759683 - Handle compilers that |
| michael@0 | 5 | don't support SSSE3 intrinsics r=nrc |
| michael@0 | 6 | |
| michael@0 | 7 | --- |
| michael@0 | 8 | gfx/skia/src/opts/opts_check_SSE2.cpp | 6 +++++- |
| michael@0 | 9 | 1 file changed, 5 insertions(+), 1 deletion(-) |
| michael@0 | 10 | |
| michael@0 | 11 | diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp |
| michael@0 | 12 | index 96d0dea..add6d5f 100644 |
| michael@0 | 13 | --- a/gfx/skia/src/opts/opts_check_SSE2.cpp |
| michael@0 | 14 | +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp |
| michael@0 | 15 | @@ -86,9 +86,13 @@ static inline bool hasSSSE3() { |
| michael@0 | 16 | #else |
| michael@0 | 17 | |
| michael@0 | 18 | static inline bool hasSSSE3() { |
| michael@0 | 19 | +#if defined(SK_BUILD_SSSE3) |
| michael@0 | 20 | int cpu_info[4] = { 0 }; |
| michael@0 | 21 | getcpuid(1, cpu_info); |
| michael@0 | 22 | return (cpu_info[2] & 0x200) != 0; |
| michael@0 | 23 | +#else |
| michael@0 | 24 | + return false; |
| michael@0 | 25 | +#endif |
| michael@0 | 26 | } |
| michael@0 | 27 | #endif |
| michael@0 | 28 | |
| michael@0 | 29 | @@ -104,7 +108,7 @@ static bool cachedHasSSSE3() { |
| michael@0 | 30 | |
| michael@0 | 31 | void SkBitmapProcState::platformProcs() { |
| michael@0 | 32 | if (cachedHasSSSE3()) { |
| michael@0 | 33 | -#if !defined(SK_BUILD_FOR_ANDROID) |
| michael@0 | 34 | +#if !defined(SK_BUILD_FOR_ANDROID) && defined(SK_BUILD_SSSE3) |
| michael@0 | 35 | // Disable SSSE3 optimization for Android x86 |
| michael@0 | 36 | if (fSampleProc32 == S32_opaque_D32_filter_DX) { |
| michael@0 | 37 | fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3; |
| michael@0 | 38 | -- |
| michael@0 | 39 | 1.7.11.4 |
| michael@0 | 40 |
