Backout 97061a550935 (bug 817774) for build bustage on a CLOSED TREE

This commit is contained in:
Ed Morley 2012-12-17 22:22:08 +00:00
parent 293cb9b14a
commit dc578abc7a
2 changed files with 7 additions and 4 deletions

View File

@ -12,6 +12,9 @@
// the mozilla::css::Side sequence must match the nsMargin nscoord sequence
PR_STATIC_ASSERT((NS_SIDE_TOP == 0) && (NS_SIDE_RIGHT == 1) && (NS_SIDE_BOTTOM == 2) && (NS_SIDE_LEFT == 3));
/* static */
const nsIntRect nsIntRect::kMaxSizedIntRect(0, 0, INT_MAX, INT_MAX);
#ifdef DEBUG
// Diagnostics

View File

@ -231,16 +231,16 @@ struct NS_GFX nsIntRect :
// Returns a special nsIntRect that's used in some places to signify
// "all available space".
static const nsIntRect& GetMaxSizedIntRect() {
static const nsIntRect r(0, 0, INT_MAX, INT_MAX);
return r;
}
static const nsIntRect& GetMaxSizedIntRect() { return kMaxSizedIntRect; }
// This is here only to keep IPDL-generated code happy. DO NOT USE.
bool operator==(const nsIntRect& aRect) const
{
return IsEqualEdges(aRect);
}
protected:
static const nsIntRect kMaxSizedIntRect;
};
/*