Skip to content

Commit

Permalink
Auto merge of #5905 - Ms2ger:css, r=jdm
Browse files Browse the repository at this point in the history
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5905)
<!-- Reviewable:end -->
  • Loading branch information
bors-servo committed Apr 30, 2015
2 parents 0cb2644 + bbd7cac commit 3c15937
Show file tree
Hide file tree
Showing 8 changed files with 84 additions and 12 deletions.
3 changes: 0 additions & 3 deletions tests/ref/basic.list
Expand Up @@ -38,9 +38,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
== 2dcontext/lineto_a.html 2dcontext/lineto_ref.html
== 2dcontext/transform_a.html 2dcontext/transform_ref.html

== absolute_clipping_of_own_contents_a.html absolute_clipping_of_own_contents_ref.html
== absolute_content_height_a.html absolute_content_height_ref.html
== absolute_hypothetical_float_a.html absolute_hypothetical_float_ref.html
== acid1_a.html acid1_b.html
== acid2_noscroll.html acid2_ref_broken.html
== after_block_iteration.html after_block_iteration_ref.html
Expand Down
90 changes: 81 additions & 9 deletions tests/wpt/mozilla/meta/MANIFEST.json
Expand Up @@ -27,6 +27,42 @@
"url": "/_mozilla/css/abs_float_pref_width.html"
}
],
"css/absolute_clipping_of_own_contents.html": [
{
"path": "css/absolute_clipping_of_own_contents.html",
"references": [
[
"/_mozilla/css/absolute_clipping_of_own_contents_ref.html",
"=="
]
],
"url": "/_mozilla/css/absolute_clipping_of_own_contents.html"
}
],
"css/absolute_content_height.html": [
{
"path": "css/absolute_content_height.html",
"references": [
[
"/_mozilla/css/absolute_content_height_ref.html",
"=="
]
],
"url": "/_mozilla/css/absolute_content_height.html"
}
],
"css/absolute_hypothetical_float.html": [
{
"path": "css/absolute_hypothetical_float.html",
"references": [
[
"/_mozilla/css/absolute_hypothetical_float_ref.html",
"=="
]
],
"url": "/_mozilla/css/absolute_hypothetical_float.html"
}
],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
Expand Down Expand Up @@ -536,28 +572,64 @@
}
},
"reftest_nodes": {
"css/class-namespaces.html": [
"css/abs_float_pref_width.html": [
{
"path": "css/class-namespaces.html",
"path": "css/abs_float_pref_width.html",
"references": [
[
"/_mozilla/css/class-namespaces-ref.html",
"/_mozilla/css/abs_float_pref_width-ref.html",
"=="
]
],
"url": "/_mozilla/css/class-namespaces.html"
"url": "/_mozilla/css/abs_float_pref_width.html"
}
],
"css/abs_float_pref_width.html": [
"css/absolute_clipping_of_own_contents.html": [
{
"path": "css/abs_float_pref_width.html",
"path": "css/absolute_clipping_of_own_contents.html",
"references": [
[
"/_mozilla/css/abs_float_pref_width-ref.html",
"/_mozilla/css/absolute_clipping_of_own_contents_ref.html",
"=="
]
],
"url": "/_mozilla/css/abs_float_pref_width.html"
"url": "/_mozilla/css/absolute_clipping_of_own_contents.html"
}
],
"css/absolute_content_height.html": [
{
"path": "css/absolute_content_height.html",
"references": [
[
"/_mozilla/css/absolute_content_height_ref.html",
"=="
]
],
"url": "/_mozilla/css/absolute_content_height.html"
}
],
"css/absolute_hypothetical_float.html": [
{
"path": "css/absolute_hypothetical_float.html",
"references": [
[
"/_mozilla/css/absolute_hypothetical_float_ref.html",
"=="
]
],
"url": "/_mozilla/css/absolute_hypothetical_float.html"
}
],
"css/class-namespaces.html": [
{
"path": "css/class-namespaces.html",
"references": [
[
"/_mozilla/css/class-namespaces-ref.html",
"=="
]
],
"url": "/_mozilla/css/class-namespaces.html"
}
]
}
Expand All @@ -566,4 +638,4 @@
"rev": null,
"url_base": "/_mozilla/",
"version": 2
}
}
Expand Up @@ -2,6 +2,7 @@
<html>
<head>
<!-- Tests that clipping is preserved properly for nested `position: absolute` elements. -->
<link rel=match href=absolute_clipping_of_own_contents_ref.html>
<style>
body, html {
margin: 0;
Expand Down
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=absolute_content_height_ref.html>
<style>
section {
position: absolute;
Expand Down
File renamed without changes.
@@ -1,6 +1,7 @@
<!DOCTYPE html>
<html>
<head>
<link rel=match href=absolute_hypothetical_float_ref.html>
<style>
#a {
float: right;
Expand Down

0 comments on commit 3c15937

Please sign in to comment.