From 2c4232b62079e4df8d1dde59cb7ec6bb4bd2a26e Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 2 Dec 2015 14:01:10 +0100
Subject: [PATCH 1/4] Move overflow_position_abs_inside_normal_a.html to wpt
 reftests.

---
 tests/ref/basic.list                          |  2 --
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 ...flow_position_abs_inside_normal_a.html.ini |  4 ++++
 ...overflow_position_abs_inside_normal_a.html |  1 +
 ...overflow_position_abs_inside_normal_b.html |  0
 5 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 tests/wpt/mozilla/meta/css/overflow_position_abs_inside_normal_a.html.ini
 rename tests/{ref => wpt/mozilla/tests/css}/overflow_position_abs_inside_normal_a.html (88%)
 rename tests/{ref => wpt/mozilla/tests/css}/overflow_position_abs_inside_normal_b.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index fd5d92ec839..dfbc3bf61cc 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -13,8 +13,6 @@ fragment=top != ../html/acid2.html acid2_ref.html
 flaky_cpu == append_style_a.html append_style_b.html
 # `?` and `#` in the name is a test for https://github.com/servo/servo/issues/3340
 
-# Should be ==?
-!= overflow_position_abs_inside_normal_a.html overflow_position_abs_inside_normal_b.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
 # commented out because multiple layers don't work with reftests --pcwalton
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index e2b7aa33d2d..efea32353a9 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -3295,6 +3295,18 @@
             "url": "/_mozilla/css/overflow_position_abs_inline_block.html"
           }
         ],
