forked from pool/MozillaFirefox
82 lines
2.5 KiB
Diff
82 lines
2.5 KiB
Diff
|
# HG changeset patch
|
||
|
|
# Parent 051b75a600dfbf7503c3485cebfd34d4eb29be96
|
||
|
|
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
|
||
|
|
|
||
|
|
diff -r 051b75a600df gfx/2d/DrawTargetSkia.cpp
|
||
|
|
--- a/gfx/2d/DrawTargetSkia.cpp Fri Jul 05 12:42:44 2019 +0200
|
||
|
|
+++ b/gfx/2d/DrawTargetSkia.cpp Mon Jul 08 10:59:30 2019 +0200
|
||
|
|
@@ -138,8 +138,7 @@
|
||
|
|
return surfaceBounds.Intersect(bounds);
|
||
|
|
}
|
||
|
|
|
||
|
|
-static const int kARGBAlphaOffset =
|
||
|
|
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
||
|
|
+static const int kARGBAlphaOffset = 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 -r 051b75a600df gfx/2d/Types.h
|
||
|
|
--- a/gfx/2d/Types.h Fri Jul 05 12:42:44 2019 +0200
|
||
|
|
+++ b/gfx/2d/Types.h Mon Jul 08 10:59:30 2019 +0200
|
||
|
|
@@ -85,15 +85,8 @@
|
||
|
|
// 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
|
||
|
|
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
|
||
|
|
};
|
||
|
|
|
||
|
|
static inline int BytesPerPixel(SurfaceFormat aFormat) {
|
||
|
|
diff -r 051b75a600df gfx/skia/skia/third_party/skcms/skcms.cc
|
||
|
|
--- a/gfx/skia/skia/third_party/skcms/skcms.cc Fri Jul 05 12:42:44 2019 +0200
|
||
|
|
+++ b/gfx/skia/skia/third_party/skcms/skcms.cc Mon Jul 08 10:59:30 2019 +0200
|
||
|
|
@@ -17,6 +17,8 @@
|
||
|
|
#include <arm_neon.h>
|
||
|
|
#elif defined(__SSE__)
|
||
|
|
#include <immintrin.h>
|
||
|
|
+#else
|
||
|
|
+ #define SKCMS_PORTABLE
|
||
|
|
#endif
|
||
|
|
|
||
|
|
// sizeof(x) will return size_t, which is 32-bit on some machines and 64-bit on others.
|
||
|
|
@@ -124,20 +126,28 @@
|
||
|
|
static uint16_t read_big_u16(const uint8_t* ptr) {
|
||
|
|
uint16_t be;
|
||
|
|
memcpy(&be, ptr, sizeof(be));
|
||
|
|
-#if defined(_MSC_VER)
|
||
|
|
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
||
|
|
+ return be;
|
||
|
|
+#else
|
||
|
|
+ #if defined(_MSC_VER)
|
||
|
|
return _byteswap_ushort(be);
|
||
|
|
-#else
|
||
|
|
+ #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)
|
||
|
|
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
||
|
|
+ return be;
|
||
|
|
+#else
|
||
|
|
+ #if defined(_MSC_VER)
|
||
|
|
return _byteswap_ulong(be);
|
||
|
|
-#else
|
||
|
|
+ #else
|
||
|
|
return __builtin_bswap32(be);
|
||
|
|
+ #endif
|
||
|
|
#endif
|
||
|
|
}
|
||
|
|
|