Fix for bug 159363: Text overlaps image (ESPN.com)

- Place right floaters at the unconstrained right edge during an unconstrained reflow. This ensures that the floater will be repositioned when the constrained reflow comes around.

- Fixed |if| expression that was used to detect whether or not we were trying to do an unconstrained reflow.

r=karnaze@netscape.com  sr=dbaron@fas.harvard.edu

layout/generic/nsBlockReflowState.cpp

@@ -994,7 +994,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
   }
   else {
     isLeftFloater = PR_FALSE;
-    if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.XMost()) {
+    if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.width) {
       nsIFrame* prevInFlow;
       floater->GetPrevInFlow(&prevInFlow);
       if (prevInFlow) {
@@ -1011,7 +1011,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
     }
     else {
       okToAddRectRegion = PR_FALSE;
-      region.x = mAvailSpaceRect.x;
+      region.x = NS_UNCONSTRAINEDSIZE - region.width;
     }
   }
   *aIsLeftFloater = isLeftFloater;

layout/html/base/src/nsBlockReflowState.cpp

@@ -994,7 +994,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
   }
   else {
     isLeftFloater = PR_FALSE;
-    if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.XMost()) {
+    if (NS_UNCONSTRAINEDSIZE != mAvailSpaceRect.width) {
       nsIFrame* prevInFlow;
       floater->GetPrevInFlow(&prevInFlow);
       if (prevInFlow) {
@@ -1011,7 +1011,7 @@ nsBlockReflowState::FlowAndPlaceFloater(nsFloaterCache* aFloaterCache,
     }
     else {
       okToAddRectRegion = PR_FALSE;
-      region.x = mAvailSpaceRect.x;
+      region.x = NS_UNCONSTRAINEDSIZE - region.width;
     }
   }
   *aIsLeftFloater = isLeftFloater;