Oops. Back out unintentional change to RenderBlock.cpp
authorhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2008 02:21:34 +0000 (02:21 +0000)
committerhyatt@apple.com <hyatt@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Sat, 29 Mar 2008 02:21:34 +0000 (02:21 +0000)
git-svn-id: https://svn.webkit.org/repository/webkit/trunk@31425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebCore/rendering/RenderBlock.cpp

index fe5f16b..4c70c7e 100644 (file)
@@ -2229,6 +2229,7 @@ bool RenderBlock::positionNewFloats()
                 y += min(heightRemainingLeft, heightRemainingRight);
                 fx = rightRelOffset(y, ro, false, &heightRemainingRight);
             }
+            fx = max(f->m_width, fx);
             f->m_left = fx - f->m_width;
             o->setPos(fx - o->marginRight() - o->width(), y + o->marginTop());
         }