Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-06 22:15:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7893 - Ms2ger:img-webdriver, r=jdm

Browse source 
Cleanup handle_take_screenshot.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7893)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-06 12:41:05 -06:00
commit e64ed839b6
1 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/webdriver_server/lib.rs
View file

@ -615,15 +615,16 @@ impl Handler {
sleep_ms(interval) sleep_ms(interval)
} }
if img.is_none() { let mut img = match img {
return Err(WebDriverError::new(ErrorStatus::Timeout, Some(img) => img,
"Taking screenshot timed out")); None => return Err(WebDriverError::new(ErrorStatus::Timeout,
} "Taking screenshot timed out")),
};
let img_vec = match png::to_vec(&mut img.unwrap()) { let img_vec = match png::to_vec(&mut img) {
Ok(x) => x, Ok(x) => x,
Err(_) => return Err(WebDriverError::new(ErrorStatus::UnknownError, Err(_) => return Err(WebDriverError::new(ErrorStatus::UnknownError,
"Taking screenshot failed")) "Taking screenshot failed"))
}; };
let config = Config { let config = Config {
char_set: CharacterSet::Standard, char_set: CharacterSet::Standard,