Thu, 15 Jan 2015 21:03:48 +0100
Integrate friendly tips from Tor colleagues to make (or not) 4.5 alpha 3;
This includes removal of overloaded (but unused) methods, and addition of
a overlooked call to DataStruct::SetData(nsISupports, uint32_t, bool.)
1 diff --git a/gfx/skia/src/opts/opts_check_SSE2.cpp b/gfx/skia/src/opts/opts_check_SSE2.cpp
2 --- a/gfx/skia/src/opts/opts_check_SSE2.cpp
3 +++ b/gfx/skia/src/opts/opts_check_SSE2.cpp
4 @@ -91,17 +91,17 @@ static bool cachedHasSSE2() {
6 static bool cachedHasSSSE3() {
7 static bool gHasSSSE3 = hasSSSE3();
8 return gHasSSSE3;
9 }
11 void SkBitmapProcState::platformProcs() {
12 if (cachedHasSSSE3()) {
13 -#if !defined(SK_BUILD_FOR_ANDROID)
14 +#if defined(SK_BUILD_SSSE3)
15 // Disable SSSE3 optimization for Android x86
16 if (fSampleProc32 == S32_opaque_D32_filter_DX) {
17 fSampleProc32 = S32_opaque_D32_filter_DX_SSSE3;
18 } else if (fSampleProc32 == S32_alpha_D32_filter_DX) {
19 fSampleProc32 = S32_alpha_D32_filter_DX_SSSE3;
20 }
22 if (fSampleProc32 == S32_opaque_D32_filter_DXDY) {