Use explicit height of inline-block fragments

Fixes #12492
This commit is contained in:
Michael Howell 2016-07-28 16:02:05 -07:00
parent 27d8fb3807
commit afbd047695

View file

@ -2005,9 +2005,10 @@ impl Fragment {
// See CSS 2.1 § 10.8.1. // See CSS 2.1 § 10.8.1.
let flow = &info.flow_ref; let flow = &info.flow_ref;
let block_flow = flow.as_block(); let block_flow = flow.as_block();
let is_auto = self.style.get_position().height == LengthOrPercentageOrAuto::Auto;
let baseline_offset = match flow.baseline_offset_of_last_line_box_in_flow() { let baseline_offset = match flow.baseline_offset_of_last_line_box_in_flow() {
Some(baseline_offset) => baseline_offset, Some(baseline_offset) if is_auto => baseline_offset,
None => block_flow.fragment.border_box.size.block, _ => block_flow.fragment.border_box.size.block,
}; };
let start_margin = block_flow.fragment.margin.block_start; let start_margin = block_flow.fragment.margin.block_start;
let end_margin = block_flow.fragment.margin.block_end; let end_margin = block_flow.fragment.margin.block_end;