+        "css/overflow_position_abs_inside_normal_a.html": [
+          {
+            "path": "css/overflow_position_abs_inside_normal_a.html",
+            "references": [
+              [
+                "/_mozilla/css/overflow_position_abs_inside_normal_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/overflow_position_abs_inside_normal_a.html"
+          }
+        ],
         "css/overflow_position_abs_simple_a.html": [
           {
             "path": "css/overflow_position_abs_simple_a.html",
@@ -9018,6 +9030,18 @@
           "url": "/_mozilla/css/overflow_position_abs_inline_block.html"
         }
       ],
+      "css/overflow_position_abs_inside_normal_a.html": [
+        {
+          "path": "css/overflow_position_abs_inside_normal_a.html",
+          "references": [
+            [
+              "/_mozilla/css/overflow_position_abs_inside_normal_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/overflow_position_abs_inside_normal_a.html"
+        }
+      ],
       "css/overflow_position_abs_simple_a.html": [
         {
           "path": "css/overflow_position_abs_simple_a.html",
diff --git a/tests/wpt/mozilla/meta/css/overflow_position_abs_inside_normal_a.html.ini b/tests/wpt/mozilla/meta/css/overflow_position_abs_inside_normal_a.html.ini
new file mode 100644
index 00000000000..7a3a9f959fa
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/overflow_position_abs_inside_normal_a.html.ini
@@ -0,0 +1,4 @@
+[overflow_position_abs_inside_normal_a.html]
+  type: reftest
+  expected: FAIL
+  bug: https://github.com/servo/servo/issues/8780
diff --git a/tests/ref/overflow_position_abs_inside_normal_a.html b/tests/wpt/mozilla/tests/css/overflow_position_abs_inside_normal_a.html
similarity index 88%
rename from tests/ref/overflow_position_abs_inside_normal_a.html
rename to tests/wpt/mozilla/tests/css/overflow_position_abs_inside_normal_a.html
index aa9a3f11b7b..344f43abd3e 100644
--- a/tests/ref/overflow_position_abs_inside_normal_a.html
+++ b/tests/wpt/mozilla/tests/css/overflow_position_abs_inside_normal_a.html
@@ -3,6 +3,7 @@
     `overflow: hidden` on #second has no effect on #abs because its CB is #first.
   </title>
   <head>
+    <link rel=match href=overflow_position_abs_inside_normal_b.html>
     <style>
       #first {
       position: relative;
diff --git a/tests/ref/overflow_position_abs_inside_normal_b.html b/tests/wpt/mozilla/tests/css/overflow_position_abs_inside_normal_b.html
similarity index 100%
rename from tests/ref/overflow_position_abs_inside_normal_b.html
rename to tests/wpt/mozilla/tests/css/overflow_position_abs_inside_normal_b.html

From 91d798cbd684a81b00c28c1588c62439e4713a47 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 2 Dec 2015 14:05:20 +0100
Subject: [PATCH 2/4] Move position_fixed_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../mozilla/tests/css}/position_fixed_a.html  |  1 +
 .../mozilla/tests/css}/position_fixed_b.html  |  0
 4 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_a.html (94%)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_b.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index dfbc3bf61cc..d51ea3fc521 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -16,7 +16,6 @@ flaky_cpu == append_style_a.html append_style_b.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
 # commented out because multiple layers don't work with reftests --pcwalton
-# == position_fixed_a.html position_fixed_b.html
 # == position_fixed_simple_a.html position_fixed_simple_b.html
 # == position_fixed_static_y_a.html position_fixed_static_y_b.html
 # text_decoration_propagation_a.html text_decoration_propagation_b.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index efea32353a9..f90fc7bdcad 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -3559,6 +3559,18 @@
             "url": "/_mozilla/css/position_abs_width_percentage_a.html"
           }
         ],
+        "css/position_fixed_a.html": [
+          {
+            "path": "css/position_fixed_a.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_a.html"
+          }
+        ],
         "css/position_fixed_background_color_a.html": [
           {
             "path": "css/position_fixed_background_color_a.html",
@@ -9294,6 +9306,18 @@
           "url": "/_mozilla/css/position_abs_width_percentage_a.html"
         }
       ],
+      "css/position_fixed_a.html": [
+        {
+          "path": "css/position_fixed_a.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_a.html"
+        }
+      ],
       "css/position_fixed_background_color_a.html": [
         {
           "path": "css/position_fixed_background_color_a.html",
diff --git a/tests/ref/position_fixed_a.html b/tests/wpt/mozilla/tests/css/position_fixed_a.html
similarity index 94%
rename from tests/ref/position_fixed_a.html
rename to tests/wpt/mozilla/tests/css/position_fixed_a.html
index 1fe3fc1ec45..961613c7f6c 100644
--- a/tests/ref/position_fixed_a.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=position_fixed_b.html>
     <style>
     .container {
       display: block;
diff --git a/tests/ref/position_fixed_b.html b/tests/wpt/mozilla/tests/css/position_fixed_b.html
similarity index 100%
rename from tests/ref/position_fixed_b.html
rename to tests/wpt/mozilla/tests/css/position_fixed_b.html

From 9b7864aa1a97cabb55dddca908d44794a05d4fc6 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 2 Dec 2015 14:08:58 +0100
Subject: [PATCH 3/4] Move position_fixed_simple_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  1 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../tests/css}/position_fixed_simple_a.html   |  1 +
 .../tests/css}/position_fixed_simple_b.html   |  0
 4 files changed, 25 insertions(+), 1 deletion(-)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_simple_a.html (92%)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_simple_b.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index d51ea3fc521..c1ce97861c0 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -16,7 +16,6 @@ flaky_cpu == append_style_a.html append_style_b.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
 # commented out because multiple layers don't work with reftests --pcwalton
-# == position_fixed_simple_a.html position_fixed_simple_b.html
 # == position_fixed_static_y_a.html position_fixed_static_y_b.html
 # text_decoration_propagation_a.html text_decoration_propagation_b.html
 != text_overflow_a.html text_overflow_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index f90fc7bdcad..2bc9d1396c8 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -3595,6 +3595,18 @@
             "url": "/_mozilla/css/position_fixed_overflow_a.html"
           }
         ],
+        "css/position_fixed_simple_a.html": [
+          {
+            "path": "css/position_fixed_simple_a.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_simple_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_simple_a.html"
+          }
+        ],
         "css/position_fixed_tile_edge.html": [
           {
             "path": "css/position_fixed_tile_edge.html",
@@ -9342,6 +9354,18 @@
           "url": "/_mozilla/css/position_fixed_overflow_a.html"
         }
       ],
+      "css/position_fixed_simple_a.html": [
+        {
+          "path": "css/position_fixed_simple_a.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_simple_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_simple_a.html"
+        }
+      ],
       "css/position_fixed_tile_edge.html": [
         {
           "path": "css/position_fixed_tile_edge.html",
diff --git a/tests/ref/position_fixed_simple_a.html b/tests/wpt/mozilla/tests/css/position_fixed_simple_a.html
similarity index 92%
rename from tests/ref/position_fixed_simple_a.html
rename to tests/wpt/mozilla/tests/css/position_fixed_simple_a.html
index 83e7cc72a78..d01b9550911 100644
--- a/tests/ref/position_fixed_simple_a.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_simple_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=position_fixed_simple_b.html>
     <style>
       html, body {
       margin: 0px;
diff --git a/tests/ref/position_fixed_simple_b.html b/tests/wpt/mozilla/tests/css/position_fixed_simple_b.html
similarity index 100%
rename from tests/ref/position_fixed_simple_b.html
rename to tests/wpt/mozilla/tests/css/position_fixed_simple_b.html

From 03d5db9e12a93584b8337d2768984d105c5c67d0 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Wed, 2 Dec 2015 14:11:06 +0100
Subject: [PATCH 4/4] Move position_fixed_static_y_a.html to wpt reftests.

---
 tests/ref/basic.list                          |  2 --
 tests/wpt/mozilla/meta/MANIFEST.json          | 24 +++++++++++++++++++
 .../tests/css}/position_fixed_static_y_a.html |  1 +
 .../tests/css}/position_fixed_static_y_b.html |  0
 4 files changed, 25 insertions(+), 2 deletions(-)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_static_y_a.html (92%)
 rename tests/{ref => wpt/mozilla/tests/css}/position_fixed_static_y_b.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index c1ce97861c0..c0587599d9e 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -15,8 +15,6 @@ flaky_cpu == append_style_a.html append_style_b.html
 
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
 resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_snapping_position_ref.html
-# commented out because multiple layers don't work with reftests --pcwalton
-# == position_fixed_static_y_a.html position_fixed_static_y_b.html
 # text_decoration_propagation_a.html text_decoration_propagation_b.html
 != text_overflow_a.html text_overflow_ref.html
 flaky_cpu,prefs:"layout.writing-mode.enabled" == vertical-lr-blocks.html vertical-lr-blocks_ref.html
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index 2bc9d1396c8..da86df98d0d 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -3607,6 +3607,18 @@
             "url": "/_mozilla/css/position_fixed_simple_a.html"
           }
         ],
