Improve multicol preferred/intrinsic width calculation.

LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt

Index: LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt
diff --git a/LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt b/LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt
deleted file mode 100644
index 3b1eba403c52c64e31ebd60307ebf1a6ae956f22..0000000000000000000000000000000000000000
--- a/LayoutTests/platform/win/fast/multicol/positioned-with-constrained-height-expected.txt
+++ /dev/null
@@ -1,412 +0,0 @@
-layer at (0,0) size 1036x585
-  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 100x300
-  RenderBlock (positioned) {DIV} at (8,8) size 100x300 [bgcolor=#00FF00]
-    RenderText {#text} at (0,0) size 100x19
-      text run at (0,0) width 100: "This is some text"
-    RenderBR {BR} at (100,15) size 0x0
-    RenderText {#text} at (0,20) size 100x19
-      text run at (0,20) width 100: "This is some text"
-    RenderBR {BR} at (100,35) size 0x0
-    RenderText {#text} at (0,40) size 100x19
-      text run at (0,40) width 100: "This is some text"
-    RenderBR {BR} at (100,55) size 0x0
-    RenderText {#text} at (0,60) size 100x19
-      text run at (0,60) width 100: "This is some text"
-    RenderBR {BR} at (100,75) size 0x0
-    RenderText {#text} at (0,80) size 100x19
-      text run at (0,80) width 100: "This is some text"
-    RenderBR {BR} at (100,95) size 0x0
-    RenderText {#text} at (0,100) size 100x19
-      text run at (0,100) width 100: "This is some text"
-    RenderBR {BR} at (100,115) size 0x0
-    RenderText {#text} at (0,120) size 100x19
-      text run at (0,120) width 100: "This is some text"
-    RenderBR {BR} at (100,135) size 0x0
-    RenderText {#text} at (0,140) size 100x19
-      text run at (0,140) width 100: "This is some text"
-    RenderBR {BR} at (100,155) size 0x0
-    RenderText {#text} at (0,160) size 100x19
-      text run at (0,160) width 100: "This is some text"
-    RenderBR {BR} at (100,175) size 0x0
-    RenderText {#text} at (0,180) size 100x19
-      text run at (0,180) width 100: "This is some text"
-    RenderBR {BR} at (100,195) size 0x0
-    RenderText {#text} at (0,200) size 100x19
-      text run at (0,200) width 100: "This is some text"
-    RenderBR {BR} at (100,215) size 0x0
-    RenderText {#text} at (0,220) size 100x19
-      text run at (0,220) width 100: "This is some text"
-    RenderBR {BR} at (100,235) size 0x0
-    RenderText {#text} at (0,240) size 100x19
-      text run at (0,240) width 100: "This is some text"
-    RenderBR {BR} at (100,255) size 0x0
-    RenderText {#text} at (0,260) size 100x19
-      text run at (0,260) width 100: "This is some text"
-    RenderBR {BR} at (100,275) size 0x0
-    RenderText {#text} at (0,280) size 100x19
-      text run at (0,280) width 100: "This is some text"
-    RenderBR {BR} at (100,295) size 0x0
-    RenderText {#text} at (0,300) size 100x19
-      text run at (0,300) width 100: "This is some text"
-    RenderBR {BR} at (100,315) size 0x0
-    RenderText {#text} at (0,320) size 100x19
-      text run at (0,320) width 100: "This is some text"
-    RenderBR {BR} at (100,335) size 0x0
-    RenderText {#text} at (0,340) size 100x19
-      text run at (0,340) width 100: "This is some text"
-    RenderBR {BR} at (100,355) size 0x0
-    RenderText {#text} at (0,360) size 100x19
-      text run at (0,360) width 100: "This is some text"
-    RenderBR {BR} at (100,375) size 0x0
-    RenderText {#text} at (0,380) size 100x19
-      text run at (0,380) width 100: "This is some text"
-    RenderBR {BR} at (100,395) size 0x0
-    RenderText {#text} at (0,400) size 100x19
-      text run at (0,400) width 100: "This is some text"
-    RenderBR {BR} at (100,415) size 0x0
-    RenderText {#text} at (0,420) size 100x19
-      text run at (0,420) width 100: "This is some text"
-    RenderBR {BR} at (100,435) size 0x0
-    RenderText {#text} at (0,440) size 100x19
-      text run at (0,440) width 100: "This is some text"
-    RenderBR {BR} at (100,455) size 0x0
-    RenderText {#text} at (0,460) size 100x19
-      text run at (0,460) width 100: "This is some text"
-    RenderBR {BR} at (100,475) size 0x0
-    RenderText {#text} at (0,480) size 100x19
-      text run at (0,480) width 100: "This is some text"
-    RenderBR {BR} at (100,495) size 0x0
-    RenderText {#text} at (0,500) size 100x19
-      text run at (0,500) width 100: "This is some text"
-    RenderBR {BR} at (100,515) size 0x0
-    RenderText {#text} at (0,520) size 100x19
-      text run at (0,520) width 100: "This is some text"
-    RenderBR {BR} at (100,535) size 0x0
-    RenderText {#text} at (0,540) size 100x19
-      text run at (0,540) width 100: "This is some text"
-    RenderBR {BR} at (100,555) size 0x0
-    RenderText {#text} at (0,560) size 100x19
-      text run at (0,560) width 100: "This is some text"
-    RenderBR {BR} at (100,575) size 0x0
-    RenderText {#text} at (0,580) size 100x19
-      text run at (0,580) width 100: "This is some text"
-    RenderBR {BR} at (100,595) size 0x0
-    RenderText {#text} at (0,600) size 100x19
-      text run at (0,600) width 100: "This is some text"
-    RenderBR {BR} at (100,615) size 0x0
-    RenderText {#text} at (0,620) size 100x19
-      text run at (0,620) width 100: "This is some text"
-    RenderBR {BR} at (100,635) size 0x0
-    RenderText {#text} at (0,640) size 100x19
-      text run at (0,640) width 100: "This is some text"
-    RenderBR {BR} at (100,655) size 0x0
-    RenderText {#text} at (0,660) size 100x19
-      text run at (0,660) width 100: "This is some text"
-    RenderBR {BR} at (100,675) size 0x0
-    RenderText {#text} at (0,680) size 100x19
-      text run at (0,680) width 100: "This is some text"
-    RenderBR {BR} at (100,695) size 0x0
-    RenderText {#text} at (0,700) size 100x19
-      text run at (0,700) width 100: "This is some text"
-    RenderBR {BR} at (100,715) size 0x0
-    RenderText {#text} at (0,720) size 100x19
-      text run at (0,720) width 100: "This is some text"
-    RenderBR {BR} at (100,735) size 0x0
-    RenderText {#text} at (0,740) size 100x19
-      text run at (0,740) width 100: "This is some text"
-    RenderBR {BR} at (100,755) size 0x0
-    RenderText {#text} at (0,760) size 100x19
-      text run at (0,760) width 100: "This is some text"
-    RenderBR {BR} at (100,775) size 0x0
-    RenderText {#text} at (0,780) size 100x19
-      text run at (0,780) width 100: "This is some text"
-    RenderBR {BR} at (100,795) size 0x0
-    RenderText {#text} at (0,800) size 100x19
-      text run at (0,800) width 100: "This is some text"
-    RenderBR {BR} at (100,815) size 0x0
-    RenderText {#text} at (0,820) size 100x19
-      text run at (0,820) width 100: "This is some text"
-    RenderBR {BR} at (100,835) size 0x0
-    RenderText {#text} at (0,840) size 100x19
-      text run at (0,840) width 100: "This is some text"
-    RenderBR {BR} at (100,855) size 0x0
-    RenderText {#text} at (0,860) size 100x19
-      text run at (0,860) width 100: "This is some text"
-    RenderBR {BR} at (100,875) size 0x0
-    RenderText {#text} at (0,880) size 100x19
-      text run at (0,880) width 100: "This is some text"
-    RenderBR {BR} at (100,895) size 0x0
-    RenderText {#text} at (0,900) size 100x19
-      text run at (0,900) width 100: "This is some text"
-    RenderBR {BR} at (100,915) size 0x0
-    RenderText {#text} at (0,920) size 100x19
-      text run at (0,920) width 100: "This is some text"
-    RenderBR {BR} at (100,935) size 0x0
-    RenderText {#text} at (0,940) size 100x19
-      text run at (0,940) width 100: "This is some text"
-    RenderBR {BR} at (100,955) size 0x0
-    RenderText {#text} at (0,960) size 100x19
-      text run at (0,960) width 100: "This is some text"
-    RenderBR {BR} at (100,975) size 0x0
-    RenderText {#text} at (0,980) size 100x19
-      text run at (0,980) width 100: "This is some text"
-    RenderBR {BR} at (100,995) size 0x0
-    RenderText {#text} at (0,1000) size 100x19
-      text run at (0,1000) width 100: "This is some text"
-    RenderBR {BR} at (100,1015) size 0x0
-    RenderText {#text} at (0,1020) size 100x19
-      text run at (0,1020) width 100: "This is some text"
-    RenderBR {BR} at (100,1035) size 0x0
-    RenderText {#text} at (0,1040) size 100x19
-      text run at (0,1040) width 100: "This is some text"
-    RenderBR {BR} at (100,1055) size 0x0
-    RenderText {#text} at (0,1060) size 100x19
-      text run at (0,1060) width 100: "This is some text"
-    RenderBR {BR} at (100,1075) size 0x0
-    RenderText {#text} at (0,1080) size 100x19
-      text run at (0,1080) width 100: "This is some text"
-    RenderBR {BR} at (100,1095) size 0x0
-    RenderText {#text} at (0,1100) size 100x19
-      text run at (0,1100) width 100: "This is some text"
-    RenderBR {BR} at (100,1115) size 0x0
-    RenderText {#text} at (0,1120) size 100x19
-      text run at (0,1120) width 100: "This is some text"
-    RenderBR {BR} at (100,1135) size 0x0
-    RenderText {#text} at (0,1140) size 100x19
-      text run at (0,1140) width 100: "This is some text"
-    RenderBR {BR} at (100,1155) size 0x0
-    RenderText {#text} at (0,1160) size 100x19
-      text run at (0,1160) width 100: "This is some text"
-    RenderBR {BR} at (100,1175) size 0x0
-    RenderText {#text} at (0,1180) size 100x19
-      text run at (0,1180) width 100: "This is some text"
-    RenderBR {BR} at (100,1195) size 0x0
-    RenderText {#text} at (0,1200) size 100x19
-      text run at (0,1200) width 100: "This is some text"
-    RenderBR {BR} at (100,1215) size 0x0
-    RenderText {#text} at (0,1220) size 100x19
-      text run at (0,1220) width 100: "This is some text"
-    RenderBR {BR} at (100,1235) size 0x0
-    RenderText {#text} at (0,1240) size 100x19
-      text run at (0,1240) width 100: "This is some text"
-    RenderBR {BR} at (100,1255) size 0x0
-    RenderText {#text} at (0,1260) size 100x19
-      text run at (0,1260) width 100: "This is some text"
-    RenderBR {BR} at (100,1275) size 0x0
-    RenderText {#text} at (0,1280) size 100x19
-      text run at (0,1280) width 100: "This is some text"
-    RenderBR {BR} at (100,1295) size 0x0
-    RenderText {#text} at (0,1300) size 100x19
-      text run at (0,1300) width 100: "This is some text"
-    RenderBR {BR} at (100,1315) size 0x0
-    RenderText {#text} at (0,1320) size 100x19
-      text run at (0,1320) width 100: "This is some text"
-    RenderBR {BR} at (100,1335) size 0x0
-    RenderText {#text} at (0,1340) size 100x19
-      text run at (0,1340) width 100: "This is some text"
-    RenderBR {BR} at (100,1355) size 0x0
-    RenderText {#text} at (0,1360) size 100x19
-      text run at (0,1360) width 100: "This is some text"
-    RenderBR {BR} at (100,1375) size 0x0
-    RenderText {#text} at (0,1380) size 100x19
-      text run at (0,1380) width 100: "This is some text"
-    RenderBR {BR} at (100,1395) size 0x0
-    RenderText {#text} at (0,1400) size 100x19
-      text run at (0,1400) width 100: "This is some text"
-    RenderBR {BR} at (100,1415) size 0x0
-    RenderText {#text} at (0,1420) size 100x19
-      text run at (0,1420) width 100: "This is some text"
-    RenderBR {BR} at (100,1435) size 0x0
-    RenderText {#text} at (0,1440) size 100x19
-      text run at (0,1440) width 100: "This is some text"
-    RenderBR {BR} at (100,1455) size 0x0
-    RenderText {#text} at (0,1460) size 100x19
-      text run at (0,1460) width 100: "This is some text"
-    RenderBR {BR} at (100,1475) size 0x0
-    RenderText {#text} at (0,1480) size 100x19
-      text run at (0,1480) width 100: "This is some text"
-    RenderBR {BR} at (100,1495) size 0x0
-    RenderText {#text} at (0,1500) size 100x19
-      text run at (0,1500) width 100: "This is some text"
-    RenderBR {BR} at (100,1515) size 0x0
-    RenderText {#text} at (0,1520) size 100x19
-      text run at (0,1520) width 100: "This is some text"
-    RenderBR {BR} at (100,1535) size 0x0
-    RenderText {#text} at (0,1540) size 100x19
-      text run at (0,1540) width 100: "This is some text"
-    RenderBR {BR} at (100,1555) size 0x0
-    RenderText {#text} at (0,1560) size 100x19
-      text run at (0,1560) width 100: "This is some text"
-    RenderBR {BR} at (100,1575) size 0x0
-    RenderText {#text} at (0,1580) size 100x19
-      text run at (0,1580) width 100: "This is some text"
-    RenderBR {BR} at (100,1595) size 0x0
-    RenderText {#text} at (0,1600) size 100x19
-      text run at (0,1600) width 100: "This is some text"
-    RenderBR {BR} at (100,1615) size 0x0
-    RenderText {#text} at (0,1620) size 100x19
-      text run at (0,1620) width 100: "This is some text"
-    RenderBR {BR} at (100,1635) size 0x0
-    RenderText {#text} at (0,1640) size 100x19
-      text run at (0,1640) width 100: "This is some text"
-    RenderBR {BR} at (100,1655) size 0x0
-    RenderText {#text} at (0,1660) size 100x19
-      text run at (0,1660) width 100: "This is some text"
-    RenderBR {BR} at (100,1675) size 0x0
-    RenderText {#text} at (0,1680) size 100x19
-      text run at (0,1680) width 100: "This is some text"
-    RenderBR {BR} at (100,1695) size 0x0
-    RenderText {#text} at (0,1700) size 100x19
-      text run at (0,1700) width 100: "This is some text"
-    RenderBR {BR} at (100,1715) size 0x0
-    RenderText {#text} at (0,1720) size 100x19
-      text run at (0,1720) width 100: "This is some text"
-    RenderBR {BR} at (100,1735) size 0x0
-    RenderText {#text} at (0,1740) size 100x19
-      text run at (0,1740) width 100: "This is some text"
-    RenderBR {BR} at (100,1755) size 0x0
-    RenderText {#text} at (0,1760) size 100x19
-      text run at (0,1760) width 100: "This is some text"
-    RenderBR {BR} at (100,1775) size 0x0
-    RenderText {#text} at (0,1780) size 100x19
-      text run at (0,1780) width 100: "This is some text"
-    RenderBR {BR} at (100,1795) size 0x0
-    RenderText {#text} at (0,1800) size 100x19
-      text run at (0,1800) width 100: "This is some text"
-    RenderBR {BR} at (100,1815) size 0x0
-    RenderText {#text} at (0,1820) size 100x19
-      text run at (0,1820) width 100: "This is some text"
-    RenderBR {BR} at (100,1835) size 0x0
-    RenderText {#text} at (0,1840) size 100x19
-      text run at (0,1840) width 100: "This is some text"
-    RenderBR {BR} at (100,1855) size 0x0
-    RenderText {#text} at (0,1860) size 100x19
-      text run at (0,1860) width 100: "This is some text"
-    RenderBR {BR} at (100,1875) size 0x0
-    RenderText {#text} at (0,1880) size 100x19
-      text run at (0,1880) width 100: "This is some text"
-    RenderBR {BR} at (100,1895) size 0x0
-    RenderText {#text} at (0,1900) size 100x19
-      text run at (0,1900) width 100: "This is some text"
-    RenderBR {BR} at (100,1915) size 0x0
-    RenderText {#text} at (0,1920) size 100x19
-      text run at (0,1920) width 100: "This is some text"
-    RenderBR {BR} at (100,1935) size 0x0
-    RenderText {#text} at (0,1940) size 100x19
-      text run at (0,1940) width 100: "This is some text"
-    RenderBR {BR} at (100,1955) size 0x0
-    RenderText {#text} at (0,1960) size 100x19
-      text run at (0,1960) width 100: "This is some text"
-    RenderBR {BR} at (100,1975) size 0x0
-    RenderText {#text} at (0,1980) size 100x19
-      text run at (0,1980) width 100: "This is some text"
-    RenderBR {BR} at (100,1995) size 0x0
-    RenderText {#text} at (0,2000) size 100x19
-      text run at (0,2000) width 100: "This is some text"
-    RenderBR {BR} at (100,2015) size 0x0
-    RenderText {#text} at (0,2020) size 100x19
-      text run at (0,2020) width 100: "This is some text"
-    RenderBR {BR} at (100,2035) size 0x0
-    RenderText {#text} at (0,2040) size 100x19
-      text run at (0,2040) width 100: "This is some text"
-    RenderBR {BR} at (100,2055) size 0x0
-    RenderText {#text} at (0,2060) size 100x19
-      text run at (0,2060) width 100: "This is some text"
-    RenderBR {BR} at (100,2075) size 0x0
-    RenderText {#text} at (0,2080) size 100x19
-      text run at (0,2080) width 100: "This is some text"
-    RenderBR {BR} at (100,2095) size 0x0
-    RenderText {#text} at (0,2100) size 100x19
-      text run at (0,2100) width 100: "This is some text"
-    RenderBR {BR} at (100,2115) size 0x0
-    RenderText {#text} at (0,2120) size 100x19
-      text run at (0,2120) width 100: "This is some text"
-    RenderBR {BR} at (100,2135) size 0x0
-    RenderText {#text} at (0,2140) size 100x19
-      text run at (0,2140) width 100: "This is some text"
-    RenderBR {BR} at (100,2155) size 0x0
-    RenderText {#text} at (0,2160) size 100x19
-      text run at (0,2160) width 100: "This is some text"
-    RenderBR {BR} at (100,2175) size 0x0
-    RenderText {#text} at (0,2180) size 100x19
-      text run at (0,2180) width 100: "This is some text"
-    RenderBR {BR} at (100,2195) size 0x0
-    RenderText {#text} at (0,2200) size 100x19
-      text run at (0,2200) width 100: "This is some text"
-    RenderBR {BR} at (100,2215) size 0x0
-    RenderText {#text} at (0,2220) size 100x19
-      text run at (0,2220) width 100: "This is some text"
-    RenderBR {BR} at (100,2235) size 0x0
-    RenderText {#text} at (0,2240) size 100x19
-      text run at (0,2240) width 100: "This is some text"
-    RenderBR {BR} at (100,2255) size 0x0
-    RenderText {#text} at (0,2260) size 100x19
-      text run at (0,2260) width 100: "This is some text"
-    RenderBR {BR} at (100,2275) size 0x0
-    RenderText {#text} at (0,2280) size 100x19
-      text run at (0,2280) width 100: "This is some text"
-    RenderBR {BR} at (100,2295) size 0x0
-    RenderText {#text} at (0,2300) size 100x19
-      text run at (0,2300) width 100: "This is some text"
-    RenderBR {BR} at (100,2315) size 0x0
-    RenderText {#text} at (0,2320) size 100x19
-      text run at (0,2320) width 100: "This is some text"
-    RenderBR {BR} at (100,2335) size 0x0
-    RenderText {#text} at (0,2340) size 100x19
-      text run at (0,2340) width 100: "This is some text"
-    RenderBR {BR} at (100,2355) size 0x0
-    RenderText {#text} at (0,2360) size 100x19
-      text run at (0,2360) width 100: "This is some text"
-    RenderBR {BR} at (100,2375) size 0x0
-    RenderText {#text} at (0,2380) size 100x19
-      text run at (0,2380) width 100: "This is some text"
-    RenderBR {BR} at (100,2395) size 0x0
-    RenderText {#text} at (0,2400) size 100x19
-      text run at (0,2400) width 100: "This is some text"
-    RenderBR {BR} at (100,2415) size 0x0
-    RenderText {#text} at (0,2420) size 100x19
-      text run at (0,2420) width 100: "This is some text"
-    RenderBR {BR} at (100,2435) size 0x0
-    RenderText {#text} at (0,2440) size 100x19
-      text run at (0,2440) width 100: "This is some text"
-    RenderBR {BR} at (100,2455) size 0x0
-    RenderText {#text} at (0,2460) size 100x19
-      text run at (0,2460) width 100: "This is some text"
-    RenderBR {BR} at (100,2475) size 0x0
-    RenderText {#text} at (0,2480) size 100x19
-      text run at (0,2480) width 100: "This is some text"
-    RenderBR {BR} at (100,2495) size 0x0
-    RenderText {#text} at (0,2500) size 100x19
-      text run at (0,2500) width 100: "This is some text"
-    RenderBR {BR} at (100,2515) size 0x0
-    RenderText {#text} at (0,2520) size 100x19
-      text run at (0,2520) width 100: "This is some text"
-    RenderBR {BR} at (100,2535) size 0x0
-    RenderText {#text} at (0,2540) size 100x19
-      text run at (0,2540) width 100: "This is some text"
-    RenderBR {BR} at (100,2555) size 0x0
-    RenderText {#text} at (0,2560) size 100x19
-      text run at (0,2560) width 100: "This is some text"
-    RenderBR {BR} at (100,2575) size 0x0
-    RenderText {#text} at (0,2580) size 100x19
-      text run at (0,2580) width 100: "This is some text"
-    RenderBR {BR} at (100,2595) size 0x0
-    RenderText {#text} at (0,2600) size 100x19
-      text run at (0,2600) width 100: "This is some text"
-    RenderBR {BR} at (100,2615) size 0x0
-    RenderText {#text} at (0,2620) size 100x19
-      text run at (0,2620) width 100: "This is some text"
-    RenderBR {BR} at (100,2635) size 0x0
-    RenderText {#text} at (0,2640) size 100x19
-      text run at (0,2640) width 100: "This is some text"
-    RenderBR {BR} at (100,2655) size 0x0
-    RenderText {#text} at (0,2660) size 100x19
-      text run at (0,2660) width 100: "This is some text"
-    RenderBR {BR} at (100,2675) size 0x0
-    RenderText {#text} at (0,2680) size 100x19
-      text run at (0,2680) width 100: "This is some text"
-    RenderBR {BR} at (100,2695) size 0x0