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

auto merge of #1767 : kmcallister/servo/misc, r=metajack

Browse source
This commit is contained in:
bors-servo 2014-02-26 22:37:38 -05:00
commit 94a12469f0
17 changed files with 49 additions and 120 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/components/main/servo.rs
View file

@ -117,7 +117,7 @@ pub mod util;
#[start]
fn start(argc: int, argv: **u8) -> int {
native::start(argc, argv, proc() {
run(opts::from_cmdline_args(os::args()))
opts::from_cmdline_args(os::args()).map(run);
})
}
@ -131,7 +131,7 @@ pub extern "C" fn android_start(argc: int, argv: **u8) -> int {
args.push(str::raw::from_c_str(*argv.offset(i as int) as *i8));
}
}
run(opts::from_cmdline_args(args))
opts::from_cmdline_args(os::args()).map(run);
})
}

25
src/components/util/opts.rs
View file

@ -10,6 +10,8 @@ use azure::azure_hl::{CoreGraphicsAcceleratedBackend, Direct2DBackend, SkiaBacke
use extra::getopts::groups;
use std::num;
use std::rt;
use std::io;
use std::os;
/// Global flags for Servo, currently set on the command line.
#[deriving(Clone)]
@ -59,7 +61,12 @@ fn print_usage(app: &str, opts: &[groups::OptGroup]) {
println(groups::usage(message, opts));
}
pub fn from_cmdline_args(args: &[~str]) -> Opts {
fn args_fail(msg: &str) {
io::stderr().write_line(msg);
os::set_exit_status(1);
}
pub fn from_cmdline_args(args: &[~str]) -> Option<Opts> {
let app_name = args[0].to_str();
let args = args.tail();
@ -80,19 +87,21 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
let opt_match = match groups::getopts(args, opts) {
Ok(m) => m,
Err(f) => fail!(f.to_err_msg()),
Err(f) => {
args_fail(f.to_err_msg());
return None;
}
};
if opt_match.opt_present("h") || opt_match.opt_present("help") {
print_usage(app_name, opts);
// TODO: how to return a null struct and let the caller know that
// it should abort?
fail!("")
return None;
};
let urls = if opt_match.free.is_empty() {
print_usage(app_name, opts);
fail!(~"servo asks that you provide 1 or more URLs")
args_fail("servo asks that you provide 1 or more URLs");
return None;
} else {
opt_match.free.clone()
};
@ -138,7 +147,7 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
None => num::max(rt::default_sched_threads() * 3 / 4, 1),
};
Opts {
Some(Opts {
urls: urls,
render_backend: render_backend,
n_render_threads: n_render_threads,
@ -151,5 +160,5 @@ pub fn from_cmdline_args(args: &[~str]) -> Opts {
headless: opt_match.opt_present("z"),
hard_fail: opt_match.opt_present("f"),
bubble_widths_separately: opt_match.opt_present("b"),
}
})
}

31
src/test/harness/reftest/rasterize.py
View file

@ -1,31 +0,0 @@
# Copyright 2013 The Servo Project Developers. See the COPYRIGHT
# file at the top-level directory of this distribution.
#
# Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
# http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
# <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
# option. This file may not be copied, modified, or distributed
# except according to those terms.
import sys, os
from selenium import webdriver
input = sys.argv[1]
output = sys.argv[2]
input = os.path.abspath(input)
output = os.path.abspath(output)
input = "file://" + input
print input
print output
driver = webdriver.Firefox()
driver.set_window_size(800, 1000)
driver.get(input)
screenshot = driver.get_screenshot_as_file(output)
driver.quit()

5
src/test/html/ref/blank.html
View file

@ -1,5 +0,0 @@
<!DOCTYPE html>
<html>
<body>
</body>
</html>

BIN
src/test/html/ref/boxes.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 4 KiB

14
src/test/html/ref/compute_height_width.html
View file

@ -1,14 +0,0 @@
<!-- ignore -->
<head>
<link rel="stylesheet" href="height_width.css" />
</head>
<body>
<div class="start">
<div class="whole"></div>
<div class="half"></div>
<div class="quarter"></div>
<div class="eighth"></div>
<div class="sixteenth"></div>
<div class="thirtysecond"></div>
</div>
</body>

14
src/test/html/ref/height_compute.html
View file

@ -1,14 +0,0 @@
<!-- ignore -->
<head>
<link rel="stylesheet" href="height_compute.css" />
</head>
<body>
<div class="start">
<div class="half"></div>
<div class="quarter"></div>
<div class="eighth"></div>
<div class="sixteenth"></div>
<div class="thirtysecond"></div>
<div class="sixtyfourth"></div>
</div>
</body>

15
src/test/html/ref/height_compute_reset.html
View file

@ -1,15 +0,0 @@
<!-- ignore -->
<head>
<link rel="stylesheet" href="reset.css" />
<link rel="stylesheet" href="height_compute_reset.css" />
</head>
<body>
<div class="start">
<div class="half"></div>
<div class="quarter"></div>
<div class="eighth"></div>
<div class="sixteenth"></div>
<div class="thirtysecond"></div>
<div class="sixtyfourth"></div>
</div>
</body>

10
src/test/html/ref/height_width.css
View file

@ -1,10 +0,0 @@
div {display : inline}
div div {width : 120px}
.start {background-color : gray; height : 500px}
.whole {background-color : red; height : 100%}
.half {background-color : rgb(250, 125, 0); height : 50%}
.quarter {background-color : yellow; height : 25%}
.eighth {background-color : green; height : 12.5%}
.sixteenth {background-color : blue; height : 6.25%}
.thirtysecond {background-color : purple; height : 3.125%}

1
src/test/html/ref/simple-reset.css
View file

@ -1 +0,0 @@
body { margin: 0px }

2
src/test/html/ref/square.css
View file

@ -1,2 +0,0 @@
body {margin : 0px}
.box {background-color : green; height : 400px; width : 400px}

6
src/test/html/ref/square.html
View file

@ -1,6 +0,0 @@
<head>
<link rel="stylesheet" href="square.css" />
</head>
<body>
<div class="box"></div>
</body>

12
src/test/html/ref/test-image.html
View file

@ -1,12 +0,0 @@
<!DOCTYPE html>
<html>
<head>
<title>test</title>
<link rel="stylesheet" href="simple-reset.css" />
</head>
<body>
<img src="boxes.png" width="640" height="480"/>
</body>
</html>

1
src/test/ref/basic.list
View file

@ -35,3 +35,4 @@
== block_image.html 500x300_green.html
# == simple_iframe.html simple_iframe_ref.html -- disabled due to iframe crashiness
== object_element_a.html object_element_b.html
== height_compute_reset.html height_compute.html

14
src/test/html/ref/height_compute.css → src/test/ref/height_compute.html
View file

@ -1,3 +1,5 @@
<head>
<style type="text/css">
body {margin : 0px}
.start {background-color : gray; height : 600px}
.half {background-color : red; height : 50%}
@ -6,3 +8,15 @@ body {margin : 0px}
.sixteenth {background-color : green; height : 6.25%}
.thirtysecond {background-color : blue; height : 3.125%}
.sixtyfourth {background-color : purple; height : 1.5625%}
</style>
</head>
<body>
<div class="start">
<div class="half"></div>
<div class="quarter"></div>
<div class="eighth"></div>
<div class="sixteenth"></div>
<div class="thirtysecond"></div>
<div class="sixtyfourth"></div>
</div>
</body>

15
src/test/html/ref/height_compute_reset.css → src/test/ref/height_compute_reset.html
View file

@ -1,3 +1,6 @@
<head>
<link rel="stylesheet" href="reset.css" />
<style type="text/css">
.start {background-color : gray; height : 600px}
.half {background-color : red; height : 50%}
.quarter {background-color : rgb(250, 125, 0); height : 25%}
@ -5,3 +8,15 @@
.sixteenth {background-color : green; height : 6.25%}
.thirtysecond {background-color : blue; height : 3.125%}
.sixtyfourth {background-color : purple; height : 1.5625%}
</style>
</head>
<body>
<div class="start">
<div class="half"></div>
<div class="quarter"></div>
<div class="eighth"></div>
<div class="sixteenth"></div>
<div class="thirtysecond"></div>
<div class="sixtyfourth"></div>
</div>
</body>

0
src/test/html/ref/reset.css → src/test/ref/reset.css
View file