+        "css/position_fixed_static_y_a.html": [
+          {
+            "path": "css/position_fixed_static_y_a.html",
+            "references": [
+              [
+                "/_mozilla/css/position_fixed_static_y_b.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/position_fixed_static_y_a.html"
+          }
+        ],
         "css/position_fixed_tile_edge.html": [
           {
             "path": "css/position_fixed_tile_edge.html",
@@ -9366,6 +9378,18 @@
           "url": "/_mozilla/css/position_fixed_simple_a.html"
         }
       ],
+      "css/position_fixed_static_y_a.html": [
+        {
+          "path": "css/position_fixed_static_y_a.html",
+          "references": [
+            [
+              "/_mozilla/css/position_fixed_static_y_b.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/position_fixed_static_y_a.html"
+        }
+      ],
       "css/position_fixed_tile_edge.html": [
         {
           "path": "css/position_fixed_tile_edge.html",
diff --git a/tests/ref/position_fixed_static_y_a.html b/tests/wpt/mozilla/tests/css/position_fixed_static_y_a.html
similarity index 92%
rename from tests/ref/position_fixed_static_y_a.html
rename to tests/wpt/mozilla/tests/css/position_fixed_static_y_a.html
index 5d44f77006f..f7c7d5b1f93 100644
--- a/tests/ref/position_fixed_static_y_a.html
+++ b/tests/wpt/mozilla/tests/css/position_fixed_static_y_a.html
@@ -1,5 +1,6 @@
 <html>
   <head>
+    <link rel=match href=position_fixed_static_y_b.html>
     <style>
       html, body {
       margin-left: 0px;
diff --git a/tests/ref/position_fixed_static_y_b.html b/tests/wpt/mozilla/tests/css/position_fixed_static_y_b.html
similarity index 100%
rename from tests/ref/position_fixed_static_y_b.html
rename to tests/wpt/mozilla/tests/css/position_fixed_static_y_b.html