auto merge of #3517 : glennw/servo/revert-res-change, r=metajack

...FBO."

This reverts commit c74798bb6b.
This commit is contained in:
bors-servo 2014-09-28 19:42:27 -06:00
commit 132ade0fce

View file

@ -125,7 +125,7 @@ pub fn from_cmdline_args(args: &[String]) -> Option<Opts> {
getopts::optflag("", "disable-text-aa", "Disable antialiasing for text rendering."), getopts::optflag("", "disable-text-aa", "Disable antialiasing for text rendering."),
getopts::optflag("", "trace-layout", "Write layout trace to external file for debugging."), getopts::optflag("", "trace-layout", "Write layout trace to external file for debugging."),
getopts::optflag("", "devtools", "Start remote devtools server"), getopts::optflag("", "devtools", "Start remote devtools server"),
getopts::optopt("", "resolution", "Set window resolution.", "1280x1024"), getopts::optopt("", "resolution", "Set window resolution.", "800x600"),
getopts::optflag("h", "help", "Print this message") getopts::optflag("h", "help", "Print this message")
); );
@ -213,7 +213,7 @@ pub fn from_cmdline_args(args: &[String]) -> Option<Opts> {
TypedSize2D(res[0], res[1]) TypedSize2D(res[0], res[1])
} }
None => { None => {
TypedSize2D(1280, 1024) TypedSize2D(800, 600)
} }
}; };