diff options
| author | Lars Bergstrom <larsberg@mozilla.com> | 2016-06-30 22:43:02 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-06-30 22:43:02 -0500 |
| commit | 5d225d9d667b469fc41ff543f3e84fef45555ace (patch) | |
| tree | 9fa19b6af9578cc0dc6343960371f4bdd48f0152 | |
| parent | 63d99c188cbc37a907e887a61e762300f60960d6 (diff) | |
| parent | e4d3c74928e54a2d6ef0adf523c15feea6154ce8 (diff) | |
| download | servo-5d225d9d667b469fc41ff543f3e84fef45555ace.tar.gz servo-5d225d9d667b469fc41ff543f3e84fef45555ace.zip | |
Merge pull request #11953 from Manishearth/more-res
Bump default resolution to 1024x768
| -rw-r--r-- | components/util/opts.rs | 6 | ||||
| -rw-r--r-- | tests/wpt/harness/wptrunner/executors/executorservo.py | 2 | ||||
| -rw-r--r-- | tests/wpt/mozilla/meta/MANIFEST.json | 12 | ||||
| -rw-r--r-- | tests/wpt/mozilla/tests/css/viewport_meta.html | 1 | ||||
| -rw-r--r-- | 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 86965f1dc49..80f6462e081 100644 --- a/tests/wpt/mozilla/meta/MANIFEST.json +++ b/tests/wpt/mozilla/meta/MANIFEST.json @@ -5521,7 +5521,8 @@ "==" ] ], - "url": "/_mozilla/css/viewport_meta.html" + "url": "/_mozilla/css/viewport_meta.html", + "viewport_size": "800x600" } ], "css/viewport_percentage_vmin_vmax_a.html": [ @@ -5585,7 +5586,8 @@ "==" ] ], - "url": "/_mozilla/css/viewport_rule.html" + "url": "/_mozilla/css/viewport_rule.html", + "viewport_size": "800x600" } ], "css/visibility_hidden.html": [ @@ -12633,7 +12635,8 @@ "==" ] ], - "url": "/_mozilla/css/viewport_meta.html" + "url": "/_mozilla/css/viewport_meta.html", + "viewport_size": "800x600" } ], "css/viewport_percentage_vmin_vmax_a.html": [ @@ -12697,7 +12700,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; |