Browse Source

update XULRunner-sdk patch as of NM27 git rev a988f766

master
roytam1 5 months ago
parent
commit
127240e93c
  1. 32
      kmxulr-sdk-goanna-220204.diff

32
kmxulr-sdk-goanna-210305.diff → kmxulr-sdk-goanna-220204.diff

@ -1,6 +1,6 @@
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/FrameMetrics.h xulrunner-sdk/include/FrameMetrics.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/FrameMetrics.h 2021-02-12 13:42:51.037206000 +0800
+++ xulrunner-sdk/include/FrameMetrics.h 2021-03-05 09:44:08.689223300 +0800
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/FrameMetrics.h 2022-02-04 12:08:33.387968000 +0800
+++ xulrunner-sdk/include/FrameMetrics.h 2022-02-04 12:45:56.206250500 +0800
@@ -12,11 +12,12 @@
#include "mozilla/gfx/BasePoint.h" // for BasePoint
#include "mozilla/gfx/Rect.h" // for RoundedIn
@ -16,9 +16,9 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/FrameMetrics
} // namespace IPC
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/js/Debug.h xulrunner-sdk/include/js/Debug.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/js/Debug.h 2021-02-17 20:36:40.099713000 +0800
+++ xulrunner-sdk/include/js/Debug.h 2021-03-05 09:44:08.690223400 +0800
@@ -131,11 +131,11 @@
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/js/Debug.h 2021-06-04 09:45:45.687807000 +0800
+++ xulrunner-sdk/include/js/Debug.h 2022-02-04 12:45:56.206250500 +0800
@@ -132,11 +132,11 @@
js::Debugger* debugger;
// Check that |thing| is in the same compartment as our debuggerObject. Used
@ -32,8 +32,8 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/js/Debug.h x
#endif
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/mozilla/a11y/Accessible.h xulrunner-sdk/include/mozilla/a11y/Accessible.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/mozilla/a11y/Accessible.h 2020-12-21 14:19:39.873614000 +0800
+++ xulrunner-sdk/include/mozilla/a11y/Accessible.h 2021-03-05 09:44:08.690223400 +0800
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/mozilla/a11y/Accessible.h 2022-01-21 21:30:16.715533000 +0800
+++ xulrunner-sdk/include/mozilla/a11y/Accessible.h 2022-02-04 12:45:56.207250600 +0800
@@ -10,11 +10,12 @@
#include "mozilla/a11y/RelationType.h"
#include "mozilla/a11y/Role.h"
@ -50,7 +50,7 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/mozilla/a11y
struct nsRoleMapEntry;
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsCoord.h xulrunner-sdk/include/nsCoord.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsCoord.h 2020-12-21 14:19:45.637943000 +0800
+++ xulrunner-sdk/include/nsCoord.h 2021-03-05 09:44:08.691223400 +0800
+++ xulrunner-sdk/include/nsCoord.h 2022-02-04 12:45:56.207250600 +0800
@@ -161,11 +161,11 @@
// infinity + anything = anything + infinity = infinity
return nscoord_MAX;
@ -79,7 +79,7 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsCoord.h xu
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsISupportsImpl.h xulrunner-sdk/include/nsISupportsImpl.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsISupportsImpl.h 2021-01-15 00:10:39.188254000 +0800
+++ xulrunner-sdk/include/nsISupportsImpl.h 2021-03-05 09:44:08.691223400 +0800
+++ xulrunner-sdk/include/nsISupportsImpl.h 2022-02-04 12:45:56.207250600 +0800
@@ -18,11 +18,11 @@
#include "prthread.h" /* needed for thread-safety checks */
#endif // !XPCOM_GLUE_AVOID_NSPR
@ -107,9 +107,9 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsISupportsI
public:
ThreadSafeAutoRefCnt() : mValue(0) {}
diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xulrunner-sdk/include/nsRect.h
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h 2021-03-05 09:14:08.290246000 +0800
+++ xulrunner-sdk/include/nsRect.h 2021-03-05 09:56:48.547684700 +0800
@@ -75,30 +75,30 @@
--- ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h 2022-02-04 12:08:33.405969000 +0800
+++ xulrunner-sdk/include/nsRect.h 2022-02-04 12:48:13.115081300 +0800
@@ -73,28 +73,28 @@
{
#ifdef NS_COORD_IS_FLOAT
return UnionEdges(aRect);
@ -120,7 +120,6 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xul
+ result.x = (std::min)(aRect.x, x);
+ int64_t w = (std::max)(int64_t(aRect.x) + aRect.width, int64_t(x) + width) - result.x;
if (MOZ_UNLIKELY(w > nscoord_MAX)) {
NS_WARNING("Overflowed nscoord_MAX in conversion to nscoord width");
// Clamp huge negative x to nscoord_MIN / 2 and try again.
- result.x = std::max(result.x, nscoord_MIN / 2);
- w = std::max(int64_t(aRect.x) + aRect.width, int64_t(x) + width) - result.x;
@ -137,7 +136,6 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xul
+ result.y = (std::min)(aRect.y, y);
+ int64_t h = (std::max)(int64_t(aRect.y) + aRect.height, int64_t(y) + height) - result.y;
if (MOZ_UNLIKELY(h > nscoord_MAX)) {
NS_WARNING("Overflowed nscoord_MAX in conversion to nscoord height");
// Clamp huge negative y to nscoord_MIN / 2 and try again.
- result.y = std::max(result.y, nscoord_MIN / 2);
- h = std::max(int64_t(aRect.y) + aRect.height, int64_t(y) + height) - result.y;
@ -148,7 +146,7 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xul
}
}
result.height = nscoord(h);
@@ -226,13 +226,13 @@
@@ -222,13 +222,13 @@
{
mozilla::gfx::IntRect rect;
rect.x = NSToIntRoundUp(NSAppUnitsToDoublePixels(x, aAppUnitsPerPixel) * aXScale);
@ -164,7 +162,7 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xul
}
// scale the rect but round to smallest containing rect
@@ -242,13 +242,13 @@
@@ -238,13 +238,13 @@
{
mozilla::gfx::IntRect rect;
rect.x = NSToIntFloor(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)) * aXScale);
@ -180,7 +178,7 @@ diff -rU5 ../KMXULRunner/obj-xulrunner-i686-pc-mingw32/dist/include/nsRect.h xul
}
// scale the rect but round to largest contained rect
@@ -258,13 +258,13 @@
@@ -254,13 +254,13 @@
{
mozilla::gfx::IntRect rect;
rect.x = NSToIntCeil(NSAppUnitsToFloatPixels(x, float(aAppUnitsPerPixel)) * aXScale);
Loading…
Cancel
Save