Bump default resolution to 1024x740

servo · larsbergstrom · Jul 1, 2016 · Jun 30, 2016 · Jun 30, 2016 · e4d3c74928e54a2d6ef0adf523c15feea6154ce8
commit e4d3c74928e54a2d6ef0adf523c15feea6154ce8
diff --git 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
@@ -216,6 +216,8 @@ def screenshot(self, test, viewport_size, dpi):
 
             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
@@ -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
@@ -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
@@ -2,6 +2,7 @@
 <html>
   <head>
     <link rel=match href=viewport_rule_ref.html>
+    <meta name=viewport-size content=800x600>
     <style>
       @viewport {
         height: auto;