Skip to content

GitLab

T
tangled
Commit 7d50fcb3 authored by Morten Stenshorne's avatar Morten Stenshorne Committed by Commit Bot
Browse files
Options

Rewrite wpt/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht 

It was invalid. Not quite sure what it assumed, but probably that
column-span:all was allowed to overlap with the column content that came
after.

Bug: 788337
Change-Id: I63d5279da9939a0e027bb1ed9084b03b3a32bacb
Reviewed-on: https://chromium-review.googlesource.com/803277
Commit-Queue: Morten Stenshorne <mstensho@chromium.org>
Reviewed-by: default avatarPhilip Jägenstedt <foolip@chromium.org>
Cr-Commit-Position: refs/heads/master@{#520936}
parent b62df366
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 64 deletions
third_party/WebKit/LayoutTests/TestExpectations
View file @ 7d50fcb3
...@@ -2489,7 +2489,6 @@ crbug.com/626703 [ Win ] external/wpt/css/css-writing-modes/box-offsets-rel-pos- ...@@ -2489,7 +2489,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 # 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-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-block-no-clip-002.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht [ Failure ]
crbug.com/788337 external/wpt/css/css-multicol/multicol-break-001.xht [ Failure ] crbug.com/788337 external/wpt/css/css-multicol/multicol-break-001.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-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-002.xht [ Failure ]
......
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-br-inside-avoidcolumn-001.xht
View file @ 7d50fcb3
...@@ -5,47 +5,33 @@ ...@@ -5,47 +5,33 @@
<title>multicol | break-inside: avoid-column</title> <title>multicol | break-inside: avoid-column</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/> <link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-breaks"/> <link rel="help" href="http://www.w3.org/TR/css3-multicol/#column-breaks"/>
<link rel="match" href="multicol-br-inside-avoidcolumn-ref.xht"/> <link rel="match" href="../reference/ref-filled-green-200px-square.html"/>
<meta name="flags" content=""/> <meta name="flags" content=""/>
<style type="text/css"><![CDATA[ <style type="text/css"><![CDATA[
html { .multicol {
width: 800px; column-count: 2;
background: white; column-gap: 0;
column-fill: auto;
overflow: hidden;
width: 200px;
height: 300px;
} }
body { .multicol > div {
background: black; height: 200px;
column-count: 3; break-inside: avoid-column;
column-gap: 0; background: green;
column-fill: auto;
height: 300px;
} }
h1 { .multicol > div.red {
column-span: all; background:red;
color: white;
}
div { background: red;
height: 150px;
break-inside: avoid-column;
}
span {
float: left;
} }
]]></style> ]]></style>
</head> </head>
<body> <body>
<h1>You should not see the word FAIL</h1> <p>Test passes if there is a filled green square and <strong>no red</strong>.</p>
<div class="multicol">
<div> <div></div>
<span>FAIL</span> <div></div>
</div> <div class="red"></div>
<div>
<span>FAIL</span>
</div>
<div>
<span>FAIL</span>
</div> </div>
</body> </body>
</html> </html>
third_party/WebKit/LayoutTests/external/wpt/css/css-multicol/multicol-br-inside-avoidcolumn-ref.xht deleted 100644 → 0
View file @ b62df366
<!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>multicol | break-inside: avoid-column</title>
<link rel="author" title="Opera Software ASA" href="http://www.opera.com/"/>
<style type="text/css"><![CDATA[
html {
width: 800px;
background: white;
}
h1 {
color: white;
margin-top: 0;
padding-top: 0.66em;
}
div {
height: 450px;
background: black;
height: 300px;
}
]]></style>
</head>
<body>
<div>
<h1>You should not see the word FAIL</h1>
</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