Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-28 23:31:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backout bug 1226627 part 2 (rev 673461c0b772) for Talos regressions on Android. r=me

Browse Source
This commit is contained in:
Mats Palmgren 2015-11-30 13:06:39 +01:00
parent 6d9dbf2bc2
commit 36d36840bb
1 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
gfx/src/nsCoord.h
View File

@ -110,8 +110,6 @@ inline nscoord NSToCoordRoundWithClamp(float aValue)
if (aValue <= nscoord_MIN) { if (aValue <= nscoord_MIN) {
return nscoord_MIN; return nscoord_MIN;
} }
// NOTE: we can't replace the early returns above with fminf/fmaxf because
// NSToCoordRound(float(nscoord_MAX)) is negative on win32 (bug 1226627).
#endif #endif
return NSToCoordRound(aValue); return NSToCoordRound(aValue);
} }
@ -261,8 +259,12 @@ inline nscoord NSToCoordFloorClamped(float aValue)
{ {
#ifndef NS_COORD_IS_FLOAT #ifndef NS_COORD_IS_FLOAT
// Bounds-check before converting out of float, to avoid overflow // Bounds-check before converting out of float, to avoid overflow
aValue = fminf(aValue, nscoord_MAX); if (aValue >= nscoord_MAX) {
aValue = fmaxf(aValue, nscoord_MIN); return nscoord_MAX;
}
if (aValue <= nscoord_MIN) {
return nscoord_MIN;
}
#endif #endif
return NSToCoordFloor(aValue); return NSToCoordFloor(aValue);
} }
@ -281,8 +283,12 @@ inline nscoord NSToCoordCeilClamped(double aValue)
{ {
#ifndef NS_COORD_IS_FLOAT #ifndef NS_COORD_IS_FLOAT
// Bounds-check before converting out of double, to avoid overflow // Bounds-check before converting out of double, to avoid overflow
aValue = fmin(aValue, nscoord_MAX); if (aValue >= nscoord_MAX) {
aValue = fmax(aValue, nscoord_MIN); return nscoord_MAX;
}
if (aValue <= nscoord_MIN) {
return nscoord_MIN;
}
#endif #endif
return NSToCoordCeil(aValue); return NSToCoordCeil(aValue);
} }
@ -309,8 +315,12 @@ inline nscoord NSToCoordTruncClamped(float aValue)
{ {
#ifndef NS_COORD_IS_FLOAT #ifndef NS_COORD_IS_FLOAT
// Bounds-check before converting out of float, to avoid overflow // Bounds-check before converting out of float, to avoid overflow
aValue = fminf(aValue, nscoord_MAX); if (aValue >= nscoord_MAX) {
aValue = fmaxf(aValue, nscoord_MIN); return nscoord_MAX;
}
if (aValue <= nscoord_MIN) {
return nscoord_MIN;
}
#endif #endif
return NSToCoordTrunc(aValue); return NSToCoordTrunc(aValue);
} }
@ -319,8 +329,12 @@ inline nscoord NSToCoordTruncClamped(double aValue)
{ {
#ifndef NS_COORD_IS_FLOAT #ifndef NS_COORD_IS_FLOAT
// Bounds-check before converting out of double, to avoid overflow // Bounds-check before converting out of double, to avoid overflow
aValue = fmin(aValue, nscoord_MAX); if (aValue >= nscoord_MAX) {
aValue = fmax(aValue, nscoord_MIN); return nscoord_MAX;
}
if (aValue <= nscoord_MIN) {
return nscoord_MIN;
}
#endif #endif
return NSToCoordTrunc(aValue); return NSToCoordTrunc(aValue);
} }