auto merge of #5349 : mbrubeck/servo/placement-size, r=pcwalton

I think this should have been changed in #3618 but was missed. r? @pcwalton

I wasn't able to come up with a good test case for this, partly because of other bugs related to floats and formatting contexts.
This commit is contained in:
bors-servo 2015-03-31 14:15:59 -06:00
commit b79d06c8d2

View file

@ -1449,9 +1449,7 @@ impl BlockFlow {
let info = PlacementInfo {
size: LogicalSize::new(self.fragment.style.writing_mode,
self.base.position.size.inline +
self.fragment.margin.inline_start_end() +
self.fragment.border_padding.inline_start_end(),
self.base.position.size.inline,
self.fragment.border_box.size.block),
ceiling: self.base.position.start.b,
max_inline_size: MAX_AU,