From bd25225cd26a76631c1719efcba814e395ae0fd4 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Sat, 21 Nov 2015 10:18:50 +0100
Subject: [PATCH] Move viewport_meta.html and viewport_rule.html to wpt
 reftests.

---
 tests/ref/basic.list                          |  2 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 48 +++++++++++++++++++
 .../mozilla/meta/css/viewport_meta.html.ini   |  1 +
 .../mozilla/meta/css/viewport_rule.html.ini   |  1 +
 .../mozilla/tests/css}/viewport_meta.html     |  1 +
 .../mozilla/tests/css}/viewport_rule.html     |  1 +
 .../mozilla/tests/css}/viewport_rule_ref.html |  0
 7 files changed, 52 insertions(+), 2 deletions(-)
 create mode 100644 tests/wpt/mozilla/meta/css/viewport_meta.html.ini
 create mode 100644 tests/wpt/mozilla/meta/css/viewport_rule.html.ini
 rename tests/{ref => wpt/mozilla/tests/css}/viewport_meta.html (89%)
 rename tests/{ref => wpt/mozilla/tests/css}/viewport_rule.html (89%)
 rename tests/{ref => wpt/mozilla/tests/css}/viewport_rule_ref.html (100%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index 48b32b4033c..a3b301b3a99 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -51,12 +51,10 @@ resolution=300x300,device-pixel-ratio=2 != pixel_snapping_position_a.html pixel_
 # 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
-prefs:"layout.viewport.enabled" == viewport_meta.html viewport_rule_ref.html
 resolution=800x600 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_a.html
 # resolution=600x800 == viewport_percentage_vmin_vmax.html viewport_percentage_vmin_vmax_b.html
 resolution=800x600 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_a.html
 # resolution=600x800 == viewport_percentage_vw_vh.html viewport_percentage_vw_vh_b.html
-prefs:"layout.viewport.enabled" == viewport_rule.html viewport_rule_ref.html
 
 flaky_macos == white_space_intrinsic_sizes_a.html white_space_intrinsic_sizes_ref.html
 
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index deeae61c0ce..57ed404dae2 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -4447,6 +4447,30 @@
             "url": "/_mozilla/css/viewport_ignore_desktop.html"
           }
         ],
+        "css/viewport_meta.html": [
+          {
+            "path": "css/viewport_meta.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_rule_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_meta.html"
+          }
+        ],
+        "css/viewport_rule.html": [
+          {
+            "path": "css/viewport_rule.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_rule_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_rule.html"
+          }
+        ],
         "css/visibility_hidden.html": [
           {
             "path": "css/visibility_hidden.html",
@@ -9864,6 +9888,30 @@
           "url": "/_mozilla/css/viewport_ignore_desktop.html"
         }
       ],
+      "css/viewport_meta.html": [
+        {
+          "path": "css/viewport_meta.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_rule_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_meta.html"
+        }
+      ],
+      "css/viewport_rule.html": [
+        {
+          "path": "css/viewport_rule.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_rule_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_rule.html"
+        }
+      ],
       "css/visibility_hidden.html": [
         {
           "path": "css/visibility_hidden.html",
diff --git a/tests/wpt/mozilla/meta/css/viewport_meta.html.ini b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini
new file mode 100644
index 00000000000..32a48a29459
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/viewport_meta.html.ini
@@ -0,0 +1 @@
+prefs: ["layout.viewport.enabled:true"]
diff --git a/tests/wpt/mozilla/meta/css/viewport_rule.html.ini b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini
new file mode 100644
index 00000000000..32a48a29459
--- /dev/null
+++ b/tests/wpt/mozilla/meta/css/viewport_rule.html.ini
@@ -0,0 +1 @@
+prefs: ["layout.viewport.enabled:true"]
diff --git a/tests/ref/viewport_meta.html b/tests/wpt/mozilla/tests/css/viewport_meta.html
similarity index 89%
rename from tests/ref/viewport_meta.html
rename to tests/wpt/mozilla/tests/css/viewport_meta.html
index 5c386bd7d76..e3d336c1e0e 100644
--- a/tests/ref/viewport_meta.html
+++ b/tests/wpt/mozilla/tests/css/viewport_meta.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel=match href=viewport_rule_ref.html>
     <meta name="viewport" content="width=240">
     <style>
       #container {
diff --git a/tests/ref/viewport_rule.html b/tests/wpt/mozilla/tests/css/viewport_rule.html
similarity index 89%
rename from tests/ref/viewport_rule.html
rename to tests/wpt/mozilla/tests/css/viewport_rule.html
index bccd08bb79d..36d0d4c0082 100644
--- a/tests/ref/viewport_rule.html
+++ b/tests/wpt/mozilla/tests/css/viewport_rule.html
@@ -1,6 +1,7 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <link rel=match href=viewport_rule_ref.html>
     <style>
       @viewport {
         height: auto;
diff --git a/tests/ref/viewport_rule_ref.html b/tests/wpt/mozilla/tests/css/viewport_rule_ref.html
similarity index 100%
rename from tests/ref/viewport_rule_ref.html
rename to tests/wpt/mozilla/tests/css/viewport_rule_ref.html