Skip to content

GitLab

T
tangled
Commit 5040512d authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot
Browse files
Options

Update multicol-height-block-child-001.xht to match the current spec. 

The multicol spec [1] changed at some point from saying to clip overflow
at the middle of column gaps, to saying that we shouldn't clip at all.

A lot of tests got adjusted to match this some time ago [2], but this one
was left behind.

[1] https://www.w3.org/TR/css-multicol-1/#overflow-inside-multicol-elements
[2] https://github.com/w3c/web-platform-tests/commit/b554395c79e502eee8cab95266461e607fa1d8e4

While Blink generally follows an old version of the spec, and therefore
clips, it miraculously fails to do so here. So the test passes, now that
it has been corrected.

Bug: 788337
Change-Id: I1b1e556102461e5442058f54d612fa7f696456c2
Reviewed-on: https://chromium-review.googlesource.com/822094Reviewed-by: default avatarRune Lillesveen <futhark@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#523393}
parent fb1b0636
Hide whitespace changes
Inline Side-by-side
Showing with 43 additions and 66 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 5040512d
......@@ -2431,7 +2431,6 @@ crbug.com/788337 external/wpt/css/css-multicol/multicol-block-no-clip-001.xht [
crbug.com/788337 external/wpt/css/css-multicol/multicol-block-no-clip-002.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-count-computed-003.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-count-computed-005.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-height-block-child-001.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-rule-004.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-rule-inset-000.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-rule-outset-000.xht [ Failure ]
......
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-height-block-child-001-ref.xht
View file @ 5040512d
......@@ -5,51 +5,34 @@
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/" />
<link rel="reviewer" title="Gérard Talbot" href="http://www.gtalbot.org/BrowserBugsSection/css21testsuite/" /> <!-- 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="support/black20x20.png" width="60" height="100" alt="Image download support must be enabled" /></div>
<div id="bottom"><img src="support/swatch-orange.png" width="60" height="60" alt="Image download support must be enabled" /></div>
<div style="font:20px/1 Ahem; width:22em; height:5em; background:blue;">
<div style="width:3em; height:5em; background:black;"></div>
</div>
<div style="font:20px/1 Ahem; width:14em; height:3em; background:blue;">
<div style="float:left; width:3em; height:3em; margin-right:5em; background:orange;"></div>
<div style="float:left; width:3em; height:3em; background:orange;"></div>
</div>
<!--
Expected results:
0em 14em 22em
v v v
0em 7em 14em 22em
v v v v
0 *********************************************
* bla | *
* bla | *
* bla | *
* bla | *
5 * bla | *
6 * orn |****************
7 * orn |
8 * orn |
* bla | | *
* bla | | *
* bla | | *
* bla | | *
5 * bla | | *
6 * orn | zzz |****************
7 * orn | zzz |
8 * orn | zzz |
*****************************
-->
</body>
</html>
\ No newline at end of file
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-height-block-child-001.xht
View file @ 5040512d
......@@ -54,40 +54,35 @@
</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
Both column boxes of div#inner start in the 1st column box of
div#outer multi-column element. All the 6 lines of div#inner will
be rendered inside the 1st column box of div#outer. The first three
lines in the first inner column, and the last three in the second
inner column, which will overflow the first outer column, and
actually appear as if they were part of the second outer column. No
clipping should occur, unless explicitly requested.
All the 6 lines of #inner fit in a column row that resides in the
first outer column. #inner has a fixed height, and is taller than
what can fit in the first outer column, so it needs to continue in
the second outer column, with no inner column content left to
fragment. #inner is a 14em wide block that is put into a 6em wide
outer column, so it will overflow the outer column all the way to
22em, relatively to the left edge of the outer multicol container.
Expected results:
0em 14em 22em
v v v
0em 7em 14em 22em
v v v v
0 *********************************************
* bla | *
* bla | *
* bla | *
* bla | *
5 * bla | *
6 * orn |****************
7 * orn |
8 * orn |
* bla | | *
* bla | | *
* bla | | *
* bla | | *
5 * bla | | *
6 * orn | zzz |****************
7 * orn | zzz |
8 * orn | zzz |
*****************************
-->
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment