Changeset 48679 in webkit

Timestamp:

Sep 23, 2009 9:53:01 AM (15 years ago)

Author:

hyatt@apple.com

Message:

​https://bugs.webkit.org/show_bug.cgi?id=29657
Columns don't break properly in positioned elements with a fixed height. Make sure that
a block is still considered to have columns even when the column count is 1 if the column
width is non-auto.

Reviewed by John Sullivan.

Added fast/multicol/positioned-with-constrained-height.html

WebCore:

• rendering/RenderBlock.cpp:

(WebCore::RenderBlock::setDesiredColumnCountAndWidth):

LayoutTests:

• fast/multicol/positioned-with-constrained-height.html: Added.
• platform/mac/fast/multicol/float-multicol-expected.txt:
• platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum: Added.
• platform/mac/fast/multicol/positioned-with-constrained-height-expected.png: Added.
• platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/multicol/positioned-with-constrained-height.html (added)
• LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt (modified) (1 diff)
• LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum (added)
• LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.png (added)
• LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt (added)
• WebCore/ChangeLog (modified) (1 diff)
• WebCore/rendering/RenderBlock.cpp (modified) (1 diff)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2009-09-23  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by John Sullivan.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29657
+        Columns don't break properly in positioned elements with a fixed height.  Make sure that
+        a block is still considered to have columns even when the column count is 1 if the column
+        width is non-auto.
+    
+        Added fast/multicol/positioned-with-constrained-height.html
+
+        * fast/multicol/positioned-with-constrained-height.html: Added.
+        * platform/mac/fast/multicol/float-multicol-expected.txt:
+        * platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum: Added.
+        * platform/mac/fast/multicol/positioned-with-constrained-height-expected.png: Added.
+        * platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt: Added.
+
 2009-09-23  Gustavo Noronha Silva  <gustavo.noronha@collabora.co.uk>
 

trunk/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt

@@ -1 @@
-layer at (0,0) size 785x794
+layer at (0,0) size 785x810
   RenderView at (0,0) size 785x600
-layer at (0,0) size 785x794
-  RenderBlock {HTML} at (0,0) size 785x670
-    RenderBody {BODY} at (8,19) size 769x635
+layer at (0,0) size 785x810
+  RenderBlock {HTML} at (0,0) size 785x810
+    RenderBody {BODY} at (8,19) size 769x775
       RenderBlock {DIV} at (0,0) size 769x28 [bgcolor=#00FFFF]
         RenderBlock (floating) {DIV} at (4,4) size 384x462 [bgcolor=#FFFF00]

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-09-22  Dave Hyatt  <hyatt@apple.com>
+
+        Reviewed by John Sullivan.
+
+        https://bugs.webkit.org/show_bug.cgi?id=29657
+        Columns don't break properly in positioned elements with a fixed height.  Make sure that
+        a block is still considered to have columns even when the column count is 1 if the column
+        width is non-auto.
+    
+        Added fast/multicol/positioned-with-constrained-height.html
+
+        * rendering/RenderBlock.cpp:
+        (WebCore::RenderBlock::setDesiredColumnCountAndWidth):
+
 2009-09-23  Holger Hans Peter Freyther  <zecke@selfish.org>
 

trunk/WebCore/rendering/RenderBlock.cpp

@@ -3560 +3560 @@
 void RenderBlock::setDesiredColumnCountAndWidth(int count, int width)
 {
-    if (count == 1) {
+    if (count == 1 && style()->hasAutoColumnWidth()) {
         if (hasColumns()) {
             delete gColumnInfoMap->take(this);