From 797b21eaf1918e9fd6281d0a6e0d2d5e37555955 Mon Sep 17 00:00:00 2001
From: Ms2ger <Ms2ger@gmail.com>
Date: Mon, 21 Dec 2015 18:08:46 +0100
Subject: [PATCH] Move viewport_percentage_vmin_vmax_a.html and
 viewport_percentage_vmin_vmax_b.html to wpt reftests.

---
 tests/ref/basic.list                          |  2 -
 tests/wpt/mozilla/meta/MANIFEST.json          | 52 +++++++++++++++++++
 .../css/viewport_percentage_vmin_vmax_a.html} |  2 +
 .../css}/viewport_percentage_vmin_vmax_b.html |  6 ++-
 .../viewport_percentage_vmin_vmax_ref.html}   |  4 +-
 5 files changed, 60 insertions(+), 6 deletions(-)
 rename tests/{ref/viewport_percentage_vmin_vmax.html => wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_a.html} (66%)
 rename tests/{ref => wpt/mozilla/tests/css}/viewport_percentage_vmin_vmax_b.html (52%)
 rename tests/{ref/viewport_percentage_vmin_vmax_a.html => wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_ref.html} (79%)

diff --git a/tests/ref/basic.list b/tests/ref/basic.list
index fdd53a653ab..6b516b9cba5 100644
--- a/tests/ref/basic.list
+++ b/tests/ref/basic.list
@@ -6,8 +6,6 @@ fragment=top != ../html/acid2.html acid2_ref.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
-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
 
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index de6c4eb213a..745b7c191ba 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -4867,6 +4867,32 @@
             "url": "/_mozilla/css/viewport_meta.html"
           }
         ],
+        "css/viewport_percentage_vmin_vmax_a.html": [
+          {
+            "path": "css/viewport_percentage_vmin_vmax_a.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_percentage_vmin_vmax_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_percentage_vmin_vmax_a.html",
+            "viewport_size": "700x500"
+          }
+        ],
+        "css/viewport_percentage_vmin_vmax_b.html": [
+          {
+            "path": "css/viewport_percentage_vmin_vmax_b.html",
+            "references": [
+              [
+                "/_mozilla/css/viewport_percentage_vmin_vmax_ref.html",
+                "=="
+              ]
+            ],
+            "url": "/_mozilla/css/viewport_percentage_vmin_vmax_b.html",
+            "viewport_size": "500x700"
+          }
+        ],
         "css/viewport_rule.html": [
           {
             "path": "css/viewport_rule.html",
@@ -10800,6 +10826,32 @@
           "url": "/_mozilla/css/viewport_meta.html"
         }
       ],
+      "css/viewport_percentage_vmin_vmax_a.html": [
+        {
+          "path": "css/viewport_percentage_vmin_vmax_a.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_percentage_vmin_vmax_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_percentage_vmin_vmax_a.html",
+          "viewport_size": "700x500"
+        }
+      ],
+      "css/viewport_percentage_vmin_vmax_b.html": [
+        {
+          "path": "css/viewport_percentage_vmin_vmax_b.html",
+          "references": [
+            [
+              "/_mozilla/css/viewport_percentage_vmin_vmax_ref.html",
+              "=="
+            ]
+          ],
+          "url": "/_mozilla/css/viewport_percentage_vmin_vmax_b.html",
+          "viewport_size": "500x700"
+        }
+      ],
       "css/viewport_rule.html": [
         {
           "path": "css/viewport_rule.html",
diff --git a/tests/ref/viewport_percentage_vmin_vmax.html b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_a.html
similarity index 66%
rename from tests/ref/viewport_percentage_vmin_vmax.html
rename to tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_a.html
index 370245a384b..903e4ea8742 100644
--- a/tests/ref/viewport_percentage_vmin_vmax.html
+++ b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_a.html
@@ -1,6 +1,8 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta name=viewport-size content=700x500>
+    <link rel=match href=viewport_percentage_vmin_vmax_ref.html>
     <style>
       #box {
         background: green;
diff --git a/tests/ref/viewport_percentage_vmin_vmax_b.html b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_b.html
similarity index 52%
rename from tests/ref/viewport_percentage_vmin_vmax_b.html
rename to tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_b.html
index d67f728bc8f..2926c19dc9b 100644
--- a/tests/ref/viewport_percentage_vmin_vmax_b.html
+++ b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_b.html
@@ -1,11 +1,13 @@
 <!DOCTYPE html>
 <html>
   <head>
+    <meta name=viewport-size content=500x700>
+    <link rel=match href=viewport_percentage_vmin_vmax_ref.html>
     <style>
       #box {
         background: green;
-        height: 400px;
-        width: 300px;
+        height: 50vmax;
+        width: 50vmin;
       }
     </style>
   </head>
diff --git a/tests/ref/viewport_percentage_vmin_vmax_a.html b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_ref.html
similarity index 79%
rename from tests/ref/viewport_percentage_vmin_vmax_a.html
rename to tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_ref.html
index d67f728bc8f..ed8838a765a 100644
--- a/tests/ref/viewport_percentage_vmin_vmax_a.html
+++ b/tests/wpt/mozilla/tests/css/viewport_percentage_vmin_vmax_ref.html
@@ -4,8 +4,8 @@
     <style>
       #box {
         background: green;
-        height: 400px;
-        width: 300px;
+        height: 350px;
+        width: 250px;
       }
     </style>
   </head>