# HG changeset patch

# Parent  9fcbd287056a40084b1e679f787bf683b291f323

Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834

diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp

--- a/gfx/2d/DrawTargetSkia.cpp

+++ b/gfx/2d/DrawTargetSkia.cpp

@@ -156,7 +156,8 @@ static IntRect CalculateSurfaceBounds(co

 }

 static const int kARGBAlphaOffset =

-    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;

+    0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 ==

+        // SurfaceFormat::B8G8R8A8 ? 3 : 0;

 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,

                              const int32_t aStride, SurfaceFormat aFormat) {

diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h

--- a/gfx/2d/Types.h

+++ b/gfx/2d/Types.h

@@ -89,18 +89,11 @@ enum class SurfaceFormat : int8_t {

   // This represents the unknown format.

   UNKNOWN,  // TODO: Replace uses with Maybe<SurfaceFormat>.

-// The following values are endian-independent synonyms. The _UINT32 suffix

-// indicates that the name reflects the layout when viewed as a uint32_t

-// value.

-#if MOZ_LITTLE_ENDIAN()

+  // The following values are endian-independent synonyms. The _UINT32 suffix

+  // indicates that the name reflects the layout when viewed as a uint32_t

+  // value.

   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB

   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB

-#elif MOZ_BIG_ENDIAN()

-  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB

-  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB

-#else

-#  error "bad endianness"

-#endif

   // The following values are OS and endian-independent synonyms.

   //

diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc

--- a/gfx/skia/skia/modules/skcms/skcms.cc

+++ b/gfx/skia/skia/modules/skcms/skcms.cc

@@ -30,6 +30,8 @@

         #include <avx512fintrin.h>

         #include <avx512dqintrin.h>

     #endif

+#else

+    #define SKCMS_PORTABLE

 #endif

 static bool runtime_cpu_detection = true;

@@ -324,20 +326,28 @@ enum {

 static uint16_t read_big_u16(const uint8_t* ptr) {

     uint16_t be;

     memcpy(&be, ptr, sizeof(be));

-#if defined(_MSC_VER)

-    return _byteswap_ushort(be);

+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__

+    return be;

 #else

-    return __builtin_bswap16(be);

+    #if defined(_MSC_VER)

+     return _byteswap_ushort(be);

+    #else

+     return __builtin_bswap16(be);

+    #endif

 #endif

 }

 static uint32_t read_big_u32(const uint8_t* ptr) {

     uint32_t be;

     memcpy(&be, ptr, sizeof(be));

-#if defined(_MSC_VER)

-    return _byteswap_ulong(be);

+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__

+    return be;

 #else

-    return __builtin_bswap32(be);

+    #if defined(_MSC_VER)

+     return _byteswap_ulong(be);

+    #else

+     return __builtin_bswap32(be);

+    #endif

 #endif

 }