ae11a9
diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
ae11a9
--- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian	2018-04-09 22:50:48.000000000 +0200
ae11a9
+++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h	2018-04-18 11:51:38.748680174 +0200
ae11a9
@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
ae11a9
  *
ae11a9
  *  Here we enforce this constraint.
ae11a9
  */
ae11a9
-
ae11a9
+/*
ae11a9
 #ifdef SK_CPU_BENDIAN
ae11a9
     #define SK_RGBA_R32_SHIFT   24
ae11a9
     #define SK_RGBA_G32_SHIFT   16
ae11a9
     #define SK_RGBA_B32_SHIFT   8
ae11a9
     #define SK_RGBA_A32_SHIFT   0
ae11a9
 #else
ae11a9
+*/
ae11a9
     #define SK_RGBA_R32_SHIFT   0
ae11a9
     #define SK_RGBA_G32_SHIFT   8
ae11a9
     #define SK_RGBA_B32_SHIFT   16
ae11a9
     #define SK_RGBA_A32_SHIFT   24
ae11a9
-#endif
ae11a9
+/*#endif*/
ae11a9
 
ae11a9
 #define SkGetPackedA32(packed)      ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
ae11a9
 #define SkGetPackedR32(packed)      ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
ae11a9
diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
ae11a9
--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2018-04-09 22:50:48.000000000 +0200
ae11a9
+++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h	2018-04-18 11:51:38.748680174 +0200
ae11a9
@@ -84,7 +84,8 @@ enum SkColorType {
ae11a9
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
ae11a9
     kN32_SkColorType = kRGBA_8888_SkColorType,
ae11a9
 #else
ae11a9
-    #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
ae11a9
+    //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
ae11a9
+    kN32_SkColorType = kBGRA_8888_SkColorType
ae11a9
 #endif
ae11a9
 };
ae11a9
 
ae11a9
diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
ae11a9
--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2018-04-09 22:50:48.000000000 +0200
ae11a9
+++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h	2018-04-18 11:51:38.748680174 +0200
ae11a9
@@ -344,15 +344,13 @@ enum GrPixelConfig {
ae11a9
 static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
ae11a9
 
ae11a9
 // Aliases for pixel configs that match skia's byte order.
ae11a9
-#ifndef SK_CPU_LENDIAN
ae11a9
-    #error "Skia gpu currently assumes little endian"
ae11a9
-#endif
ae11a9
 #if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
ae11a9
     static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
ae11a9
 #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
ae11a9
     static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
ae11a9
 #else
ae11a9
-    #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
ae11a9
+    static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
ae11a9
+    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
ae11a9
 #endif
ae11a9
 
ae11a9
 /**
ae11a9
diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
ae11a9
--- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian	2018-04-18 13:42:06.980476156 +0200
ae11a9
+++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h	2018-04-18 13:42:50.493520552 +0200
ae11a9
@@ -31,18 +31,19 @@
ae11a9
  *
ae11a9
  *  Here we enforce this constraint.
ae11a9
  */
ae11a9
-
ae11a9
+/*
ae11a9
 #ifdef SK_CPU_BENDIAN
ae11a9
     #define SK_BGRA_B32_SHIFT   24
ae11a9
     #define SK_BGRA_G32_SHIFT   16
ae11a9
     #define SK_BGRA_R32_SHIFT   8
ae11a9
     #define SK_BGRA_A32_SHIFT   0
ae11a9
 #else
ae11a9
+*/
ae11a9
     #define SK_BGRA_B32_SHIFT   0
ae11a9
     #define SK_BGRA_G32_SHIFT   8
ae11a9
     #define SK_BGRA_R32_SHIFT   16
ae11a9
     #define SK_BGRA_A32_SHIFT   24
ae11a9
-#endif
ae11a9
+//#endif
ae11a9
 
ae11a9
 #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
ae11a9
     #error "can't define PMCOLOR to be RGBA and BGRA"