Bug 1689998 - Mozilla-specific build fixups for pixman 0.40.0. r=jrmuizel

Differential Revision: https://phabricator.services.mozilla.com/D103685

gfx/cairo/libpixman/src/moz.build

@@ -35,7 +35,6 @@ SOURCES += [
     'pixman-arm.c',
     'pixman-bits-image.c',
     'pixman-combine-float.c',
-    'pixman-combine16.c',
     'pixman-combine32.c',
     'pixman-conical-gradient.c',
     'pixman-edge-accessors.c',
@@ -70,8 +69,14 @@ LOCAL_INCLUDES += [
     '../../cairo/src',
 ]
 
+if CONFIG['ANDROID_NDK']:
+    # For cpu-features.h
+    LOCAL_INCLUDES += [
+        '%%%s/sources/android/cpufeatures' % CONFIG['ANDROID_NDK']
+    ]
+
 if CONFIG['MOZ_USE_PTHREADS']:
-    DEFINES['HAVE_PTHREAD_SETSPECIFIC'] = True
+    DEFINES['HAVE_PTHREADS'] = True
 
 DEFINES['PACKAGE'] = 'mozpixman'
 

gfx/cairo/libpixman/src/pixman-compiler.h

@@ -89,6 +89,23 @@
 #   endif
 #endif
 
+/* In libxul builds we don't ever want to export pixman symbols */
+#if 1
+#include "prcpucfg.h"
+
+#ifdef HAVE_VISIBILITY_HIDDEN_ATTRIBUTE
+#define CVISIBILITY_HIDDEN __attribute__((visibility("hidden")))
+#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+#define CVISIBILITY_HIDDEN __hidden
+#else
+#define CVISIBILITY_HIDDEN
+#endif
+
+/* In libxul builds we don't ever want to export cairo symbols */
+#define PIXMAN_EXPORT extern CVISIBILITY_HIDDEN
+
+#else
+
 /* GCC visibility */
 #if defined(__GNUC__) && __GNUC__ >= 4 && !defined(_WIN32)
 #   define PIXMAN_EXPORT __attribute__ ((visibility("default")))
@@ -101,6 +118,8 @@
 #   define PIXMAN_EXPORT
 #endif
 
+#endif
+
 /* member offsets */
 #define CONTAINER_OF(type, member, data)				\
     ((type *)(((uint8_t *)data) - offsetof (type, member)))

gfx/cairo/libpixman/src/pixman-private.h

@@ -5,8 +5,17 @@
  * The defines which are shared between C and assembly code
  */
 
-/* bilinear interpolation precision (must be < 8) */
+/* bilinear interpolation precision (must be <= 8) */
+#ifndef MOZILLA_VERSION
+#error "Need mozilla headers"
+#endif
+#ifdef MOZ_GFX_OPTIMIZE_MOBILE
+#define LOW_QUALITY_INTERPOLATION
+#define LOWER_QUALITY_INTERPOLATION
+#define BILINEAR_INTERPOLATION_BITS 4
+#else
 #define BILINEAR_INTERPOLATION_BITS 7
+#endif
 #define BILINEAR_INTERPOLATION_RANGE (1 << BILINEAR_INTERPOLATION_BITS)
 
 /*

gfx/cairo/libpixman/src/pixman-x86.c

@@ -109,6 +109,10 @@ have_cpuid (void)
 #endif
 }
 
+#ifdef _MSC_VER
+#include <intrin.h> /* for __cpuid */
+#endif
+
 static void
 pixman_cpuid (uint32_t feature,
 	      uint32_t *a, uint32_t *b, uint32_t *c, uint32_t *d)

gfx/cairo/libpixman/src/pixman.h

@@ -69,6 +69,10 @@ SOFTWARE.
 #ifndef PIXMAN_H__
 #define PIXMAN_H__
 
+#ifdef MOZILLA_VERSION
+#include "cairo/pixman-rename.h"
+#endif
+
 #include <pixman-version.h>
 
 #ifdef  __cplusplus

layout/reftests/svg/reftest.list

@@ -37,7 +37,7 @@ needs-focus == autofocus-02b.svg pass.svg
 == baseline-middle-01.svg pass.svg
 
 == blend-color-burn.svg blend-color-burn-ref.svg
-== blend-color-dodge.svg blend-color-dodge-ref.svg
+fuzzy-if(winWidget&&gpuProcess&&!d2d,0-1,0-1600) == blend-color-dodge.svg blend-color-dodge-ref.svg
 # == blend-color.svg blend-color-ref.svg
 == blend-darken.svg blend-darken-ref.svg
 == blend-difference.svg blend-difference-ref.svg