Auto merge of #7920 - glennw:flaky-snap, r=mbrubeck

Workaround for #7730.



<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7920)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-10-07 20:43:49 -06:00
commit 81806385ea

View file

@ -291,7 +291,7 @@ flaky_cpu == linebreak_simple_a.html linebreak_simple_b.html
== percentage_height_float_a.html percentage_height_float_ref.html
== percentage_height_root.html percentage_height_root_ref.html
== percentage_width_inline_block_a.html percentage_width_inline_block_ref.html
device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
resolution=300x300,device-pixel-ratio=2 != pixel_snapping_border_a.html pixel_snapping_border_ref.html
== png_rgba_colorspace_a.html png_rgba_colorspace_b.html
== position_abs_cb_with_non_cb_kid_a.html position_abs_cb_with_non_cb_kid_b.html
== position_abs_height_width_a.html position_abs_height_width_b.html