Merge branch 'master' into f26
This commit is contained in:
commit
313ce1a7bd
@ -1,6 +1,6 @@
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h 2017-08-02 10:09:36.350124031 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h 2017-08-03 12:06:32.653090806 +0200
|
||||
@@ -31,7 +31,7 @@
|
||||
*
|
||||
* Here we enforce this constraint.
|
||||
@ -29,7 +29,7 @@ diff -up firefox-55.0/gfx/skia/skia/include/core/SkColorPriv.h.big-endian firefo
|
||||
#error "can't define PMCOLOR to be RGBA and BGRA"
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h 2017-08-02 10:09:36.350124031 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h 2017-08-03 12:06:32.653090806 +0200
|
||||
@@ -83,7 +83,8 @@ enum SkColorType {
|
||||
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
||||
kN32_SkColorType = kRGBA_8888_SkColorType,
|
||||
@ -42,7 +42,7 @@ diff -up firefox-55.0/gfx/skia/skia/include/core/SkImageInfo.h.big-endian firefo
|
||||
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h 2017-08-02 10:09:36.350124031 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h 2017-08-03 12:06:32.653090806 +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"
|
||||
@ -59,8 +59,8 @@ diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrColor.h.big-endian firefox-55.
|
||||
#define GrColor_TRANSPARENT_BLACK 0x0
|
||||
|
||||
diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
--- firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2017-08-02 10:09:36.351124028 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h 2017-08-02 10:13:40.512303982 +0200
|
||||
--- firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian 2017-07-31 18:20:55.000000000 +0200
|
||||
+++ firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h 2017-08-03 12:06:32.653090806 +0200
|
||||
@@ -326,15 +326,13 @@ enum GrPixelConfig {
|
||||
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
|
||||
|
||||
@ -80,8 +80,17 @@ diff -up firefox-55.0/gfx/skia/skia/include/gpu/GrTypes.h.big-endian firefox-55.
|
||||
|
||||
// Returns true if the pixel config is a GPU-specific compressed format
|
||||
diff -up firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian firefox-55.0/js/src/jit/none/MacroAssembler-none.h
|
||||
--- firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian 2017-08-02 10:09:36.351124028 +0200
|
||||
+++ firefox-55.0/js/src/jit/none/MacroAssembler-none.h 2017-08-02 10:14:38.295109906 +0200
|
||||
--- firefox-55.0/js/src/jit/none/MacroAssembler-none.h.big-endian 2017-07-31 18:20:48.000000000 +0200
|
||||
+++ firefox-55.0/js/src/jit/none/MacroAssembler-none.h 2017-08-04 11:31:18.074582783 +0200
|
||||
@@ -48,7 +48,7 @@ static constexpr Register WasmIonExitReg
|
||||
|
||||
static constexpr Register WasmIonExitRegReturnData { Registers::invalid_reg };
|
||||
static constexpr Register WasmIonExitRegReturnType { Registers::invalid_reg };
|
||||
-static constexpr Register WasmIonExitTlsReg = { Registers::invalid_reg };
|
||||
+static constexpr Register WasmIonExitTlsReg { Registers::invalid_reg };
|
||||
static constexpr Register WasmIonExitRegD0 { Registers::invalid_reg };
|
||||
static constexpr Register WasmIonExitRegD1 { Registers::invalid_reg };
|
||||
static constexpr Register WasmIonExitRegD2 { Registers::invalid_reg };
|
||||
@@ -197,8 +197,8 @@ class MacroAssemblerNone : public Assemb
|
||||
static bool SupportsUnalignedAccesses() { return false; }
|
||||
|
||||
|
@ -1,3 +1,4 @@
|
||||
#Disabled due to https://bugzilla.mozilla.org/show_bug.cgi?id=1387010
|
||||
ExcludeArch: aarch64 armv7hl
|
||||
|
||||
# Use ALSA backend?
|
||||
|
Loading…
Reference in New Issue
Block a user