Skip to content

GitLab

T
tangled
Commit 65f37048 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot
Browse files
Options

Remove css-multicol tests assuming that column-gap affects column-count. 

This may have been correct with some version of the spec, but the
current one just says to use column-count as specified, if column-width
is auto.  There's nothing that suggests that the width of column-gap
should affect used column-count.

https://www.w3.org/TR/css-multicol-1/#pseudo-algorithm

See line 04 below.
(01)  if ((column-width = auto) and (column-count = auto)) then
(02)      exit; /* not a multicol element */
(03)  if column-width = auto then
(04)      N := column-count

Bug: 788337
Change-Id: I583aa0c3752a9a43b9b59725be2aa67d947487c9
Reviewed-on: https://chromium-review.googlesource.com/805975Reviewed-by: default avatarPhilip Jägenstedt <foolip@chromium.org>
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521343}
parent 7f1542b7
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 229 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 65f37048
......@@ -2384,8 +2384,6 @@ crbug.com/626703 [ Win ] external/wpt/css/css-writing-modes/box-offsets-rel-pos-
# css-multicol tests failing on initial import from web-platform-tests
crbug.com/788337 external/wpt/css/css-multicol/multicol-block-no-clip-001.xht [ Failure ]
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-001.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-count-computed-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-count-large-001.xht [ Failure ]
......
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-count-computed-001.xht deleted 100644 → 0
View file @ 7f1542b7
<!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>multicolumn | column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-count-computed-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
body {
margin: 0;
}
div {
font-family: ahem;
font-size: 1em;
line-height: 1em;
color: black;
background: yellow;
margin: 1em;
border: 1em solid gray;
width: 12em;
widows: 1;
orphans: 1;
column-count: 3;
column-gap: 6em;
column-rule-color: blue;
column-rule-width: 1.5em;
column-rule-style: solid;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#grey {color: grey;}
]]></style>
</head>
<body>
<div>
<span id="pink">xxxx</span>
<span id="orange">xxxx</span>
<span id="purple">xxxx</span>
<span id="grey">xxxx</span>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-count-computed-002.xht deleted 100644 → 0
View file @ 7f1542b7
<!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>multicolumn | column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#the-number-and-width-of-columns"/>
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-gaps-and-rules"/>
<link rel="match" href="multicol-count-computed-2-ref.xht"/>
<meta name="flags" content="ahem"/>
<style type="text/css"><![CDATA[
body {
margin: 0;
}
div {
font-family: ahem;
font-size: 1em;
line-height: 1em;
color: black;
background: yellow;
margin: 1em;
border: 1em solid gray;
width: 12em;
widows: 1;
orphans: 1;
column-count: 3;
column-gap: 7em;
column-rule-color: red;
column-rule-width: 1.5em;
column-rule-style: solid;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#grey {color: grey;}
]]></style>
</head>
<body>
<div>
<span id="pink">xxxx</span>
<span id="orange">xxxx</span>
<span id="purple">xxxx</span>
<span id="grey">xxxx</span>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-count-computed-2-ref.xht deleted 100644 → 0
View file @ 7f1542b7
<!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>multicolumn | column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<style type="text/css"><![CDATA[
body {
margin: 0;
}
div {
font-family: ahem;
font-size: 1em;
line-height: 1em;
color: black;
background: yellow;
margin: 1em;
border: 1em solid gray;
width: 12em;
height: 2em;
position: relative;
widows: 1;
orphans: 1;
}
#pink {color: pink;}
#orange {color: orange;}
#purple {color: purple;}
#grey {color: grey;}
span {
display: block;
position: absolute;
}
#orange {
left: 5em;
top: 0;
}
#purple {
left: 0;
top: 1em;
}
#grey {
left: 5em;
top: 1em;
}
]]></style>
</head>
<body>
<div>
<span id="purple">xxxx</span>
<span id="orange">xxxx</span>
<span id="grey">xxxx</span>
<span id="pink">xxxx</span>
</div>
</body>
</html>
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-count-computed-ref.xht deleted 100644 → 0
View file @ 7f1542b7
<!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>multicolumn | column-rule</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<style type="text/css"><![CDATA[
body {
margin: 0;
}
div {
font-family: ahem;
font-size: 1em;
line-height: 1em;
color: black;
background: yellow;
margin: 1em;
border: 1em solid gray;
width: 12em;
height: 2em;
position: relative;
widows: 1;
orphans: 1;
}
span {
display: block;
position: absolute;
}
#pink {
color: pink;
}
#orange {
color: orange;
left: 0;
top: 1em;
}
#purple {
color: purple;
left: 9em;
top: 0;
}
#grey {
color: grey;
left: 9em;
top: 1em;
}
#blue {
left: 5.25em;
top: 0;
width: 1.5em;
height: 2em;
background: blue;
}
]]></style>
</head>
<body>
<div>
<span id="pink">xxxx</span>
<span id="orange">xxxx</span>
<span id="purple">xxxx</span>
<span id="grey">xxxx</span>
<span id="blue"></span>
</div>
</body>
</html>
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