wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 665597. Add nsRect::SaturatingUnion(Rect)(Edges). r=mats

Browse Source
This commit is contained in:
Robert O'Callahan 2012-01-03 11:55:30 +13:00
parent 3d60bed0fc
commit 4635d15f3d
1 changed files with 48 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
gfx/src/nsRect.h
View File

@ -81,6 +81,54 @@ struct NS_GFX nsRect :
}
#endif
// We have saturating versions of all the Union methods. These avoid
// overflowing nscoord values in the 'width' and 'height' fields by
// clamping the width and height values to nscoord_MAX if necessary.
nsRect SaturatingUnion(const nsRect& aRect) const
{
if (IsEmpty()) {
return aRect;
} else if (aRect.IsEmpty()) {
return *static_cast<const nsRect*>(this);
} else {
return SaturatingUnionEdges(aRect);
}
}
nsRect SaturatingUnionEdges(const nsRect& aRect) const
{
#ifdef NS_COORD_IS_FLOAT
return UnionEdges(aRect);
#else
nsRect result;
result.x = NS_MIN(aRect.x, x);
result.y = NS_MIN(aRect.y, y);
PRInt64 w = NS_MAX(PRInt64(aRect.x) + aRect.width, PRInt64(x) + width) - result.x;
PRInt64 h = NS_MAX(PRInt64(aRect.y) + aRect.height, PRInt64(y) + height) - result.y;
if (w > nscoord_MAX) {
NS_WARNING("Overflowed nscoord_MAX in conversion to nscoord width");
w = nscoord_MAX;
}
if (h > nscoord_MAX) {
NS_WARNING("Overflowed nscoord_MAX in conversion to nscoord height");
h = nscoord_MAX;
}
result.width = nscoord(w);
result.height = nscoord(h);
return result;
#endif
}
void SaturatingUnionRect(const nsRect& aRect1, const nsRect& aRect2)
{
*this = aRect1.SaturatingUnion(aRect2);
}
void SaturatingUnionRectEdges(const nsRect& aRect1, const nsRect& aRect2)
{
*this = aRect1.SaturatingUnionEdges(aRect2);
}
// Converts this rect from aFromAPP, an appunits per pixel ratio, to aToAPP.
// In the RoundOut version we make the rect the smallest rect containing the
// unrounded result. In the RoundIn version we make the rect the largest rect