mirror of
https://github.com/servo/servo.git
synced 2025-08-16 10:55:34 +01:00
Auto merge of #14394 - jcdyer:jcdyer/either-column-width, r=Wafflespeanut
Convert column-width to use Either <!-- Please describe your changes on the following line: --> * Converted column-width to use `Either<Length, Auto>` * Added gecko glue code * Cleaned up old column-width glue code --- <!-- 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 #14350 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [x] These changes do not require tests because tests already surround the refactored code. <!-- 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/14394) <!-- Reviewable:end -->
This commit is contained in:
commit
a913815a4d
8 changed files with 38 additions and 97 deletions
|
@ -1145,7 +1145,10 @@ impl ComputedValues {
|
|||
#[inline]
|
||||
pub fn is_multicol(&self) -> bool {
|
||||
let style = self.get_column();
|
||||
style.column_count.0.is_some() || style.column_width.0.is_some()
|
||||
match style.column_width {
|
||||
Either::First(_width) => true,
|
||||
Either::Second(_auto) => style.column_count.0.is_some(),
|
||||
}
|
||||
}
|
||||
|
||||
/// Resolves the currentColor keyword.
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue