From 4add7d23f8a50795d3be0aa222cb92a7b24fc38c Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 5 Nov 2015 13:24:31 +0100 Subject: [PATCH 1/8] Move fixed_width_overrides_child_intrinsic_width_a.html to wpt reftests. --- tests/ref/basic.list | 1 - tests/wpt/mozilla/meta/MANIFEST.json | 24 +++++++++++++++++++ ...dth_overrides_child_intrinsic_width_a.html | 1 + ...h_overrides_child_intrinsic_width_ref.html | 0 4 files changed, 25 insertions(+), 1 deletion(-) rename tests/{ref => wpt/mozilla/tests/css}/fixed_width_overrides_child_intrinsic_width_a.html (88%) rename tests/{ref => wpt/mozilla/tests/css}/fixed_width_overrides_child_intrinsic_width_ref.html (100%) diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 7e8551c33e3..18355911cb1 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -11,7 +11,6 @@ fragment=top != ../html/acid2.html acid2_ref.html == acid2_noscroll.html acid2_ref_broken.html flaky_cpu == append_style_a.html append_style_b.html -== fixed_width_overrides_child_intrinsic_width_a.html fixed_width_overrides_child_intrinsic_width_ref.html prefs:"layout.flex-direction.enabled,layout.flex.enabled" == flex_column_direction.html flex_column_direction_ref.html prefs:"layout.flex.enabled" == flex_row_direction.html flex_row_direction_ref.html == floated_negative_margins_a.html floated_negative_margins_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index 2e3125883ab..b0b420fbceb 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -1259,6 +1259,18 @@ "url": "/_mozilla/css/first_of_type_pseudo_a.html" } ], + "css/fixed_width_overrides_child_intrinsic_width_a.html": [ + { + "path": "css/fixed_width_overrides_child_intrinsic_width_a.html", + "references": [ + [ + "/_mozilla/css/fixed_width_overrides_child_intrinsic_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/fixed_width_overrides_child_intrinsic_width_a.html" + } + ], "css/flex_nochild.html": [ { "path": "css/flex_nochild.html", @@ -6072,6 +6084,18 @@ "url": "/_mozilla/css/first_of_type_pseudo_a.html" } ], + "css/fixed_width_overrides_child_intrinsic_width_a.html": [ + { + "path": "css/fixed_width_overrides_child_intrinsic_width_a.html", + "references": [ + [ + "/_mozilla/css/fixed_width_overrides_child_intrinsic_width_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/fixed_width_overrides_child_intrinsic_width_a.html" + } + ], "css/flex_nochild.html": [ { "path": "css/flex_nochild.html", diff --git a/tests/ref/fixed_width_overrides_child_intrinsic_width_a.html b/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html similarity index 88% rename from tests/ref/fixed_width_overrides_child_intrinsic_width_a.html rename to tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html index 33e9e7c629b..f12c3e9e65a 100644 --- a/tests/ref/fixed_width_overrides_child_intrinsic_width_a.html +++ b/tests/wpt/mozilla/tests/css/fixed_width_overrides_child_intrinsic_width_a.html @@ -1,6 +1,7 @@ +

24pt is 32px. diff --git a/tests/ref/font_size_ref.html b/tests/wpt/mozilla/tests/css/font_size_ref.html similarity index 100% rename from tests/ref/font_size_ref.html rename to tests/wpt/mozilla/tests/css/font_size_ref.html From 41a9502688be1590794fb435f2550abe8cc270d1 Mon Sep 17 00:00:00 2001 From: Ms2ger Date: Thu, 5 Nov 2015 16:17:27 +0100 Subject: [PATCH 6/8] Move image_rendering_auto_a.html and image_rendering_pixelated_a.html to wpt reftests. --- tests/ref/4x2.png | Bin 180 -> 0 bytes tests/ref/basic.list | 2 - tests/wpt/mozilla/meta/MANIFEST.json | 48 ++++++++++++++++++ .../tests/css}/image_rendering_auto_a.html | 1 + .../css}/image_rendering_pixelated_a.html | 1 + .../css}/image_rendering_pixelated_ref.html | 0 6 files changed, 50 insertions(+), 2 deletions(-) delete mode 100644 tests/ref/4x2.png rename tests/{ref => wpt/mozilla/tests/css}/image_rendering_auto_a.html (80%) rename tests/{ref => wpt/mozilla/tests/css}/image_rendering_pixelated_a.html (86%) rename tests/{ref => wpt/mozilla/tests/css}/image_rendering_pixelated_ref.html (100%) diff --git a/tests/ref/4x2.png b/tests/ref/4x2.png deleted file mode 100644 index eb0c5cda97128f52cb2815e80955cb77c1744a91..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 180 zcmeAS@N?(olHy`uVBq!ia0vp^EI`b}!2~2foO)#fq}Y|gW!U_%O?XxI14-? ziy0WWg+Z8+Vb&Z8pdfpRr>`sfJstreN%rjXYDa)VvY8S|xv6<2KrRD=b5Uwy zNotBhd1gt5g1e`0K#E=}J5XH0)5S4_<2vg>Mn)j7N#T$Et_6)ehCUWnax9D!405$W Onmt|pT-G@yGywpDxGS~* diff --git a/tests/ref/basic.list b/tests/ref/basic.list index 7829c960ca7..c57dae5f8a5 100644 --- a/tests/ref/basic.list +++ b/tests/ref/basic.list @@ -34,8 +34,6 @@ prefs:"layout.writing-mode.enabled" == iframe/size_attributes_vertical_writing_m == iframe/stacking_context.html iframe/stacking_context_ref.html == iframe/stacking_context_position_a.html iframe/stacking_context_position_ref.html -!= image_rendering_auto_a.html image_rendering_pixelated_a.html -== image_rendering_pixelated_a.html image_rendering_pixelated_ref.html == img_block_maxwidth_a.html img_block_maxwidth_ref.html == img_block_maxwidth_b.html img_block_maxwidth_ref.html != img_simple.html img_simple_ref.html diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json index b51db1b86a0..e19b44b658a 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -1559,6 +1559,30 @@ "url": "/_mozilla/css/hide_after_create.html" } ], + "css/image_rendering_auto_a.html": [ + { + "path": "css/image_rendering_auto_a.html", + "references": [ + [ + "/_mozilla/css/image_rendering_pixelated_a.html", + "!=" + ] + ], + "url": "/_mozilla/css/image_rendering_auto_a.html" + } + ], + "css/image_rendering_pixelated_a.html": [ + { + "path": "css/image_rendering_pixelated_a.html", + "references": [ + [ + "/_mozilla/css/image_rendering_pixelated_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/image_rendering_pixelated_a.html" + } + ], "css/img_block_display_a.html": [ { "path": "css/img_block_display_a.html", @@ -6432,6 +6456,30 @@ "url": "/_mozilla/css/hide_after_create.html" } ], + "css/image_rendering_auto_a.html": [ + { + "path": "css/image_rendering_auto_a.html", + "references": [ + [ + "/_mozilla/css/image_rendering_pixelated_a.html", + "!=" + ] + ], + "url": "/_mozilla/css/image_rendering_auto_a.html" + } + ], + "css/image_rendering_pixelated_a.html": [ + { + "path": "css/image_rendering_pixelated_a.html", + "references": [ + [ + "/_mozilla/css/image_rendering_pixelated_ref.html", + "==" + ] + ], + "url": "/_mozilla/css/image_rendering_pixelated_a.html" + } + ], "css/img_block_display_a.html": [ { "path": "css/img_block_display_a.html", diff --git a/tests/ref/image_rendering_auto_a.html b/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html similarity index 80% rename from tests/ref/image_rendering_auto_a.html rename to tests/wpt/mozilla/tests/css/image_rendering_auto_a.html index 440bfa9abd8..37f65265af7 100644 --- a/tests/ref/image_rendering_auto_a.html +++ b/tests/wpt/mozilla/tests/css/image_rendering_auto_a.html @@ -2,6 +2,7 @@ +