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

gfx/src/nsRect.cpp

@@ -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
 

gfx/src/nsRect.h

@@ -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;
 };
 
 /*