From e4d3c74928e54a2d6ef0adf523c15feea6154ce8 Mon Sep 17 00:00:00 2001
From: Manish Goregaokar <manishsmail@gmail.com>
Date: Thu, 30 Jun 2016 16:32:58 +0530
Subject: [PATCH] Bump default resolution to 1024x740

---
 components/util/opts.rs                              |  6 +++---
 .../wpt/harness/wptrunner/executors/executorservo.py |  2 ++
 tests/wpt/mozilla/meta/MANIFEST.json                 | 12 ++++++++----
 tests/wpt/mozilla/tests/css/viewport_meta.html       |  1 +
 tests/wpt/mozilla/tests/css/viewport_rule.html       |  1 +
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/components/util/opts.rs b/components/util/opts.rs
index 1fe76f96d26..a55d7e556f2 100644
--- a/components/util/opts.rs
+++ b/components/util/opts.rs
@@ -486,7 +486,7 @@ pub fn default_opts() -> Opts {
         trace_layout: false,
         devtools_port: None,
         webdriver_port: None,
-        initial_window_size: Size2D::typed(800, 600),
+        initial_window_size: Size2D::typed(1024, 740),
         user_agent: default_user_agent_string(DEFAULT_USER_AGENT),
         multiprocess: false,
         random_pipeline_closure_probability: None,
@@ -543,7 +543,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
     opts.optflag("F", "soft-fail", "Display about:failure on thread failure instead of exiting");
     opts.optflagopt("", "devtools", "Start remote devtools server on port", "6000");
     opts.optflagopt("", "webdriver", "Start remote WebDriver server on port", "7000");
-    opts.optopt("", "resolution", "Set window resolution.", "800x600");
+    opts.optopt("", "resolution", "Set window resolution.", "1024x740");
     opts.optopt("u",
                 "user-agent",
                 "Set custom user agent string (or android / desktop for platform default)",
@@ -717,7 +717,7 @@ pub fn from_cmdline_args(args: &[String]) -> ArgumentParsingResult {
             Size2D::typed(res[0], res[1])
         }
         None => {
-            Size2D::typed(800, 600)
+            Size2D::typed(1024, 740)
         }
     };
 
diff --git a/tests/wpt/harness/wptrunner/executors/executorservo.py b/tests/wpt/harness/wptrunner/executors/executorservo.py
index 068061b958d..7f5e9067319 100644
--- a/tests/wpt/harness/wptrunner/executors/executorservo.py
+++ b/tests/wpt/harness/wptrunner/executors/executorservo.py
@@ -216,6 +216,8 @@ class ServoRefTestExecutor(ProcessTestExecutor):
 
             if viewport_size:
                 command += ["--resolution", viewport_size]
+            else:
+                command += ["--resolution", "800x600"]
 
             if dpi:
                 command += ["--device-pixel-ratio", dpi]
diff --git a/tests/wpt/mozilla/meta/MANIFEST.json b/tests/wpt/mozilla/meta/MANIFEST.json
index c274c632fd7..e0b0c50bd61 100644
--- a/tests/wpt/mozilla/meta/MANIFEST.json
+++ b/tests/wpt/mozilla/meta/MANIFEST.json
@@ -5509,7 +5509,8 @@
                 "=="
               ]
             ],
-            "url": "/_mozilla/css/viewport_meta.html"
+            "url": "/_mozilla/css/viewport_meta.html",
+            "viewport_size": "800x600"
           }
         ],
         "css/viewport_percentage_vmin_vmax_a.html": [
@@ -5573,7 +5574,8 @@
                 "=="
               ]
             ],
-            "url": "/_mozilla/css/viewport_rule.html"
+            "url": "/_mozilla/css/viewport_rule.html",
+            "viewport_size": "800x600"
           }
         ],
         "css/visibility_hidden.html": [
@@ -12609,7 +12611,8 @@
               "=="
             ]
           ],
-          "url": "/_mozilla/css/viewport_meta.html"
+          "url": "/_mozilla/css/viewport_meta.html",
+          "viewport_size": "800x600"
         }
       ],
       "css/viewport_percentage_vmin_vmax_a.html": [
@@ -12673,7 +12676,8 @@
               "=="
             ]
           ],
-          "url": "/_mozilla/css/viewport_rule.html"
+          "url": "/_mozilla/css/viewport_rule.html",
+          "viewport_size": "800x600"
         }
       ],
       "css/visibility_hidden.html": [
diff --git a/tests/wpt/mozilla/tests/css/viewport_meta.html b/tests/wpt/mozilla/tests/css/viewport_meta.html
index e3d336c1e0e..69c57539ec5 100644
--- a/tests/wpt/mozilla/tests/css/viewport_meta.html
+++ b/tests/wpt/mozilla/tests/css/viewport_meta.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <link rel=match href=viewport_rule_ref.html>
+    <meta name=viewport-size content=800x600>
     <meta name="viewport" content="width=240">
     <style>
       #container {
diff --git a/tests/wpt/mozilla/tests/css/viewport_rule.html b/tests/wpt/mozilla/tests/css/viewport_rule.html
index 36d0d4c0082..09d9c72a165 100644
--- a/tests/wpt/mozilla/tests/css/viewport_rule.html
+++ b/tests/wpt/mozilla/tests/css/viewport_rule.html
@@ -2,6 +2,7 @@
 <html>
   <head>
     <link rel=match href=viewport_rule_ref.html>
+    <meta name=viewport-size content=800x600>
     <style>
       @viewport {
         height: auto;