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

gfx/src/nsRect.cpp

@@ -7,14 +7,10 @@
 #include "nsString.h"
 #include "nsDeviceContext.h"
 #include "prlog.h"
-#include <limits.h>
 
 // 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
 

gfx/src/nsRect.h

@@ -16,6 +16,7 @@
 #include "nsTraceRefcnt.h"
 #include "mozilla/gfx/BaseRect.h"
 #include "mozilla/Likely.h"
+#include <climits>
 
 struct nsIntRect;
 
@@ -231,16 +232,16 @@ struct NS_GFX nsIntRect :
 
   // Returns a special nsIntRect that's used in some places to signify
   // "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.
   bool operator==(const nsIntRect& aRect) const
   {
     return IsEqualEdges(aRect);
   }
-
-protected:
-  static const nsIntRect kMaxSizedIntRect;
 };
 
 /*