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/skia/src/opts/SkBlitRow_opts_arm.cpp b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp |
michael@0 | 2 | --- a/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp |
michael@0 | 3 | +++ b/gfx/skia/src/opts/SkBlitRow_opts_arm.cpp |
michael@0 | 4 | @@ -549,17 +549,17 @@ static void S32A_Opaque_BlitRow32_neon(S |
michael@0 | 5 | #define S32A_Opaque_BlitRow32_PROC S32A_Opaque_BlitRow32_neon |
michael@0 | 6 | |
michael@0 | 7 | #else |
michael@0 | 8 | |
michael@0 | 9 | #ifdef TEST_SRC_ALPHA |
michael@0 | 10 | #error The ARM asm version of S32A_Opaque_BlitRow32 does not support TEST_SRC_ALPHA |
michael@0 | 11 | #endif |
michael@0 | 12 | |
michael@0 | 13 | -static void S32A_Opaque_BlitRow32_arm(SkPMColor* SK_RESTRICT dst, |
michael@0 | 14 | +static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Opaque_BlitRow32_arm(SkPMColor* SK_RESTRICT dst, |
michael@0 | 15 | const SkPMColor* SK_RESTRICT src, |
michael@0 | 16 | int count, U8CPU alpha) { |
michael@0 | 17 | |
michael@0 | 18 | SkASSERT(255 == alpha); |
michael@0 | 19 | |
michael@0 | 20 | /* Does not support the TEST_SRC_ALPHA case */ |
michael@0 | 21 | asm volatile ( |
michael@0 | 22 | "cmp %[count], #0 \n\t" /* comparing count with 0 */ |
michael@0 | 23 | @@ -646,17 +646,17 @@ static void S32A_Opaque_BlitRow32_arm(Sk |
michael@0 | 24 | ); |
michael@0 | 25 | } |
michael@0 | 26 | #define S32A_Opaque_BlitRow32_PROC S32A_Opaque_BlitRow32_arm |
michael@0 | 27 | #endif |
michael@0 | 28 | |
michael@0 | 29 | /* |
michael@0 | 30 | * ARM asm version of S32A_Blend_BlitRow32 |
michael@0 | 31 | */ |
michael@0 | 32 | -static void S32A_Blend_BlitRow32_arm(SkPMColor* SK_RESTRICT dst, |
michael@0 | 33 | +static void __attribute((noinline,optimize("-fomit-frame-pointer"))) S32A_Blend_BlitRow32_arm(SkPMColor* SK_RESTRICT dst, |
michael@0 | 34 | const SkPMColor* SK_RESTRICT src, |
michael@0 | 35 | int count, U8CPU alpha) { |
michael@0 | 36 | asm volatile ( |
michael@0 | 37 | "cmp %[count], #0 \n\t" /* comparing count with 0 */ |
michael@0 | 38 | "beq 3f \n\t" /* if zero exit */ |
michael@0 | 39 | |
michael@0 | 40 | "mov r12, #0xff \n\t" /* load the 0xff mask in r12 */ |
michael@0 | 41 | "orr r12, r12, r12, lsl #16 \n\t" /* convert it to 0xff00ff in r12 */ |