Bug 946835 part 5: Add reftest for finding baseline of multi-line flex container, with baseline-aligned items on first line and flex-wrap:wrap-reverse. r=mats

--HG--
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-3-ref.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-4-ref.html
rename : layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-3.html => layout/reftests/w3c-css/submitted/flexbox/flexbox-baseline-multi-line-horiz-4.html
This commit is contained in:
Daniel Holbert 2013-12-18 10:34:48 -08:00
parent 8d8da19952
commit 2e5284f31f
3 changed files with 160 additions and 0 deletions

View File

@ -0,0 +1,86 @@
<!DOCTYPE html>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html>
<head>
<title>CSS Reftest Reference</title>
<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css3-flexbox/#flex-baselines">
<meta charset="utf-8">
<style>
/* We use an outer vertical flex container, wrapping two single-line
flex containers, to match the testcase's multi-line flex container. */
.outerFlexContainer {
height: 100px;
background: lightgray;
display: inline-flex;
flex-direction: column-reverse;
justify-content: center; /* to mimic testcase's "align-content:center" */
}
.flexContainer {
display: flex;
width: 40px;
}
.flexContainer > * {
width: 18px;
}
.smallFont {
font-size: 8px;
line-height: 8px;
}
.medFont {
font-size: 12px;
line-height: 12px;
}
.bigFont {
font-size: 16px;
line-height: 16px;
}
</style>
</head>
<body>
a
<!-- Flex container with second item in first line baseline-aligned
(should set the container's baseline) -->
<div class="outerFlexContainer">
<div class="flexContainer">
<div class="medFont">b</div>
<div class="bigFont" style="align-self: baseline">c</div>
</div>
<div class="flexContainer">
<div class="medFont">d</div>
<div class="smallFont">e</div>
</div>
</div>
<!-- Flex container with both items in first line baseline-aligned
(should set the container's baseline) -->
<div class="outerFlexContainer">
<div class="flexContainer">
<div class="smallFont" style="align-self: baseline">f</div>
<div class="medFont" style="align-self: baseline">g</div>
</div>
<div class="flexContainer">
<div class="bigFont">h</div>
<div class="smallFont">i</div>
</div>
</div>
<!-- Flex container with all items baseline-aligned
(only those on first line should set the container's baseline) -->
<div class="outerFlexContainer">
<div class="flexContainer" style="align-items: baseline">
<div class="bigFont">j</div>
<div class="smallFont" style="padding-bottom: 20px">k</div>
</div>
<div class="flexContainer" style="align-items: baseline">
<div class="smallFont">l</div>
<div class="medFont">m</div>
</div>
</div>
n
</body>
</html>

View File

@ -0,0 +1,73 @@
<!DOCTYPE html>
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
-->
<html>
<head>
<title>CSS Test: Testing the baseline of a horizontal multi-line (wrap-reverse) flex container with baseline-aligned items on first line</title>
<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com">
<link rel="help" href="http://www.w3.org/TR/css3-flexbox/#flex-baselines">
<link rel="match" href="flexbox-baseline-multi-line-horiz-4-ref.html">
<meta charset="utf-8">
<style>
.flexContainer {
display: inline-flex;
flex-wrap: wrap-reverse;
width: 40px;
height: 100px;
background: lightgray;
/* Use "align-content", to test that packing space is considered when
getting container's baseline from its first FlexLine:*/
align-content: center;
}
.flexContainer > * {
width: 18px;
}
.smallFont {
font-size: 8px;
line-height: 8px;
}
.medFont {
font-size: 12px;
line-height: 12px;
}
.bigFont {
font-size: 16px;
line-height: 16px;
}
</style>
</head>
<body>
a
<!-- Flex container with second item in first line baseline-aligned
(should set the container's baseline) -->
<div class="flexContainer">
<div class="medFont">b</div>
<div class="bigFont" style="align-self: baseline">c</div>
<div class="medFont">d</div>
<div class="smallFont">e</div>
</div>
<!-- Flex container with both items in first line baseline-aligned
(should set the container's baseline) -->
<div class="flexContainer">
<div class="smallFont" style="align-self: baseline">f</div>
<div class="medFont" style="align-self: baseline">g</div>
<div class="bigFont">h</div>
<div class="smallFont">i</div>
</div>
<!-- Flex container with all items baseline-aligned, and with some padding
(only those on first line should set the container's baseline) -->
<div class="flexContainer" style="align-items: baseline">
<div class="bigFont">j</div>
<div class="smallFont" style="padding-bottom: 20px">k</div>
<div class="smallFont">l</div>
<div class="medFont">m</div>
</div>
n
</body>
</html>

View File

@ -36,6 +36,7 @@ fuzzy-if(Android,158,32) == flexbox-align-self-vert-rtl-1.xhtml flexbox-align-s
== flexbox-baseline-multi-line-horiz-1.html flexbox-baseline-multi-line-horiz-1-ref.html
== flexbox-baseline-multi-line-horiz-2.html flexbox-baseline-multi-line-horiz-2-ref.html
== flexbox-baseline-multi-line-horiz-3.html flexbox-baseline-multi-line-horiz-3-ref.html
== flexbox-baseline-multi-line-horiz-4.html flexbox-baseline-multi-line-horiz-4-ref.html
== flexbox-baseline-single-item-1a.html flexbox-baseline-single-item-1-ref.html
== flexbox-baseline-single-item-1b.html flexbox-baseline-single-item-1-ref.html