aboutsummaryrefslogtreecommitdiffstats
path: root/tests/wpt/css-tests/css-flexbox-1_dev
diff options
context:
space:
mode:
authorMs2ger <Ms2ger@gmail.com>2015-11-23 13:14:18 +0100
committerMs2ger <Ms2ger@gmail.com>2015-11-24 12:27:39 +0100
commita00f2d6310f42d641151d8aa46aef53338e568cc (patch)
tree9dc83d3b01b7b36edcee465a781245799e2f2f22 /tests/wpt/css-tests/css-flexbox-1_dev
parent037cac7353910b0a8b4f1d2daf52b8b79a7cdb0f (diff)
downloadservo-a00f2d6310f42d641151d8aa46aef53338e568cc.tar.gz
servo-a00f2d6310f42d641151d8aa46aef53338e568cc.zip
Update CSS tests to revision e102a993c37a2e0ebd549bc7d5548b006458ab34
Diffstat (limited to 'tests/wpt/css-tests/css-flexbox-1_dev')
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-align-self-horiz-003-ref.htm2
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data4
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data2
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-align-self-horiz-003-ref.xht2
-rw-r--r--tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-align-self-horiz-003-ref.xht2
5 files changed, 6 insertions, 6 deletions
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-align-self-horiz-003-ref.htm b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-align-self-horiz-003-ref.htm
index 33572b3282f..fe222be897c 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-align-self-horiz-003-ref.htm
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/html/reference/flexbox-align-self-horiz-003-ref.htm
@@ -82,7 +82,7 @@
<div class="auto" style="height: 100%">auto</div>
<div class="unspecified" style="height: 100%">unspec</div>
<div class="initial" style="height: 100%">initial</div>
- <div class="inherit" style="height: 100%">inherit</div>
+ <div class="inherit">inherit</div>
</div>
</body>
</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data b/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data
index 4cb530c346f..a630533a242 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/implementation-report-TEMPLATE.data
@@ -319,8 +319,8 @@ html/flexbox-align-self-horiz-001-table.htm 183f460c2e72e0bcf57e9fc6ce6e2225f911
xhtml1/flexbox-align-self-horiz-001-table.xht 183f460c2e72e0bcf57e9fc6ce6e2225f9115212 ?
html/flexbox-align-self-horiz-002.htm 8ab4c5c5d3600422c2560908ea8c809511fd8456 ?
xhtml1/flexbox-align-self-horiz-002.xht 8ab4c5c5d3600422c2560908ea8c809511fd8456 ?
-html/flexbox-align-self-horiz-003.htm 8c82a3d90a6879d3371ca75d8c7d2ae768ee274c ?
-xhtml1/flexbox-align-self-horiz-003.xht 8c82a3d90a6879d3371ca75d8c7d2ae768ee274c ?
+html/flexbox-align-self-horiz-003.htm a196c3b0ed8ef58efbfab036557be25c118a6007 ?
+xhtml1/flexbox-align-self-horiz-003.xht a196c3b0ed8ef58efbfab036557be25c118a6007 ?
html/flexbox-align-self-horiz-004.htm 10a87f5352d8eb2c448129d27aa505f3148d4534 ?
xhtml1/flexbox-align-self-horiz-004.xht 10a87f5352d8eb2c448129d27aa505f3148d4534 ?
html/flexbox-align-self-horiz-005.htm 47ddfa8eb08586be92297f63fb61d0b9e8899e29 ?
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data b/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data
index cddb8a379a2..cf9ad9976a8 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/testinfo.data
@@ -157,7 +157,7 @@ flexbox-align-self-baseline-horiz-005 reference/flexbox-align-self-baseline-hori
flexbox-align-self-horiz-001-block reference/flexbox-align-self-horiz-001-ref Testing the behavior of 'align-self' property values on flex items that are blocks, in a horizontal flex container http://www.w3.org/TR/css-flexbox-1/#align-items-property 8ddd9e5c643399d31bc48e8a39684d98ce7f2406 `Daniel Holbert`<mailto:dholbert@mozilla.com>
flexbox-align-self-horiz-001-table reference/flexbox-align-self-horiz-001-ref Testing the various 'align-self' property values on flex items that are tables http://www.w3.org/TR/css-flexbox-1/#align-items-property 183f460c2e72e0bcf57e9fc6ce6e2225f9115212 `Daniel Holbert`<mailto:dholbert@mozilla.com>
flexbox-align-self-horiz-002 reference/flexbox-align-self-horiz-002-ref Testing the behavior of 'align-self' with a horizontal flex container, with margin/padding/border on the items http://www.w3.org/TR/css-flexbox-1/#align-items-property 8ab4c5c5d3600422c2560908ea8c809511fd8456 `Daniel Holbert`<mailto:dholbert@mozilla.com>
-flexbox-align-self-horiz-003 reference/flexbox-align-self-horiz-003-ref Testing the behavior of 'align-self' with a horizontal flex container that's shorter than its items http://www.w3.org/TR/css-flexbox-1/#align-items-property 8c82a3d90a6879d3371ca75d8c7d2ae768ee274c `Daniel Holbert`<mailto:dholbert@mozilla.com>
+flexbox-align-self-horiz-003 reference/flexbox-align-self-horiz-003-ref Testing the behavior of 'align-self' with a horizontal flex container that's shorter than its items http://www.w3.org/TR/css-flexbox-1/#align-items-property a196c3b0ed8ef58efbfab036557be25c118a6007 `Daniel Holbert`<mailto:dholbert@mozilla.com>
flexbox-align-self-horiz-004 reference/flexbox-align-self-horiz-004-ref Testing the behavior of 'align-self' with a horizontal flex container that's shorter than its items, with margin/padding/border on the items http://www.w3.org/TR/css-flexbox-1/#align-items-property 10a87f5352d8eb2c448129d27aa505f3148d4534 `Daniel Holbert`<mailto:dholbert@mozilla.com>
flexbox-align-self-horiz-005 reference/flexbox-align-self-horiz-005-ref Testing the behavior of 'align-self' with auto margins in play, in a horizontal flex container http://www.w3.org/TR/css-flexbox-1/#auto-margins 47ddfa8eb08586be92297f63fb61d0b9e8899e29 `Daniel Holbert`<mailto:dholbert@mozilla.com>
flexbox-align-self-stretch-vert-001 reference/flexbox-align-self-stretch-vert-001-ref Testing the sizing of a stretched horizontal flex container in a vertical flex container http://www.w3.org/TR/css-flexbox-1/#layout-algorithm 6c777130631b607e0e1106a0bd655645cfb049e3 `Daniel Holbert`<mailto:dholbert@mozilla.com> If a stretched flex item's main size is influenced by its cross size, and the flex container has a definite cross size, then the item's cross size should be resolved early so that it can be used when determining the item's main size https://drafts.csswg.org/css-flexbox/issues-cr-2012#issue-23
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-align-self-horiz-003-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-align-self-horiz-003-ref.xht
index c048071c997..e546c7e16e4 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-align-self-horiz-003-ref.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1/reference/flexbox-align-self-horiz-003-ref.xht
@@ -81,7 +81,7 @@
<div class="auto" style="height: 100%">auto</div>
<div class="unspecified" style="height: 100%">unspec</div>
<div class="initial" style="height: 100%">initial</div>
- <div class="inherit" style="height: 100%">inherit</div>
+ <div class="inherit">inherit</div>
</div>
</body>
</html> \ No newline at end of file
diff --git a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-align-self-horiz-003-ref.xht b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-align-self-horiz-003-ref.xht
index caba6d3048d..273d18dc5c7 100644
--- a/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-align-self-horiz-003-ref.xht
+++ b/tests/wpt/css-tests/css-flexbox-1_dev/xhtml1print/reference/flexbox-align-self-horiz-003-ref.xht
@@ -90,7 +90,7 @@
<div class="auto" style="height: 100%">auto</div>
<div class="unspecified" style="height: 100%">unspec</div>
<div class="initial" style="height: 100%">initial</div>
- <div class="inherit" style="height: 100%">inherit</div>
+ <div class="inherit">inherit</div>
</div>
</body>
</html> \ No newline at end of file