[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75
hyatt at apple.com
hyatt at apple.com
Thu Oct 29 20:32:32 UTC 2009
The following commit has been merged in the webkit-1.1 branch:
commit 674fba87f3c1846ca900e924a4799a7d7a363ce4
Author: hyatt at apple.com <hyatt at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Sep 23 16:53:01 2009 +0000
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.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48679 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 807b92d..ad92597 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,20 @@
+2009-09-23 Dave Hyatt <hyatt at 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 at collabora.co.uk>
Unreviewed. Skipping new tests, and
diff --git a/LayoutTests/fast/multicol/positioned-with-constrained-height.html b/LayoutTests/fast/multicol/positioned-with-constrained-height.html
new file mode 100644
index 0000000..d558536
--- /dev/null
+++ b/LayoutTests/fast/multicol/positioned-with-constrained-height.html
@@ -0,0 +1,137 @@
+<div style="-moz-column-width:200px; -webkit-column-width:200px;height:300px; position:absolute; background-color:lime">
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+This is some text<br>
+</div>
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt b/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
index b20bb68..0470d80 100644
--- a/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
+++ b/LayoutTests/platform/mac/fast/multicol/float-multicol-expected.txt
@@ -1,8 +1,8 @@
-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]
RenderImage {IMG} at (0,0) size 133x70
diff --git a/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum
new file mode 100644
index 0000000..0b8c7f3
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.checksum
@@ -0,0 +1 @@
+8ac036af8a28872732051b857def89f2
\ No newline at end of file
diff --git a/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.png b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.png
new file mode 100644
index 0000000..080d55a
Binary files /dev/null and b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.png differ
diff --git a/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt
new file mode 100644
index 0000000..6ad7d8e
--- /dev/null
+++ b/LayoutTests/platform/mac/fast/multicol/positioned-with-constrained-height-expected.txt
@@ -0,0 +1,412 @@
+layer at (0,0) size 1090x585
+ RenderView at (0,0) size 800x585
+layer at (0,0) size 800x585
+ RenderBlock {HTML} at (0,0) size 800x585
+ RenderBody {BODY} at (8,8) size 784x569
+layer at (8,8) size 1082x300
+ RenderBlock (positioned) {DIV} at (8,8) size 106x300 [bgcolor=#00FF00]
+ RenderText {#text} at (0,0) size 106x18
+ text run at (0,0) width 106: "This is some text"
+ RenderBR {BR} at (106,14) size 0x0
+ RenderText {#text} at (0,18) size 106x18
+ text run at (0,18) width 106: "This is some text"
+ RenderBR {BR} at (106,32) size 0x0
+ RenderText {#text} at (0,36) size 106x18
+ text run at (0,36) width 106: "This is some text"
+ RenderBR {BR} at (106,50) size 0x0
+ RenderText {#text} at (0,54) size 106x18
+ text run at (0,54) width 106: "This is some text"
+ RenderBR {BR} at (106,68) size 0x0
+ RenderText {#text} at (0,72) size 106x18
+ text run at (0,72) width 106: "This is some text"
+ RenderBR {BR} at (106,86) size 0x0
+ RenderText {#text} at (0,90) size 106x18
+ text run at (0,90) width 106: "This is some text"
+ RenderBR {BR} at (106,104) size 0x0
+ RenderText {#text} at (0,108) size 106x18
+ text run at (0,108) width 106: "This is some text"
+ RenderBR {BR} at (106,122) size 0x0
+ RenderText {#text} at (0,126) size 106x18
+ text run at (0,126) width 106: "This is some text"
+ RenderBR {BR} at (106,140) size 0x0
+ RenderText {#text} at (0,144) size 106x18
+ text run at (0,144) width 106: "This is some text"
+ RenderBR {BR} at (106,158) size 0x0
+ RenderText {#text} at (0,162) size 106x18
+ text run at (0,162) width 106: "This is some text"
+ RenderBR {BR} at (106,176) size 0x0
+ RenderText {#text} at (0,180) size 106x18
+ text run at (0,180) width 106: "This is some text"
+ RenderBR {BR} at (106,194) size 0x0
+ RenderText {#text} at (0,198) size 106x18
+ text run at (0,198) width 106: "This is some text"
+ RenderBR {BR} at (106,212) size 0x0
+ RenderText {#text} at (0,216) size 106x18
+ text run at (0,216) width 106: "This is some text"
+ RenderBR {BR} at (106,230) size 0x0
+ RenderText {#text} at (0,234) size 106x18
+ text run at (0,234) width 106: "This is some text"
+ RenderBR {BR} at (106,248) size 0x0
+ RenderText {#text} at (0,252) size 106x18
+ text run at (0,252) width 106: "This is some text"
+ RenderBR {BR} at (106,266) size 0x0
+ RenderText {#text} at (0,270) size 106x18
+ text run at (0,270) width 106: "This is some text"
+ RenderBR {BR} at (106,284) size 0x0
+ RenderText {#text} at (0,288) size 106x18
+ text run at (0,288) width 106: "This is some text"
+ RenderBR {BR} at (106,302) size 0x0
+ RenderText {#text} at (0,306) size 106x18
+ text run at (0,306) width 106: "This is some text"
+ RenderBR {BR} at (106,320) size 0x0
+ RenderText {#text} at (0,324) size 106x18
+ text run at (0,324) width 106: "This is some text"
+ RenderBR {BR} at (106,338) size 0x0
+ RenderText {#text} at (0,342) size 106x18
+ text run at (0,342) width 106: "This is some text"
+ RenderBR {BR} at (106,356) size 0x0
+ RenderText {#text} at (0,360) size 106x18
+ text run at (0,360) width 106: "This is some text"
+ RenderBR {BR} at (106,374) size 0x0
+ RenderText {#text} at (0,378) size 106x18
+ text run at (0,378) width 106: "This is some text"
+ RenderBR {BR} at (106,392) size 0x0
+ RenderText {#text} at (0,396) size 106x18
+ text run at (0,396) width 106: "This is some text"
+ RenderBR {BR} at (106,410) size 0x0
+ RenderText {#text} at (0,414) size 106x18
+ text run at (0,414) width 106: "This is some text"
+ RenderBR {BR} at (106,428) size 0x0
+ RenderText {#text} at (0,432) size 106x18
+ text run at (0,432) width 106: "This is some text"
+ RenderBR {BR} at (106,446) size 0x0
+ RenderText {#text} at (0,450) size 106x18
+ text run at (0,450) width 106: "This is some text"
+ RenderBR {BR} at (106,464) size 0x0
+ RenderText {#text} at (0,468) size 106x18
+ text run at (0,468) width 106: "This is some text"
+ RenderBR {BR} at (106,482) size 0x0
+ RenderText {#text} at (0,486) size 106x18
+ text run at (0,486) width 106: "This is some text"
+ RenderBR {BR} at (106,500) size 0x0
+ RenderText {#text} at (0,504) size 106x18
+ text run at (0,504) width 106: "This is some text"
+ RenderBR {BR} at (106,518) size 0x0
+ RenderText {#text} at (0,522) size 106x18
+ text run at (0,522) width 106: "This is some text"
+ RenderBR {BR} at (106,536) size 0x0
+ RenderText {#text} at (0,540) size 106x18
+ text run at (0,540) width 106: "This is some text"
+ RenderBR {BR} at (106,554) size 0x0
+ RenderText {#text} at (0,558) size 106x18
+ text run at (0,558) width 106: "This is some text"
+ RenderBR {BR} at (106,572) size 0x0
+ RenderText {#text} at (0,576) size 106x18
+ text run at (0,576) width 106: "This is some text"
+ RenderBR {BR} at (106,590) size 0x0
+ RenderText {#text} at (0,594) size 106x18
+ text run at (0,594) width 106: "This is some text"
+ RenderBR {BR} at (106,608) size 0x0
+ RenderText {#text} at (0,612) size 106x18
+ text run at (0,612) width 106: "This is some text"
+ RenderBR {BR} at (106,626) size 0x0
+ RenderText {#text} at (0,630) size 106x18
+ text run at (0,630) width 106: "This is some text"
+ RenderBR {BR} at (106,644) size 0x0
+ RenderText {#text} at (0,648) size 106x18
+ text run at (0,648) width 106: "This is some text"
+ RenderBR {BR} at (106,662) size 0x0
+ RenderText {#text} at (0,666) size 106x18
+ text run at (0,666) width 106: "This is some text"
+ RenderBR {BR} at (106,680) size 0x0
+ RenderText {#text} at (0,684) size 106x18
+ text run at (0,684) width 106: "This is some text"
+ RenderBR {BR} at (106,698) size 0x0
+ RenderText {#text} at (0,702) size 106x18
+ text run at (0,702) width 106: "This is some text"
+ RenderBR {BR} at (106,716) size 0x0
+ RenderText {#text} at (0,720) size 106x18
+ text run at (0,720) width 106: "This is some text"
+ RenderBR {BR} at (106,734) size 0x0
+ RenderText {#text} at (0,738) size 106x18
+ text run at (0,738) width 106: "This is some text"
+ RenderBR {BR} at (106,752) size 0x0
+ RenderText {#text} at (0,756) size 106x18
+ text run at (0,756) width 106: "This is some text"
+ RenderBR {BR} at (106,770) size 0x0
+ RenderText {#text} at (0,774) size 106x18
+ text run at (0,774) width 106: "This is some text"
+ RenderBR {BR} at (106,788) size 0x0
+ RenderText {#text} at (0,792) size 106x18
+ text run at (0,792) width 106: "This is some text"
+ RenderBR {BR} at (106,806) size 0x0
+ RenderText {#text} at (0,810) size 106x18
+ text run at (0,810) width 106: "This is some text"
+ RenderBR {BR} at (106,824) size 0x0
+ RenderText {#text} at (0,828) size 106x18
+ text run at (0,828) width 106: "This is some text"
+ RenderBR {BR} at (106,842) size 0x0
+ RenderText {#text} at (0,846) size 106x18
+ text run at (0,846) width 106: "This is some text"
+ RenderBR {BR} at (106,860) size 0x0
+ RenderText {#text} at (0,864) size 106x18
+ text run at (0,864) width 106: "This is some text"
+ RenderBR {BR} at (106,878) size 0x0
+ RenderText {#text} at (0,882) size 106x18
+ text run at (0,882) width 106: "This is some text"
+ RenderBR {BR} at (106,896) size 0x0
+ RenderText {#text} at (0,900) size 106x18
+ text run at (0,900) width 106: "This is some text"
+ RenderBR {BR} at (106,914) size 0x0
+ RenderText {#text} at (0,918) size 106x18
+ text run at (0,918) width 106: "This is some text"
+ RenderBR {BR} at (106,932) size 0x0
+ RenderText {#text} at (0,936) size 106x18
+ text run at (0,936) width 106: "This is some text"
+ RenderBR {BR} at (106,950) size 0x0
+ RenderText {#text} at (0,954) size 106x18
+ text run at (0,954) width 106: "This is some text"
+ RenderBR {BR} at (106,968) size 0x0
+ RenderText {#text} at (0,972) size 106x18
+ text run at (0,972) width 106: "This is some text"
+ RenderBR {BR} at (106,986) size 0x0
+ RenderText {#text} at (0,990) size 106x18
+ text run at (0,990) width 106: "This is some text"
+ RenderBR {BR} at (106,1004) size 0x0
+ RenderText {#text} at (0,1008) size 106x18
+ text run at (0,1008) width 106: "This is some text"
+ RenderBR {BR} at (106,1022) size 0x0
+ RenderText {#text} at (0,1026) size 106x18
+ text run at (0,1026) width 106: "This is some text"
+ RenderBR {BR} at (106,1040) size 0x0
+ RenderText {#text} at (0,1044) size 106x18
+ text run at (0,1044) width 106: "This is some text"
+ RenderBR {BR} at (106,1058) size 0x0
+ RenderText {#text} at (0,1062) size 106x18
+ text run at (0,1062) width 106: "This is some text"
+ RenderBR {BR} at (106,1076) size 0x0
+ RenderText {#text} at (0,1080) size 106x18
+ text run at (0,1080) width 106: "This is some text"
+ RenderBR {BR} at (106,1094) size 0x0
+ RenderText {#text} at (0,1098) size 106x18
+ text run at (0,1098) width 106: "This is some text"
+ RenderBR {BR} at (106,1112) size 0x0
+ RenderText {#text} at (0,1116) size 106x18
+ text run at (0,1116) width 106: "This is some text"
+ RenderBR {BR} at (106,1130) size 0x0
+ RenderText {#text} at (0,1134) size 106x18
+ text run at (0,1134) width 106: "This is some text"
+ RenderBR {BR} at (106,1148) size 0x0
+ RenderText {#text} at (0,1152) size 106x18
+ text run at (0,1152) width 106: "This is some text"
+ RenderBR {BR} at (106,1166) size 0x0
+ RenderText {#text} at (0,1170) size 106x18
+ text run at (0,1170) width 106: "This is some text"
+ RenderBR {BR} at (106,1184) size 0x0
+ RenderText {#text} at (0,1188) size 106x18
+ text run at (0,1188) width 106: "This is some text"
+ RenderBR {BR} at (106,1202) size 0x0
+ RenderText {#text} at (0,1206) size 106x18
+ text run at (0,1206) width 106: "This is some text"
+ RenderBR {BR} at (106,1220) size 0x0
+ RenderText {#text} at (0,1224) size 106x18
+ text run at (0,1224) width 106: "This is some text"
+ RenderBR {BR} at (106,1238) size 0x0
+ RenderText {#text} at (0,1242) size 106x18
+ text run at (0,1242) width 106: "This is some text"
+ RenderBR {BR} at (106,1256) size 0x0
+ RenderText {#text} at (0,1260) size 106x18
+ text run at (0,1260) width 106: "This is some text"
+ RenderBR {BR} at (106,1274) size 0x0
+ RenderText {#text} at (0,1278) size 106x18
+ text run at (0,1278) width 106: "This is some text"
+ RenderBR {BR} at (106,1292) size 0x0
+ RenderText {#text} at (0,1296) size 106x18
+ text run at (0,1296) width 106: "This is some text"
+ RenderBR {BR} at (106,1310) size 0x0
+ RenderText {#text} at (0,1314) size 106x18
+ text run at (0,1314) width 106: "This is some text"
+ RenderBR {BR} at (106,1328) size 0x0
+ RenderText {#text} at (0,1332) size 106x18
+ text run at (0,1332) width 106: "This is some text"
+ RenderBR {BR} at (106,1346) size 0x0
+ RenderText {#text} at (0,1350) size 106x18
+ text run at (0,1350) width 106: "This is some text"
+ RenderBR {BR} at (106,1364) size 0x0
+ RenderText {#text} at (0,1368) size 106x18
+ text run at (0,1368) width 106: "This is some text"
+ RenderBR {BR} at (106,1382) size 0x0
+ RenderText {#text} at (0,1386) size 106x18
+ text run at (0,1386) width 106: "This is some text"
+ RenderBR {BR} at (106,1400) size 0x0
+ RenderText {#text} at (0,1404) size 106x18
+ text run at (0,1404) width 106: "This is some text"
+ RenderBR {BR} at (106,1418) size 0x0
+ RenderText {#text} at (0,1422) size 106x18
+ text run at (0,1422) width 106: "This is some text"
+ RenderBR {BR} at (106,1436) size 0x0
+ RenderText {#text} at (0,1440) size 106x18
+ text run at (0,1440) width 106: "This is some text"
+ RenderBR {BR} at (106,1454) size 0x0
+ RenderText {#text} at (0,1458) size 106x18
+ text run at (0,1458) width 106: "This is some text"
+ RenderBR {BR} at (106,1472) size 0x0
+ RenderText {#text} at (0,1476) size 106x18
+ text run at (0,1476) width 106: "This is some text"
+ RenderBR {BR} at (106,1490) size 0x0
+ RenderText {#text} at (0,1494) size 106x18
+ text run at (0,1494) width 106: "This is some text"
+ RenderBR {BR} at (106,1508) size 0x0
+ RenderText {#text} at (0,1512) size 106x18
+ text run at (0,1512) width 106: "This is some text"
+ RenderBR {BR} at (106,1526) size 0x0
+ RenderText {#text} at (0,1530) size 106x18
+ text run at (0,1530) width 106: "This is some text"
+ RenderBR {BR} at (106,1544) size 0x0
+ RenderText {#text} at (0,1548) size 106x18
+ text run at (0,1548) width 106: "This is some text"
+ RenderBR {BR} at (106,1562) size 0x0
+ RenderText {#text} at (0,1566) size 106x18
+ text run at (0,1566) width 106: "This is some text"
+ RenderBR {BR} at (106,1580) size 0x0
+ RenderText {#text} at (0,1584) size 106x18
+ text run at (0,1584) width 106: "This is some text"
+ RenderBR {BR} at (106,1598) size 0x0
+ RenderText {#text} at (0,1602) size 106x18
+ text run at (0,1602) width 106: "This is some text"
+ RenderBR {BR} at (106,1616) size 0x0
+ RenderText {#text} at (0,1620) size 106x18
+ text run at (0,1620) width 106: "This is some text"
+ RenderBR {BR} at (106,1634) size 0x0
+ RenderText {#text} at (0,1638) size 106x18
+ text run at (0,1638) width 106: "This is some text"
+ RenderBR {BR} at (106,1652) size 0x0
+ RenderText {#text} at (0,1656) size 106x18
+ text run at (0,1656) width 106: "This is some text"
+ RenderBR {BR} at (106,1670) size 0x0
+ RenderText {#text} at (0,1674) size 106x18
+ text run at (0,1674) width 106: "This is some text"
+ RenderBR {BR} at (106,1688) size 0x0
+ RenderText {#text} at (0,1692) size 106x18
+ text run at (0,1692) width 106: "This is some text"
+ RenderBR {BR} at (106,1706) size 0x0
+ RenderText {#text} at (0,1710) size 106x18
+ text run at (0,1710) width 106: "This is some text"
+ RenderBR {BR} at (106,1724) size 0x0
+ RenderText {#text} at (0,1728) size 106x18
+ text run at (0,1728) width 106: "This is some text"
+ RenderBR {BR} at (106,1742) size 0x0
+ RenderText {#text} at (0,1746) size 106x18
+ text run at (0,1746) width 106: "This is some text"
+ RenderBR {BR} at (106,1760) size 0x0
+ RenderText {#text} at (0,1764) size 106x18
+ text run at (0,1764) width 106: "This is some text"
+ RenderBR {BR} at (106,1778) size 0x0
+ RenderText {#text} at (0,1782) size 106x18
+ text run at (0,1782) width 106: "This is some text"
+ RenderBR {BR} at (106,1796) size 0x0
+ RenderText {#text} at (0,1800) size 106x18
+ text run at (0,1800) width 106: "This is some text"
+ RenderBR {BR} at (106,1814) size 0x0
+ RenderText {#text} at (0,1818) size 106x18
+ text run at (0,1818) width 106: "This is some text"
+ RenderBR {BR} at (106,1832) size 0x0
+ RenderText {#text} at (0,1836) size 106x18
+ text run at (0,1836) width 106: "This is some text"
+ RenderBR {BR} at (106,1850) size 0x0
+ RenderText {#text} at (0,1854) size 106x18
+ text run at (0,1854) width 106: "This is some text"
+ RenderBR {BR} at (106,1868) size 0x0
+ RenderText {#text} at (0,1872) size 106x18
+ text run at (0,1872) width 106: "This is some text"
+ RenderBR {BR} at (106,1886) size 0x0
+ RenderText {#text} at (0,1890) size 106x18
+ text run at (0,1890) width 106: "This is some text"
+ RenderBR {BR} at (106,1904) size 0x0
+ RenderText {#text} at (0,1908) size 106x18
+ text run at (0,1908) width 106: "This is some text"
+ RenderBR {BR} at (106,1922) size 0x0
+ RenderText {#text} at (0,1926) size 106x18
+ text run at (0,1926) width 106: "This is some text"
+ RenderBR {BR} at (106,1940) size 0x0
+ RenderText {#text} at (0,1944) size 106x18
+ text run at (0,1944) width 106: "This is some text"
+ RenderBR {BR} at (106,1958) size 0x0
+ RenderText {#text} at (0,1962) size 106x18
+ text run at (0,1962) width 106: "This is some text"
+ RenderBR {BR} at (106,1976) size 0x0
+ RenderText {#text} at (0,1980) size 106x18
+ text run at (0,1980) width 106: "This is some text"
+ RenderBR {BR} at (106,1994) size 0x0
+ RenderText {#text} at (0,1998) size 106x18
+ text run at (0,1998) width 106: "This is some text"
+ RenderBR {BR} at (106,2012) size 0x0
+ RenderText {#text} at (0,2016) size 106x18
+ text run at (0,2016) width 106: "This is some text"
+ RenderBR {BR} at (106,2030) size 0x0
+ RenderText {#text} at (0,2034) size 106x18
+ text run at (0,2034) width 106: "This is some text"
+ RenderBR {BR} at (106,2048) size 0x0
+ RenderText {#text} at (0,2052) size 106x18
+ text run at (0,2052) width 106: "This is some text"
+ RenderBR {BR} at (106,2066) size 0x0
+ RenderText {#text} at (0,2070) size 106x18
+ text run at (0,2070) width 106: "This is some text"
+ RenderBR {BR} at (106,2084) size 0x0
+ RenderText {#text} at (0,2088) size 106x18
+ text run at (0,2088) width 106: "This is some text"
+ RenderBR {BR} at (106,2102) size 0x0
+ RenderText {#text} at (0,2106) size 106x18
+ text run at (0,2106) width 106: "This is some text"
+ RenderBR {BR} at (106,2120) size 0x0
+ RenderText {#text} at (0,2124) size 106x18
+ text run at (0,2124) width 106: "This is some text"
+ RenderBR {BR} at (106,2138) size 0x0
+ RenderText {#text} at (0,2142) size 106x18
+ text run at (0,2142) width 106: "This is some text"
+ RenderBR {BR} at (106,2156) size 0x0
+ RenderText {#text} at (0,2160) size 106x18
+ text run at (0,2160) width 106: "This is some text"
+ RenderBR {BR} at (106,2174) size 0x0
+ RenderText {#text} at (0,2178) size 106x18
+ text run at (0,2178) width 106: "This is some text"
+ RenderBR {BR} at (106,2192) size 0x0
+ RenderText {#text} at (0,2196) size 106x18
+ text run at (0,2196) width 106: "This is some text"
+ RenderBR {BR} at (106,2210) size 0x0
+ RenderText {#text} at (0,2214) size 106x18
+ text run at (0,2214) width 106: "This is some text"
+ RenderBR {BR} at (106,2228) size 0x0
+ RenderText {#text} at (0,2232) size 106x18
+ text run at (0,2232) width 106: "This is some text"
+ RenderBR {BR} at (106,2246) size 0x0
+ RenderText {#text} at (0,2250) size 106x18
+ text run at (0,2250) width 106: "This is some text"
+ RenderBR {BR} at (106,2264) size 0x0
+ RenderText {#text} at (0,2268) size 106x18
+ text run at (0,2268) width 106: "This is some text"
+ RenderBR {BR} at (106,2282) size 0x0
+ RenderText {#text} at (0,2286) size 106x18
+ text run at (0,2286) width 106: "This is some text"
+ RenderBR {BR} at (106,2300) size 0x0
+ RenderText {#text} at (0,2304) size 106x18
+ text run at (0,2304) width 106: "This is some text"
+ RenderBR {BR} at (106,2318) size 0x0
+ RenderText {#text} at (0,2322) size 106x18
+ text run at (0,2322) width 106: "This is some text"
+ RenderBR {BR} at (106,2336) size 0x0
+ RenderText {#text} at (0,2340) size 106x18
+ text run at (0,2340) width 106: "This is some text"
+ RenderBR {BR} at (106,2354) size 0x0
+ RenderText {#text} at (0,2358) size 106x18
+ text run at (0,2358) width 106: "This is some text"
+ RenderBR {BR} at (106,2372) size 0x0
+ RenderText {#text} at (0,2376) size 106x18
+ text run at (0,2376) width 106: "This is some text"
+ RenderBR {BR} at (106,2390) size 0x0
+ RenderText {#text} at (0,2394) size 106x18
+ text run at (0,2394) width 106: "This is some text"
+ RenderBR {BR} at (106,2408) size 0x0
+ RenderText {#text} at (0,2412) size 106x18
+ text run at (0,2412) width 106: "This is some text"
+ RenderBR {BR} at (106,2426) size 0x0
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 24dc88d..2983ef5 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,17 @@
+2009-09-22 Dave Hyatt <hyatt at 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 at selfish.org>
Rubber-stamped by Simon Hausmann.
diff --git a/WebCore/rendering/RenderBlock.cpp b/WebCore/rendering/RenderBlock.cpp
index 7056bca..ae0d76d 100644
--- a/WebCore/rendering/RenderBlock.cpp
+++ b/WebCore/rendering/RenderBlock.cpp
@@ -3559,7 +3559,7 @@ void RenderBlock::calcColumnWidth()
void RenderBlock::setDesiredColumnCountAndWidth(int count, int width)
{
- if (count == 1) {
+ if (count == 1 && style()->hasAutoColumnWidth()) {
if (hasColumns()) {
delete gColumnInfoMap->take(this);
setHasColumns(false);
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list