Diff
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/ChangeLog 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,3 +1,17 @@
+2017-03-08 Dave Hyatt <[email protected]>
+
+ CSS Multicolumn should not clip columns horizontally
+ https://bugs.webkit.org/show_bug.cgi?id=169363
+
+ Reviewed by Sam Weinig.
+
+ * fast/multicol/newmulticol/adjacent-spanners-expected.html:
+ * fast/multicol/newmulticol/adjacent-spanners.html:
+ * fast/multicol/newmulticol/clipping-expected.html:
+ * fast/multicol/newmulticol/clipping.html:
+ * fast/multicol/newmulticol/spanner-inline-block-expected.html:
+ * fast/multicol/newmulticol/spanner-inline-block.html:
+
2017-03-07 Zalan Bujtas <[email protected]>
Simple line layout: Do not use invalid m_lastNonWhitespaceFragment while removing trailing whitespace.
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners-expected.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners-expected.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -5,9 +5,10 @@
</head>
<body>
<p>You should see the word 'PASS' twice below, and no red:</p>
- <br>
- <div>PASS<br> </div>
- <div>PASS<br> </div>
- <br>
+
+ <div style="width:400px">
+ <div style="border:1px solid black;">PASS<br> </div>
+ <div style="border:1px solid black;">PASS<br> </div>
+ </div>
</body>
</html>
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/adjacent-spanners.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -5,13 +5,12 @@
</head>
<body>
<p>You should see the word 'PASS' twice below, and no red:</p>
- <div style="-webkit-columns:4; columns:4; -webkit-column-gap:0; column-gap:0; width:4em;">
- <br> FAIL<br>
+ <div style="-webkit-columns:2; columns:2; -webkit-column-gap:0; column-gap:0; width:400px">
<div style="background:red;">
- <div style="-webkit-column-span:all; column-span:all;">PASS<br> </div>
- <div style="-webkit-column-span:all; column-span:all;">PASS<br> </div>
+ <div style="-webkit-column-span:all; column-span:all;border:1px solid black">PASS<br> </div>
+ <div style="-webkit-column-span:all; column-span:all;border:1px solid black">PASS<br> </div>
</div>
- <br> FAIL<br>
+
</div>
</body>
</html>
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping-expected.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping-expected.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -8,22 +8,18 @@
color: black;
background: white;
}
- .mc {
- columns: 3;
- column-gap: 15px;
- column-fill: auto;
- -webkit-columns: 3;
- -webkit-column-gap: 15px;
- -webkit-column-fill: auto;
- height: 100px;
- box-sizing:border-box;
- border:10px solid green;
- background:white;
- }
+
+ .mc { border:10px solid green;height:100px; box-sizing:border-box }
+ .rect { float:left; border-right:10px solid green; width:115px; height:80px; box-sizing:border-box; }
</style>
</head>
<body>
<p>There should be a rectangle with a solid 10px thick green border below, and no red.</p>
- <div class="mc"></div>
+ <div class="mc">
+ <div class="rect"></div>
+
+ <div class="rect"></div>
+
+ </div>
</body>
</html>
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/clipping.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -16,6 +16,9 @@
-webkit-columns: 3;
-webkit-column-gap: 15px;
-webkit-column-fill: auto;
+ -moz-columns:3;
+ -moz-column-gap:15px;
+ -moz-column-fill:auto;
height: 100px;
background: red;
}
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block-expected.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block-expected.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block-expected.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -4,6 +4,12 @@
<title>Inline-block as spanner (not allowed)</title>
</head>
<body>
- <p>There should be nothing below.</p>
+ <p>The inline block should be contained in a single column below.</p>
+ <div style="width:200px; ">
+ <div style="display:inline-block; width:100%; height:100px;-webkit-column-span:all; column-span:all; margin-left:1em;border:5px solid green">
+
+ </div>
+ <br><br>
+ </div>
</body>
</html>
Modified: releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block.html (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block.html 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/fast/multicol/newmulticol/spanner-inline-block.html 2017-03-13 11:45:42 UTC (rev 213832)
@@ -4,10 +4,10 @@
<title>Inline-block as spanner (not allowed)</title>
</head>
<body>
- <p>There should be nothing below.</p>
- <div style="-webkit-columns:6; columns:6; -webkit-column-gap:0; column-gap:0; width:4em; overflow:hidden;">
- <div style="display:inline-block; -webkit-column-span:all; column-span:all; margin-left:1em;">
- FAIL
+ <p>The inline block should be contained in a single column below.</p>
+ <div style="-webkit-columns:2; columns:2; -webkit-column-gap:0; column-gap:0; width:400px; ">
+ <div style="display:inline-block; width:100%; height:100px;-webkit-column-span:all; column-span:all; margin-left:1em;border:5px solid green">
+
</div>
<br><br>
</div>
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,33 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-24 -->
- <meta name="flags" content="image" />
- <style type="text/css"><![CDATA[
- table
- {
- border-spacing: 0px;
- border: gray solid 1em;
- font: 1.25em/1 serif;
- }
-
- td
- {
- padding: 0;
- width: 3em;
- }
-
- td + td {width: 8em;}
-
- img, td {vertical-align: top;}
- ]]></style>
- </head>
- <body>
- <table>
- <tr>
- <td><img src="" width="40" height="80" alt="Image download support must be enabled" /><img src="" width="50" height="20" alt="Image download support must be enabled" /></td><td><img src="" width="40" height="80" alt="Image download support must be enabled" /></td>
- </tr></table>
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-001.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,49 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: Overflowed content inside multicol element</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-24 -->
- <link rel="help" href="" title="8.1. Overflow inside multicol elements" />
- <link rel="match" href=""
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that content in the normal flow that extends into column gaps is clipped in the middle of the column gap." />
- <style type="text/css"><![CDATA[
- div
- {
- border: gray solid 1em;
- font: 1.25em/1 Ahem;
- orphans: 1;
- widows: 1;
- width: 11em;
-
- column-count: 4;
- column-gap: 1em;
- }
-
- h4
- {
- background: black;
- color: black;
- font: inherit;
- margin: 0;
- width: 11em;
- }
-
- #first-column {color: blue;}
-
- #second-column {color: orange;}
-
- #third-column, #fourth-column {color: white;}
- ]]></style>
- </head>
- <body>
- <div>
- <span id="first-column"> ab cd ef gh </span>
- <h4> 1234567890123 </h4>
- <span id="second-column"> ij kl mn oq </span>
- <span id="third-column"> ab cd ef gh </span>
- <span id="fourth-column"> rs tu vw xy </span>
- </div>
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-24 -->
- <meta name="flags" content="image" />
- <style type="text/css"><![CDATA[
- div
- {
- font: 1.25em/1 serif;
- border: 1em solid gray;
- width: 11em;
- height: 6em;
- position: relative;
- }
-
- img {position: absolute;}
-
- img#black {top: 4em;}
-
- img#first-orange {top: 5em;}
-
- img#second-orange {left: 4em;}
-
- img#first-pink
- {
- left: 4em;
- top: 3em;
- }
-
- img#second-pink {left: 8em;}
-
- img#yellow
- {
- left: 8em;
- top: 1em;
- }
- ]]></style>
- </head>
- <body>
-
- <div>
- <img id="blue" src="" width="40" height="80" alt="Image download support must be enabled" />
- <img id="black" src="" width="70" height="20" alt="Image download support must be enabled" />
- <img id="first-orange" src="" width="40" height="20" alt="Image download support must be enabled" />
- <img id="second-orange" src="" width="40" height="60" alt="Image download support must be enabled" />
- <img id="first-pink" src="" width="40" height="60" alt="Image download support must be enabled" />
- <img id="second-pink" src="" width="40" height="20" alt="Image download support must be enabled" />
- <img id="yellow" src="" width="40" height="80" alt="Image download support must be enabled" />
- </div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-block-clip-002.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,51 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: Overflowed content inside and outside multicol element</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-24 -->
- <link rel="help" href="" title="8.1. Overflow inside multicol elements" />
- <link rel="match" href=""
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that content in the normal flow that extends into column gaps is clipped in the middle of the column gap." />
- <style type="text/css"><![CDATA[
- div
- {
- border: gray solid 1em;
- font: 1.25em/1 Ahem;
- orphans: 1;
- widows: 1;
- width: 11em;
-
- column-count: 3;
- column-gap: 1em;
- }
-
- h4
- {
- background: black;
- color: black;
- font: inherit;
- margin: 0;
- width: 11em;
- }
-
- #first-column {color: blue;}
-
- #second-column {color: orange;}
-
- #third-column {color: pink;}
-
- #fourth-column {color: yellow;}
- ]]></style>
- </head>
- <body>
- <div>
- <span id="first-column"> ab cd ef gh </span>
- <h4> 1234567890123 </h4>
- <span id="second-column"> ij kl mn oq </span>
- <span id="third-column"> ab cd ef gh </span>
- <span id="fourth-column"> rs tu vw xy </span>
- </div>
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-29 -->
- <meta name="flags" content="image" />
-
- <style type="text/css"><![CDATA[
- img {vertical-align: top;}
- ]]></style>
- </head>
-
- <body>
-
- <div><img src="" width="300" height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="20" height="20" alt="Image download support must be enabled" /><img src="" width="70" height="20" alt="Image download support must be enabled" /><img src="" width="15" height="20" alt="Image download support must be enabled" /><img src="" width="35" height="20" alt="Image download support must be enabled" /><img src="" width="80" height="20" alt="Image download support must be enabled" /><img src="" width="60" height="20" alt="Image download support must be enabled" /><img src="" width="20&q
uot; height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="20" height="20" alt="Image download support must be enabled" /><img src="" width="70" height="20" alt="Image download support must be enabled" /><img src="" width="15" height="20" alt="Image download support must be enabled" /><img src="" width="35" height="20" alt="Image download support must be enabled" /><img src="" width="80" height="20" alt="Image download support must be enabled" /><img src="" width="60" height="20" alt="Image download support must be enabled" /><img src="" width="20&q
uot; height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="300" height="20" alt="Image download support must be enabled" /></div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-003.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,87 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-29 -->
- <link rel="help" href="" title="3. The number and width of columns" />
- <link rel="match" href="" />
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st column-rule." />
- <style type="text/css"><![CDATA[
- div
- {
- background: yellow;
- border: gray solid 1em;
- color: black;
- font: 1.25em/1 Ahem;
- orphans: 1;
- widows: 1;
- width: 13em;
-
- column-count: 3;
- column-gap: 5em;
- column-rule-color: blue;
- column-rule-style: solid;
- column-rule-width: 1.5em;
- }
-
- /*
- (11) if (column-width = auto) and (column-count != auto) then
- (12) N := column-count;
- (13) W := max(0, (available-width - ((N - 1) * column-gap)) / N);
- (14) exit;
-
- So, the used column-count in this test is 3.
-
- W := max(0, (available-width - ((N - 1) * column-gap)) / N);
- W == max(0, (13em - ((3 - 1) * 5em)) / 3);
- W == max(0, (13em - (2 * 5em)) / 3);
- W == max(0, (13em - (10em)) / 3);
- W == max(0, (3em) / 3);
- W == max(0, 1em);
- W == 1em;
-
- So, the used column-width in this test is 1em.
- */
-
- #pink {color: pink;}
- #orange {color: orange;}
- #purple {color: purple;}
- #gray {color: gray;}
-
- /*
- Since
- "
- Content in the normal flow that extends into
- column gaps (e.g., long words or images) is
- clipped in the middle of the column gap.
- "
- http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
- this causes the right-half (0.5em) of the 'K' glyph to
- be overlapped by the right-half (0.75em) of the 1st blue column-rule.
- Same thing should happen to the 'N' glyph of 'ORAN'.
-
- Because no inline content should be rendered into the
- 3rd column box, this causes the 2nd column rule not
- been rendered because
- "
- Column rules are only drawn between two columns that
- both have content.
- "
- http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
- */
- ]]></style>
- </head>
-
- <body>
-
- <div>
- <span id="pink">PINK</span>
- <span id="orange">ORAN</span>
- <span id="purple">PURP</span>
- <span id="gray">GRAY</span>
- </div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,25 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-07-29 -->
- <meta name="flags" content="image" />
-
- <style type="text/css"><![CDATA[
- img {vertical-align: top;}
- ]]></style>
- </head>
-
- <body>
-
- <div><img src="" width="300" height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="20" height="20" alt="Image download support must be enabled" /><img src="" width="70" height="20" alt="Image download support must be enabled" /><img src="" width="15" height="20" alt="Image download support must be enabled" /><img src="" width="35" height="20" alt="Image download support must be enabled" /><img src="" width="80" height="20" alt="Image download support must be enabled" /><img src="" width="60" height="20" alt="Image download support must be enabled" /><img src="" width="20&q
uot; height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="20" height="20" alt="Image download support must be enabled" /><img src="" width="70" height="20" alt="Image download support must be enabled" /><img src="" width="15" height="20" alt="Image download support must be enabled" /><img src="" width="35" height="20" alt="Image download support must be enabled" /><img src="" width="80" height="20" alt="Image download support must be enabled" /><img src="" width="60" height="20" alt="Image download support must be enabled" /><img src="" width="20&q
uot; height="20" alt="Image download support must be enabled" /></div>
-
- <div><img src="" width="300" height="20" alt="Image download support must be enabled" /></div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-count-computed-005.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,91 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: column-rule and overflow inside (complex test)</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-08-03 -->
- <link rel="help" href="" title="3. The number and width of columns" />
- <link rel="match" href="" />
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that if one of 2 adjacent column boxes (2nd and 3rd colum box in this test) does not have any content, then the column rule separating those should not be drawn. In this test, the 3rd colum box should have no inline content. This test also checks that inline content in the normal flow that extends into a column gap should be clipped in the middle of the column gap. So, in this test, inline content in 1st column box should be partially clipped and overlapped partially by 1st column-rule." />
- <style type="text/css"><![CDATA[
- div
- {
- background: yellow;
- border: gray solid 1em;
- color: black;
- font: 1.25em/1 Ahem;
- orphans: 1;
- widows: 1;
- width: 13em;
-
- column-gap: 5em;
- column-rule-color: blue;
- column-rule-style: solid;
- column-rule-width: 1.5em;
- column-width: 1em;
- }
-
- /*
- (15) if (column-width != auto) and (column-count = auto) then
- (16) N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
- (17) W := ((available-width + column-gap) / N) - column-gap;
- (18) exit;
-
- N := max(1, floor((available-width + column-gap) / (column-width + column-gap)));
- N == max(1, floor((13em + 5em) / (1em + 5em)));
- N == max(1, floor(18em / 6em));
- N == max(1, floor(3));
- N == 3;
-
- So, the used column-count in this test is 3.
-
- W := ((available-width + column-gap) / N) - column-gap;
- W == ((13em + 5em) / 3) - 5em;
- W == ((18em) / 3) - 5em;
- W == (6em) - 5em;
- W == 1em;
-
- So, the used column-width in this test is 1em.
- */
-
- #pink {color: pink;}
- #orange {color: orange;}
- #purple {color: purple;}
- #gray {color: gray;}
-
- /*
- Since
- "
- Content in the normal flow that extends into
- column gaps (e.g., long words or images) is
- clipped in the middle of the column gap.
- "
- http://www.w3.org/TR/css3-multicol/#overflow-inside-multicol-elements
- this causes the right-half (0.5em) of the 'K' glyph to
- be overlapped by the right-half (0.75em) of the 1st blue column-rule.
- Same thing should happen to the 'N' glyph of 'ORAN'.
-
- Because no inline content should be rendered into the
- 3rd column box, this causes the 2nd column rule not
- been rendered because
- "
- Column rules are only drawn between two columns that
- both have content.
- "
- http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules
- */
- ]]></style>
- </head>
-
- <body>
-
- <div>
- <span id="pink">PINK</span>
- <span id="orange">ORAN</span>
- <span id="purple">PURP</span>
- <span id="gray">GRAY</span>
- </div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,55 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-08-08 -->
- <meta name="flags" content="image" />
- <style type="text/css"><![CDATA[
- div
- {
- background-color: blue;
- font: 1.25em/1 serif;
- }
-
- div#top
- {
- height: 5em;
- width: 22em;
- }
-
- div#bottom
- {
- height: 3em;
- width: 14em;
- }
-
- img {vertical-align: top;}
- ]]></style>
- </head>
- <body>
- <div id="top"><img src="" width="60" height="100" alt="Image download support must be enabled" /></div>
-
- <div id="bottom"><img src="" width="60" height="60" alt="Image download support must be enabled" /></div>
-
- <!--
-
- Expected results:
-
- 0em 14em 22em
- v v v
-0 *********************************************
- * bla | *
- * bla | *
- * bla | *
- * bla | *
-5 * bla | *
-6 * orn |****************
-7 * orn |
-8 * orn |
- *****************************
-
- -->
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-height-block-child-001.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,96 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: multi-column element with child block (complex)</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-08-08 -->
- <link rel="help" href="" title="2. The multi-column model" />
- <link rel="bookmark" href="" title="[css3-multicol] Nested multicolumn elements rendering" />
- <link rel="match" href="" />
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks that a nested multi-column element's inline content could be clipped horizontally." />
- <style type="text/css"><![CDATA[
- div
- {
- background-color: blue;
- font: 20px/1 Ahem;
- height: 8em;
- width: 14em;
-
- column-count: 2;
- column-gap: 2em;
-
- /*
-
- N == 2;
-
- W == 6em;
-
- H == 8em;
-
- */
- }
-
- div#outer
- {
- color: black;
- column-fill: auto;
- }
-
- div#inner
- {
- color: orange;
- column-fill: balance;
- }
- ]]></style>
- </head>
- <body>
-
- <div id="outer">
- bla bla bla bla bla
-
- <div id="inner">orn orn orn zzz zzz zzz</div>
-
- </div>
-
- <!--
- Both column boxes of div#inner start in the 1st
- column box of div#outer multi-column element.
- The first 3 lines boxes of 1st
- column box of div#inner will be rendered inside the
- 1st column box of div#outer but not its 2nd.
- Because 1st column box of div#outer is
- 6em wide while the div#inner multi-column element
- is 14em wide, this makes the first 3 line boxes
- (with the 'z' trios) of 2nd column box of div#inner
- clipped.
-
- Then, at this point, the div#inner multi-column
- element should be fragmented in order to continue to
- render the 5 empty line boxes it has into the
- 2nd column box of div#outer. Since those 5 line
- boxes are empty, we only see the extension it
- creates horizontally, which is
- 14em - 6em == 8em horizontally and
- 5 lines boxes == 5em tall
-
-
- Expected results:
-
- 0em 14em 22em
- v v v
-0 *********************************************
- * bla | *
- * bla | *
- * bla | *
- * bla | *
-5 * bla | *
-6 * orn |****************
-7 * orn |
-8 * orn |
- *****************************
-
- -->
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001-expected.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001-expected.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001-expected.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,54 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Reftest Reference</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-08-22 -->
- <meta name="flags" content="image" />
- <style type="text/css"><![CDATA[
- div
- {
- font: 1.25em/1 serif;
- border: 1em solid gray;
- width: 11em;
- height: 5em;
- position: relative;
- }
-
- img {position: absolute;}
-
- img#first-blue {left: 0em; top: 0em;}
-
- img#second-blue {left: 3em; top: 0em;}
-
- img#first-pink {left: 6em; top: 0em;}
-
- img#second-pink {left: 9em; top: 0em;}
-
- img#black {left: 0em; top: 2em;}
-
- img#first-yellow {left: 6em; top: 2em;}
-
- img#second-yellow {left: 9em; top: 2em;}
-
- img#first-orange {left: 0em; top: 3em;}
-
- img#second-orange {left: 3em; top: 3em;}
- ]]></style>
- </head>
- <body>
-
- <div>
- <img id="first-blue" src="" width="40" height="40" alt="Image download support must be enabled" /> <img id="second-blue" src="" width="40" height="40" alt="Image download support must be enabled" /> <img id="first-pink" src="" width="40" height="40" alt="Image download support must be enabled" /> <img id="second-pink" src="" width="40" height="40" alt="Image download support must be enabled" />
-
- <img id="black" src="" width="110" height="20" alt="Image download support must be enabled" />
-
- <img id="first-yellow" src="" width="40" height="40" alt="Image download support must be enabled" />
- <img id="second-yellow" src="" width="40" height="40" alt="Image download support must be enabled" />
-
- <img id="first-orange" src="" width="40" height="40" alt="Image download support must be enabled" />
- <img id="second-orange" src="" width="40" height="40" alt="Image download support must be enabled" />
- </div>
-
- </body>
-</html>
\ No newline at end of file
Deleted: releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001.xht (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001.xht 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/LayoutTests/imported/w3c/css/css-multicol-1/multicol-span-none-001.xht 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,61 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
- <head>
- <title>CSS Multi-column Layout Test: column-span: none (basic)</title>
- <link rel="author" title="Opera Software ASA" href="" />
- <link rel="reviewer" title="Gérard Talbot" href="" /> <!-- 2013-08-22 -->
- <link rel="help" href="" title="6.1. 'column-span'" />
- <link rel="match" href="" />
- <meta name="flags" content="ahem" />
- <meta name="assert" content="This test checks how a 'column-span: none' element is rendered: it should not span across all column boxes." />
- <style type="text/css"><![CDATA[
- div
- {
- border: gray solid 1em;
- font: 1.25em/1 Ahem;
- orphans: 1;
- widows: 1;
- width: 11em;
-
- column-count: 2;
- column-gap: 1em;
-
- /*
-
- N == 2;
-
- W == 5em;
-
- */
- }
-
- h4
- {
- background: black;
- color: black;
- font: inherit;
- margin: 0;
- width: 11em;
-
- column-span: none;
- }
-
- #column1-top {color: blue;}
-
- #column1-bottom {color: orange;}
-
- #column2-top {color: pink;}
-
- #column2-bottom {color: yellow;}
- ]]></style>
- </head>
- <body>
- <div>
- <span id="column1-top"> ab cd ef gh </span>
- <h4> 1234567890123 </h4>
- <span id="column1-bottom"> ij kl mn oq </span>
- <span id="column2-top"> ab cd ef gh </span>
- <span id="column2-bottom"> rs tu vw xy </span>
- </div>
- </body>
-</html>
\ No newline at end of file
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/ChangeLog 2017-03-13 11:45:42 UTC (rev 213832)
@@ -1,3 +1,17 @@
+2017-03-08 Dave Hyatt <[email protected]>
+
+ CSS Multicolumn should not clip columns horizontally
+ https://bugs.webkit.org/show_bug.cgi?id=169363
+
+ Reviewed by Sam Weinig.
+
+ Revised multiple tests in fast/multicol.
+
+ * rendering/RenderMultiColumnSet.cpp:
+ (WebCore::RenderMultiColumnSet::flowThreadPortionOverflowRect):
+ Stop clipping horizontally. Section 8.1 of the spec changed from "clip" to "don't clip",
+ so we're changing to match the latest draft. Keep iBooks-based pagination clipping though.
+
2017-03-07 Said Abou-Hallawa <[email protected]>
Asynchronous image decoding should consider the drawing size if it is smaller than the size of the image
Modified: releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderMultiColumnSet.cpp (213831 => 213832)
--- releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2017-03-13 11:44:45 UTC (rev 213831)
+++ releases/WebKitGTK/webkit-2.16/Source/WebCore/rendering/RenderMultiColumnSet.cpp 2017-03-13 11:45:42 UTC (rev 213832)
@@ -551,18 +551,19 @@
// top/bottom unless it's the first/last column.
LayoutRect overflowRect = overflowRectForFlowThreadPortion(portionRect, isFirstColumn && isFirstRegion(), isLastColumn && isLastRegion(), VisualOverflow);
- // Avoid overflowing into neighboring columns, by clipping in the middle of adjacent column
- // gaps. Also make sure that we avoid rounding errors.
- if (isHorizontalWritingMode()) {
- if (!isLeftmostColumn)
- overflowRect.shiftXEdgeTo(portionRect.x() - colGap / 2);
- if (!isRightmostColumn)
- overflowRect.shiftMaxXEdgeTo(portionRect.maxX() + colGap - colGap / 2);
- } else {
- if (!isLeftmostColumn)
- overflowRect.shiftYEdgeTo(portionRect.y() - colGap / 2);
- if (!isRightmostColumn)
- overflowRect.shiftMaxYEdgeTo(portionRect.maxY() + colGap - colGap / 2);
+ // For RenderViews only (i.e., iBooks), avoid overflowing into neighboring columns, by clipping in the middle of adjacent column gaps. Also make sure that we avoid rounding errors.
+ if (&view() == parent()) {
+ if (isHorizontalWritingMode()) {
+ if (!isLeftmostColumn)
+ overflowRect.shiftXEdgeTo(portionRect.x() - colGap / 2);
+ if (!isRightmostColumn)
+ overflowRect.shiftMaxXEdgeTo(portionRect.maxX() + colGap - colGap / 2);
+ } else {
+ if (!isLeftmostColumn)
+ overflowRect.shiftYEdgeTo(portionRect.y() - colGap / 2);
+ if (!isRightmostColumn)
+ overflowRect.shiftMaxYEdgeTo(portionRect.maxY() + colGap - colGap / 2);
+ }
}
return overflowRect;
}
