1a3471
diff -up firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/DrawTargetSkia.cpp
1a3471
--- firefox-78.0/gfx/2d/DrawTargetSkia.cpp.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
1a3471
+++ firefox-78.0/gfx/2d/DrawTargetSkia.cpp	2020-06-25 16:52:29.824532769 +0200
1a3471
@@ -135,8 +135,7 @@ static IntRect CalculateSurfaceBounds(co
1a3471
   return surfaceBounds.Intersect(bounds);
1a3471
 }
1a3471
 
1a3471
-static const int kARGBAlphaOffset =
1a3471
-    SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
1a3471
+static const int kARGBAlphaOffset = 0;  // Skia is always BGRA SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
1a3471
 
1a3471
 static bool VerifyRGBXFormat(uint8_t* aData, const IntSize& aSize,
1a3471
                              const int32_t aStride, SurfaceFormat aFormat) {
1a3471
diff -up firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1 firefox-78.0/gfx/2d/Types.h
1a3471
--- firefox-78.0/gfx/2d/Types.h.mozilla-bmo1504834-part1	2020-06-25 16:52:29.826532776 +0200
1a3471
+++ firefox-78.0/gfx/2d/Types.h	2020-06-25 16:55:02.942063616 +0200
1a3471
@@ -90,15 +90,8 @@ enum class SurfaceFormat : int8_t {
1a3471
 // The following values are endian-independent synonyms. The _UINT32 suffix
1a3471
 // indicates that the name reflects the layout when viewed as a uint32_t
1a3471
 // value.
1a3471
-#if MOZ_LITTLE_ENDIAN()
1a3471
   A8R8G8B8_UINT32 = B8G8R8A8,  // 0xAARRGGBB
1a3471
   X8R8G8B8_UINT32 = B8G8R8X8,  // 0x00RRGGBB
1a3471
-#elif MOZ_BIG_ENDIAN()
1a3471
-  A8R8G8B8_UINT32 = A8R8G8B8,  // 0xAARRGGBB
1a3471
-  X8R8G8B8_UINT32 = X8R8G8B8,  // 0x00RRGGBB
1a3471
-#else
1a3471
-#  error "bad endianness"
1a3471
-#endif
1a3471
 
1a3471
   // The following values are OS and endian-independent synonyms.
1a3471
   //
1a3471
diff -up firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1 firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc
1a3471
--- firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc.mozilla-bmo1504834-part1	2020-06-17 04:18:58.000000000 +0200
1a3471
+++ firefox-78.0/gfx/skia/skia/third_party/skcms/skcms.cc	2020-06-25 16:54:02.993855444 +0200
1a3471
@@ -30,6 +30,8 @@
1a3471
         #include <avx512fintrin.h>
1a3471
         #include <avx512dqintrin.h>
1a3471
     #endif
1a3471
+#else
1a3471
+    #define SKCMS_PORTABLE
1a3471
 #endif
1a3471
 
1a3471
 // sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
1a3471
@@ -280,20 +282,28 @@ enum {
1a3471
 static uint16_t read_big_u16(const uint8_t* ptr) {
1a3471
     uint16_t be;
1a3471
     memcpy(&be, ptr, sizeof(be));
1a3471
-#if defined(_MSC_VER)
1a3471
-    return _byteswap_ushort(be);
1a3471
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
1a3471
+    return be;
1a3471
 #else
1a3471
+    #if defined(_MSC_VER)
1a3471
+    return _byteswap_ushort(be);
1a3471
+    #else
1a3471
     return __builtin_bswap16(be);
1a3471
+    #endif
1a3471
 #endif
1a3471
 }
1a3471
 
1a3471
 static uint32_t read_big_u32(const uint8_t* ptr) {
1a3471
     uint32_t be;
1a3471
     memcpy(&be, ptr, sizeof(be));
1a3471
-#if defined(_MSC_VER)
1a3471
-    return _byteswap_ulong(be);
1a3471
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
1a3471
+    return be;
1a3471
 #else
1a3471
+    #if defined(_MSC_VER)
1a3471
+    return _byteswap_ulong(be);
1a3471
+    #else
1a3471
     return __builtin_bswap32(be);
1a3471
+    #endif
1a3471
 #endif
1a3471
 }
1a3471