diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-04-30 11:29:24 -0500 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-04-30 11:29:24 -0500 |
commit | 3c159373fd08bfbafad6fb969ca0ded4da315c38 (patch) | |
tree | 4b89cd001d9a1ce19ab3ee03cae078bf81607842 | |
parent | 0cb2644210cbefc4cc4d847a80ba6762091706c3 (diff) | |
parent | bbd7cac3719124de8f3f3a72bfac687c369e5a77 (diff) | |
download | servo-3c159373fd08bfbafad6fb969ca0ded4da315c38.tar.gz servo-3c159373fd08bfbafad6fb969ca0ded4da315c38.zip |
Auto merge of #5905 - Ms2ger:css, r=jdm
<!-- 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 -->
-rw-r--r-- | tests/ref/basic.list | 3 | ||||
-rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 90 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html (renamed from tests/ref/absolute_clipping_of_own_contents_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents_ref.html (renamed from tests/ref/absolute_clipping_of_own_contents_ref.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_content_height.html (renamed from tests/ref/absolute_content_height_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_content_height_ref.html (renamed from tests/ref/absolute_content_height_ref.html) | 0 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_hypothetical_float.html (renamed from tests/ref/absolute_hypothetical_float_a.html) | 1 | ||||
-rw-r--r-- | tests/wpt/mozilla/tests/css/absolute_hypothetical_float_ref.html (renamed from tests/ref/absolute_hypothetical_float_ref.html) | 0 |
8 files changed, 84 insertions, 12 deletions
diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 7c343382004..2c012b8e3f0 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -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 diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 1386dc24326..841aa8f1c5b 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -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", @@ -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" } ] } @@ -566,4 +638,4 @@ "rev": null, "url_base": "/_mozilla/", "version": 2 -} +}
\ No newline at end of file diff --git a/tests/ref/absolute_clipping_of_own_contents_a.html b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html index b018d799a86..19919ff89c7 100644 --- a/tests/ref/absolute_clipping_of_own_contents_a.html +++ b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents.html @@ -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; diff --git a/tests/ref/absolute_clipping_of_own_contents_ref.html b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents_ref.html index 96608da13c9..96608da13c9 100644 --- a/tests/ref/absolute_clipping_of_own_contents_ref.html +++ b/tests/wpt/mozilla/tests/css/absolute_clipping_of_own_contents_ref.html diff --git a/tests/ref/absolute_content_height_a.html b/tests/wpt/mozilla/tests/css/absolute_content_height.html index 8f12b89aef8..80ac5b8daae 100644 --- a/tests/ref/absolute_content_height_a.html +++ b/tests/wpt/mozilla/tests/css/absolute_content_height.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> +<link rel=match href=absolute_content_height_ref.html> <style> section { position: absolute; diff --git a/tests/ref/absolute_content_height_ref.html b/tests/wpt/mozilla/tests/css/absolute_content_height_ref.html index bb239ed179f..bb239ed179f 100644 --- a/tests/ref/absolute_content_height_ref.html +++ b/tests/wpt/mozilla/tests/css/absolute_content_height_ref.html diff --git a/tests/ref/absolute_hypothetical_float_a.html b/tests/wpt/mozilla/tests/css/absolute_hypothetical_float.html index 78f1c70e04d..33506180d15 100644 --- a/tests/ref/absolute_hypothetical_float_a.html +++ b/tests/wpt/mozilla/tests/css/absolute_hypothetical_float.html @@ -1,6 +1,7 @@ <!DOCTYPE html> <html> <head> +<link rel=match href=absolute_hypothetical_float_ref.html> <style> #a { float: right; diff --git a/tests/ref/absolute_hypothetical_float_ref.html b/tests/wpt/mozilla/tests/css/absolute_hypothetical_float_ref.html index 008b2a65d29..008b2a65d29 100644 --- a/tests/ref/absolute_hypothetical_float_ref.html +++ b/tests/wpt/mozilla/tests/css/absolute_hypothetical_float_ref.html |