Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 20:50:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #11953 from Manishearth/more-res

Browse source 
Bump default resolution to 1024x768
This commit is contained in:
Lars Bergstrom 2016-06-30 22:43:02 -05:00 • committed by GitHub
commit 5d225d9d66
5 changed files with 15 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/util/opts.rs
View file

@ -486,7 +486,7 @@ pub fn default_opts() -> Opts {
trace_layout: false, trace_layout: false,
devtools_port: None, devtools_port: None,
webdriver_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), user_agent: default_user_agent_string(DEFAULT_USER_AGENT),
multiprocess: false, multiprocess: false,
random_pipeline_closure_probability: None, 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.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("", "devtools", "Start remote devtools server on port", "6000");
opts.optflagopt("", "webdriver", "Start remote WebDriver server on port", "7000"); 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", opts.optopt("u",
"user-agent", "user-agent",
"Set custom user agent string (or android / desktop for platform default)", "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]) Size2D::typed(res[0], res[1])
} }
None => { None => {
Size2D::typed(800, 600) Size2D::typed(1024, 740)
} }
}; };

2
tests/wpt/harness/wptrunner/executors/executorservo.py
View file

@ -216,6 +216,8 @@ class ServoRefTestExecutor(ProcessTestExecutor):
if viewport_size: if viewport_size:
command += ["--resolution", viewport_size] command += ["--resolution", viewport_size]
else:
command += ["--resolution", "800x600"]
if dpi: if dpi:
command += ["--device-pixel-ratio", dpi] command += ["--device-pixel-ratio", dpi]

12
tests/wpt/mozilla/meta/MANIFEST.json
View file

@ -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": [ "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": [ "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": [ "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": [ "css/visibility_hidden.html": [

1
tests/wpt/mozilla/tests/css/viewport_meta.html
View file

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<link rel=match href=viewport_rule_ref.html> <link rel=match href=viewport_rule_ref.html>
<meta name=viewport-size content=800x600>
<meta name="viewport" content="width=240"> <meta name="viewport" content="width=240">
<style> <style>
#container { #container {

1
tests/wpt/mozilla/tests/css/viewport_rule.html
View file

@ -2,6 +2,7 @@
<html> <html>
<head> <head>
<link rel=match href=viewport_rule_ref.html> <link rel=match href=viewport_rule_ref.html>
<meta name=viewport-size content=800x600>
<style> <style>
@viewport { @viewport {
height: auto; height: auto;