aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2016-04-07 09:58:26 +0200
committerMs2ger <Ms2ger@gmail.com>2016-04-07 15:10:43 +0200
commit7deaeea707fdc42e2c3b1ebe9c5116b47529de80 (patch)
tree94221817f1137f1b7a270626e8d9a9ef28f9bf79 /tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference
parent1a6245828a96e3afda8eb8661df0834fde3dfea6 (diff)
downloadservo-7deaeea707fdc42e2c3b1ebe9c5116b47529de80.tar.gz
servo-7deaeea707fdc42e2c3b1ebe9c5116b47529de80.zip
Update CSS tests to revision aac1cd51245c0c469325988a0446985a2f1e476c
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference')
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht2
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht26
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht4
3 files changed, 14 insertions, 18 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht
index 3ac0639340b..45c6e583630 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/css-flexbox-column-ref.xht
@@ -25,7 +25,7 @@
<div class="item">456</div>
<div class="item">def</div>
<div class="item">789</div>
- <div class="item">ghi</div>
+ <div class="item">stu</div>
</div>
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht
index 0cc62afefc8..df7aff59d7f 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-table-fixup-001-ref.xht
@@ -1,22 +1,17 @@
<!--
Any copyright is dedicated to the Public Domain.
http://creativecommons.org/publicdomain/zero/1.0/
---><!-- Reference case for table-fixup on table parts inside of a
- flex container. --><html xmlns="http://www.w3.org/1999/xhtml">
+--><!-- Reference case for ensuring table-fixup does not happen to adjacent
+ table parts directly inside of a flex container. --><html xmlns="http://www.w3.org/1999/xhtml">
<head>
<title>CSS Reftest Reference</title>
<link rel="author" title="Daniel Holbert" href="mailto:dholbert@mozilla.com"/>
<style>
div.flexbox {
border: 1px dashed blue;
- }
-
- <!-- NOTE: table-fixup pads each td element by 1px on each side. We
- override that for top & bottom, for simplicity. So the td makes us
- generate a box that's 2px wider than its contents. -->
- td {
- padding-top: 0px;
- padding-bottom: 0px;
+ width: 200px;
+ display: flex;
+ justify-content: space-around;
}
.a {
@@ -36,14 +31,11 @@
</style>
</head>
<body>
- <!-- Just 2 adjacent table cells (they end up in the same table) -->
- <div class="flexbox" style="padding-left: 50px; width: 150px"><td class="a">cell1</td><td class="b">cell2</td></div>
+ <!-- In each example here, we simply use blocks instead of table parts -->
+ <div class="flexbox"><div class="a">cell1</div><div class="b">cell2</div></div>
- <!-- Table cell followed by tbody (they end up in the same table) -->
- <div class="flexbox" style="padding-left: 75px; width: 125px"><td class="a">cell1</td><tbody class="b">t</tbody></div>
+ <div class="flexbox"><div class="a">cell1</div><div class="b">t</div></div>
- <!-- Empty table cell (ends up occupying 2px of width), followed by div,
- followed by nonempty table cell. (3 flex items). -->
- <div class="flexbox" style="padding-left: 52px; width: 148px"><div style="display: inline-block;" class="c">div</div><div style="display: inline-table; margin-left: 50px"><td class="b">cell1</td></div></div>
+ <div class="flexbox"><div/><div class="b">cell1</div></div>
</body>
</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht
index 364f554c3c8..69df8dd4ebc 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-with-pseudo-elements-003-ref.xht
@@ -23,10 +23,14 @@
.fakeBefore {
content: 'b';
background: yellow;
+ align-self: center;
+ order: 1;
}
.fakeAfter {
content: 'a';
background: lightblue;
+ align-self: center;
+ order: -1;
}
</style>
</head>