Bug 817774 - Let nsIntRect not have a nsIntRect static data member, as that kills GDB printing it - r=dholbert

This commit is contained in:
Benoit Jacob 2012-12-17 16:59:53 -05:00
parent 9332fbdb86
commit 456912483a
2 changed files with 5 additions and 8 deletions

View File

@ -7,14 +7,10 @@
#include "nsString.h" #include "nsString.h"
#include "nsDeviceContext.h" #include "nsDeviceContext.h"
#include "prlog.h" #include "prlog.h"
#include <limits.h>
// the mozilla::css::Side sequence must match the nsMargin nscoord sequence // 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)); 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 #ifdef DEBUG
// Diagnostics // Diagnostics

View File

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