Make sure floats are avoided if you have non-auto column property...

        Make sure floats are avoided if you have non-auto column property values.  Fixes the crazy layout
        on http://weblogs.mozillazine.org/roc.

        Reviewed by mitz

        Added fast/multicol/float-avoidance.html

        * rendering/RenderBlock.cpp:
        (WebCore::RenderBlock::avoidsFloats):



git-svn-id: svn://svn.chromium.org/blink/trunk@18840 bbb929c8-8fbe-4397-9dbb-9b2b20218538

third_party/WebKit/WebCore/ChangeLog

+2007-01-14  David Hyatt  <hyatt@apple.com>
+
+        Make sure floats are avoided if you have non-auto column property values.  Fixes the crazy layout
+        on http://weblogs.mozillazine.org/roc.
+
+        Reviewed by mitz
+
+        Added fast/multicol/float-avoidance.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::avoidsFloats):
+
 2007-01-14  David Hyatt  <hyatt@apple.com>
 
         Fix for 10145, regression where line breaks are not being honored between adjacent replaced elements.

third_party/WebKit/WebCore/rendering/RenderBlock.cpp

@@ -2578,8 +2578,8 @@ void RenderBlock::addIntrudingFloats(RenderBlock* prev, int xoff, int yoff)
 
 bool RenderBlock::avoidsFloats() const
 {
-    // Floats can't intrude into our box if we have multiple columns.
-    return RenderFlow::avoidsFloats() || hasColumns();
+    // Floats can't intrude into our box if we have a non-auto column count or width.
+    return RenderFlow::avoidsFloats() || !style()->hasAutoColumnCount() || !style()->hasAutoColumnWidth();
 }
 
 bool RenderBlock::containsFloat(RenderObject* o)