Auto merge of #14538 - DominoTree:master, r=Manishearth,Wafflespeanut

Use LengthOrNormal for column-gap #14297

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #14297 (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because _____

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/14538)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-12-11 08:03:16 -08:00 committed by GitHub
commit 0530e648af
5 changed files with 22 additions and 88 deletions

View file

@ -99,9 +99,11 @@ impl Flow for MulticolFlow {
{
let column_style = self.block_flow.fragment.style.get_column();
// `None` is 'normal': "UA-specified length. A value of 1em is suggested."
let column_gap = column_style.column_gap.0.unwrap_or_else(||
self.block_flow.fragment.style.get_font().font_size);
let column_gap = match column_style.column_gap {
Either::First(len) => len,
Either::Second(_normal) => self.block_flow.fragment.style.get_font().font_size,
};
let mut column_count;
if let Either::First(column_width) = column_style.column_width {
column_count =