forked from pool/MozillaFirefox
* CVE-2018-12371 (bmo#1465686) * modifies the crash protection feature to increase the amount of time that plugins are allowed to be non-responsive before * firefox-bug506901.patch - improve UI colors to be usable with dark themes at all - added KDE integration patch from llunak@novell.com (firefox-kde.patch) * support for knotify, making -kde4-addon obsolete especially KDE integration: * added the ability to set the KDE default browser * MFSA 2009-05/CVE-2009-0357: XMLHttpRequest allows reading * MFSA 2009-04/CVE-2009-0356: Chrome privilege escalation via * MFSA 2009-02/CVE-2009-0354: XSS using a chrome XBL method * MFSA 2009-01/CVE-2009-0352 - CVE-2009-0353: Crashes with evidence of memory corruption (rv:1.9.0.6) (bmo#452913, * Make sure the search bar is not put back when resetting the - Update to stability/security release 3.0.1 (bnc#407573) + MFSA 2008-35 Command-line URLs launch multiple tabs when - Set browser.shell.checkDefaultBrowser to true (bnc#404119) - fix hardlinks accross partitions - move last change a bit further in specfile - Mark a .png file as nonexecutable. * MFSA 2007-26 Privilege escalation through chrome-loaded - Fixes bnc #295677 - added unzip to BuildRequires - updated tango theme Resuming your browsing session, Previewing and subscribing Improved Add-ons manager, JavaScript 1.7, Extended search OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=1190
130 lines
4.0 KiB
Diff
130 lines
4.0 KiB
Diff
# HG changeset patch
|
|
# Parent e31f5228a09ed69d7ac3c84e54f0faa6a5910ae0
|
|
Taken from https://bugzilla.mozilla.org/show_bug.cgi?id=1504834
|
|
|
|
diff --git a/gfx/2d/DrawTargetSkia.cpp b/gfx/2d/DrawTargetSkia.cpp
|
|
--- a/gfx/2d/DrawTargetSkia.cpp
|
|
+++ b/gfx/2d/DrawTargetSkia.cpp
|
|
@@ -155,17 +155,18 @@ static IntRect CalculateSurfaceBounds(co
|
|
if (!sampledBounds.ToIntRect(&bounds)) {
|
|
return surfaceBounds;
|
|
}
|
|
|
|
return surfaceBounds.Intersect(bounds);
|
|
}
|
|
|
|
static const int kARGBAlphaOffset =
|
|
- SurfaceFormat::A8R8G8B8_UINT32 == SurfaceFormat::B8G8R8A8 ? 3 : 0;
|
|
+ 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) {
|
|
if (aFormat != SurfaceFormat::B8G8R8X8 || aSize.IsEmpty()) {
|
|
return true;
|
|
}
|
|
// We should've initialized the data to be opaque already
|
|
// On debug builds, verify that this is actually true.
|
|
diff --git a/gfx/2d/Types.h b/gfx/2d/Types.h
|
|
--- a/gfx/2d/Types.h
|
|
+++ b/gfx/2d/Types.h
|
|
@@ -94,28 +94,21 @@ enum class SurfaceFormat : int8_t {
|
|
// this format.
|
|
HSV,
|
|
Lab,
|
|
Depth,
|
|
|
|
// This represents the unknown format.
|
|
UNKNOWN, // TODO: Replace uses with Maybe<SurfaceFormat>.
|
|
|
|
-// 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()
|
|
+ // The following values are endian-independent synonyms. The _UINT32 suffix
|
|
+ // indicates that the name reflects the layout when viewed as a uint32_t
|
|
+ // value.
|
|
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
|
|
|
|
// The following values are OS and endian-independent synonyms.
|
|
//
|
|
// TODO(aosmond): When everything blocking bug 1581828 has been resolved, we
|
|
// can make this use R8B8G8A8 and R8B8G8X8 for non-Windows platforms.
|
|
OS_RGBA = A8R8G8B8_UINT32,
|
|
OS_RGBX = X8R8G8B8_UINT32
|
|
};
|
|
diff --git a/gfx/skia/skia/modules/skcms/skcms.cc b/gfx/skia/skia/modules/skcms/skcms.cc
|
|
--- a/gfx/skia/skia/modules/skcms/skcms.cc
|
|
+++ b/gfx/skia/skia/modules/skcms/skcms.cc
|
|
@@ -26,16 +26,18 @@
|
|
// it'd be a lot slower. But we want all those headers included so we
|
|
// can use their features after runtime checks later.
|
|
#include <smmintrin.h>
|
|
#include <avxintrin.h>
|
|
#include <avx2intrin.h>
|
|
#include <avx512fintrin.h>
|
|
#include <avx512dqintrin.h>
|
|
#endif
|
|
+#else
|
|
+ #define SKCMS_PORTABLE
|
|
#endif
|
|
|
|
using namespace skcms_private;
|
|
|
|
static bool sAllowRuntimeCPUDetection = true;
|
|
|
|
void skcms_DisableRuntimeCPUDetection() {
|
|
sAllowRuntimeCPUDetection = false;
|
|
@@ -319,30 +321,38 @@ enum {
|
|
skcms_Signature_sf32 = 0x73663332,
|
|
// XYZ is also a PCS signature, so it's defined in skcms.h
|
|
// skcms_Signature_XYZ = 0x58595A20,
|
|
};
|
|
|
|
static uint16_t read_big_u16(const uint8_t* ptr) {
|
|
uint16_t be;
|
|
memcpy(&be, ptr, sizeof(be));
|
|
-#if defined(_MSC_VER)
|
|
- return _byteswap_ushort(be);
|
|
+#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
|
|
+ return be;
|
|
#else
|
|
- return __builtin_bswap16(be);
|
|
+ #if defined(_MSC_VER)
|
|
+ return _byteswap_ushort(be);
|
|
+ #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)
|
|
- return _byteswap_ulong(be);
|
|
+#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__
|
|
+ return be;
|
|
#else
|
|
- return __builtin_bswap32(be);
|
|
+ #if defined(_MSC_VER)
|
|
+ return _byteswap_ulong(be);
|
|
+ #else
|
|
+ return __builtin_bswap32(be);
|
|
+ #endif
|
|
#endif
|
|
}
|
|
|
|
static int32_t read_big_i32(const uint8_t* ptr) {
|
|
return (int32_t)read_big_u32(ptr);
|
|
}
|
|
|
|
static float read_big_fixed(const uint8_t* ptr) {
|