Merge branch 'master' into f27

1 files changed, 45 insertions, 42 deletions

diff --git a/build-big-endian.patch b/build-big-endian.patch
index 932da57..e8ec439 100644
--- a/build-big-endian.patch
+++ b/build-big-endian.patch
@@ -1,7 +1,7 @@
-diff -up firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h
---- firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h	2017-09-29 17:25:04.651876330 +0200
-@@ -31,7 +31,7 @@
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian	2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkColorPriv.h	2018-04-18 11:51:38.748680174 +0200
+@@ -54,18 +54,19 @@ static inline U8CPU SkUnitScalarClampToB
   *
   *  Here we enforce this constraint.
   */
@@ -10,58 +10,36 @@ diff -up firefox-56.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefo
  #ifdef SK_CPU_BENDIAN
      #define SK_RGBA_R32_SHIFT   24
      #define SK_RGBA_G32_SHIFT   16
-@@ -43,6 +43,7 @@
-     #define SK_BGRA_R32_SHIFT   8
-     #define SK_BGRA_A32_SHIFT   0
+     #define SK_RGBA_B32_SHIFT   8
+     #define SK_RGBA_A32_SHIFT   0
  #else
 +*/
      #define SK_RGBA_R32_SHIFT   0
      #define SK_RGBA_G32_SHIFT   8
      #define SK_RGBA_B32_SHIFT   16
-@@ -52,7 +53,7 @@
-     #define SK_BGRA_G32_SHIFT   8
-     #define SK_BGRA_R32_SHIFT   16
-     #define SK_BGRA_A32_SHIFT   24
+     #define SK_RGBA_A32_SHIFT   24
 -#endif
 +/*#endif*/
  
- #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
-     #error "can't define PMCOLOR to be RGBA and BGRA"
-diff -up firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h
---- firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/core/SkImageInfo.h	2017-09-29 17:25:04.651876330 +0200
-@@ -83,7 +83,8 @@ enum SkColorType {
+ #define SkGetPackedA32(packed)      ((uint32_t)((packed) << (24 - SK_A32_SHIFT)) >> 24)
+ #define SkGetPackedR32(packed)      ((uint32_t)((packed) << (24 - SK_R32_SHIFT)) >> 24)
+diff -up firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h
+--- firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian	2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/core/SkImageInfo.h	2018-04-18 11:51:38.748680174 +0200
+@@ -84,7 +84,8 @@ enum SkColorType {
  #elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
      kN32_SkColorType = kRGBA_8888_SkColorType,
  #else
--    #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
-+    //#error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
+-    #error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
++    //#error "SK_*32_SHIFT values must correspond to BGRA or RGBA byte order"
 +    kN32_SkColorType = kBGRA_8888_SkColorType
  #endif
  };
  
-diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h
---- firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/gpu/GrColor.h	2017-09-29 17:25:04.652876327 +0200
-@@ -74,8 +74,13 @@ static inline GrColor GrColorPackA4(unsi
-  *  Since premultiplied means that alpha >= color, we construct a color with
-  *  each component==255 and alpha == 0 to be "illegal"
-  */
--#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A))
-+//Just for big endian platforms, little has: (~(0xFF << GrColor_SHIFT_A))
-+#ifdef SK_CPU_BENDIAN
-+#define GrColor_ILLEGAL     0xFFFFFF00
-+#else
-+#define GrColor_ILLEGAL     (~(0xFF << GrColor_SHIFT_A)) 
- 
-+#endif
- #define GrColor_WHITE 0xFFFFFFFF
- #define GrColor_TRANSPARENT_BLACK 0x0
- 
-diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h
---- firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2017-07-31 18:20:55.000000000 +0200
-+++ firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h	2017-09-29 17:25:04.652876327 +0200
-@@ -326,15 +326,13 @@ enum GrPixelConfig {
+diff -up firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h
+--- firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian	2018-04-09 22:50:48.000000000 +0200
++++ firefox-60.0/gfx/skia/skia/include/gpu/GrTypes.h	2018-04-18 11:51:38.748680174 +0200
+@@ -344,15 +344,13 @@ enum GrPixelConfig {
  static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
  
  // Aliases for pixel configs that match skia's byte order.
@@ -78,4 +56,29 @@ diff -up firefox-56.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-56.
 +    static const GrPixelConfig kSkiaGamma8888_GrPixelConfig = kSBGRA_8888_GrPixelConfig;
  #endif
  
- // Returns true if the pixel config is a GPU-specific compressed format
+ /**
+diff -up firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian firefox-60.0/gfx/skia/skia/src/core/SkColorData.h
+--- firefox-60.0/gfx/skia/skia/src/core/SkColorData.h.big-endian	2018-04-18 13:42:06.980476156 +0200
++++ firefox-60.0/gfx/skia/skia/src/core/SkColorData.h	2018-04-18 13:42:50.493520552 +0200
+@@ -31,18 +31,19 @@
+  *
+  *  Here we enforce this constraint.
+  */
+-
++/*
+ #ifdef SK_CPU_BENDIAN
+     #define SK_BGRA_B32_SHIFT   24
+     #define SK_BGRA_G32_SHIFT   16
+     #define SK_BGRA_R32_SHIFT   8
+     #define SK_BGRA_A32_SHIFT   0
+ #else
++*/
+     #define SK_BGRA_B32_SHIFT   0
+     #define SK_BGRA_G32_SHIFT   8
+     #define SK_BGRA_R32_SHIFT   16
+     #define SK_BGRA_A32_SHIFT   24
+-#endif
++//#endif
+ 
+ #if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
+     #error "can't define PMCOLOR to be RGBA and BGRA"