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

Auto merge of #6828 - Ms2ger:intermittents, r=SimonSapin

Browse source 
Try to reduce intermittent failures.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6828)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-07-29 05:32:52 -06:00
commit d707792cce
3 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
components/net_traits/image/base.rs
View file

@ -101,11 +101,11 @@ pub fn load_from_memory(buffer: &[u8]) -> Option<Image> {
}) })
} }
stb_image2::LoadResult::ImageF32(_image) => { stb_image2::LoadResult::ImageF32(_image) => {
error!("HDR images not implemented"); debug!("HDR images not implemented");
None None
} }
stb_image2::LoadResult::Error(e) => { stb_image2::LoadResult::Error(e) => {
error!("stb_image failed: {}", e); debug!("stb_image failed: {}", e);
None None
} }
} }

2
tests/wpt/metadata/2dcontext/building-paths/canvas_complexshapes_arcto_001.htm.ini
View file

@ -2,4 +2,4 @@
type: reftest type: reftest
reftype: == reftype: ==
refurl: /2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm refurl: /2dcontext/building-paths/canvas_complexshapes_arcto_001-ref.htm
expected: FAIL disabled: https://github.com/servo/servo/issues/6780

2
tests/wpt/metadata/2dcontext/building-paths/canvas_complexshapes_beziercurveto_001.htm.ini
View file

@ -2,4 +2,4 @@
type: reftest type: reftest
reftype: == reftype: ==
refurl: /2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm refurl: /2dcontext/building-paths/canvas_complexshapes_beziercurveto_001-ref.htm
expected: FAIL disabled: https://github.com/servo/servo/issues/6748