Back out Robert O'Callahan's patch from bug 423385 due to mochitest failure.

layout/generic/nsFrame.cpp

@@ -2871,14 +2871,11 @@ nsIFrame::InlinePrefWidthData::ForceBreak(nsIRenderingContext *aRenderingContext
 
       nscoord &floats_cur = floatDisp->mFloats == NS_STYLE_FLOAT_LEFT
                               ? floats_cur_left : floats_cur_right;
-      nscoord floatWidth =
+      floats_cur =
+        NSCoordSaturatingAdd(floats_cur,
           nsLayoutUtils::IntrinsicForContainer(aRenderingContext,
                                                floatFrame,
-                                               nsLayoutUtils::PREF_WIDTH);
-      // Negative-width floats don't change the available space so they
-      // shouldn't change our intrinsic line width either.
-      floats_cur =
-        NSCoordSaturatingAdd(floats_cur, PR_MAX(0, floatWidth));
+                                               nsLayoutUtils::PREF_WIDTH));
     }
 
     nscoord floats_cur =

layout/reftests/bugs/reftest.list

@@ -773,5 +773,4 @@ fails == 413027-3.html 413027-3-ref.html
 == 421419-1.html 421419-1-ref.html
 == 422394-1.html 422394-1-ref.html
 == 423130-1.html 423130-1-ref.html
-== 423385-1.html 423385-1-ref.html
 == 423599-1.html 423599-1-ref.html