Auto merge of #7011 - pcwalton:inline-margin-intrinsic-size, r=mbrubeck

layout: Take inline margins into account when determining the intrinsic sizes of fragments.

Avoids a needless wrapped line in the repository name on GitHub.

r? @mbrubeck

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7011)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-06 18:28:13 -06:00
commit da06c2dda0
5 changed files with 49 additions and 1 deletions

View file

@ -163,6 +163,7 @@ experimental == iframe/size_attributes_vertical_writing_mode.html iframe/size_at
== inline_hypothetical_box_a.html inline_hypothetical_box_ref.html
== inline_margin_multiple_fragments_a.html inline_margin_multiple_fragments_ref.html
== inline_margins_a.html inline_margins_ref.html
== inline_margins_intrinsic_size_a.html inline_margins_intrinsic_size_ref.html
== inline_padding_a.html inline_padding_b.html
# inline_text_align_a.html inline_text_align_b.html
== inline_whitespace_a.html inline_whitespace_ref.html