diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-02-10 17:00:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-02-10 17:00:26 -0500 |
commit | aeeaf9dda1936acc82ab039fd6fdd887e6add043 (patch) | |
tree | fb16f7cd6bc983f2ac00f54767d102d0e2a186ab /components/layout/table.rs | |
parent | a019ed1f80e9ecfe20d797d8e1304771e0fb0af7 (diff) | |
parent | 6daebcc5dfc4e57d2f9e9450aa01b8c67dd34986 (diff) | |
download | servo-aeeaf9dda1936acc82ab039fd6fdd887e6add043.tar.gz servo-aeeaf9dda1936acc82ab039fd6fdd887e6add043.zip |
Auto merge of #22861 - emilio:gecko-sync, r=emilio
style: Sync changes from mozilla-central.
See each individual commit for details.
<!-- 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/22861)
<!-- Reviewable:end -->
Diffstat (limited to 'components/layout/table.rs')
-rw-r--r-- | components/layout/table.rs | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/components/layout/table.rs b/components/layout/table.rs index f7bf902e452..7aa8f2a89d4 100644 --- a/components/layout/table.rs +++ b/components/layout/table.rs @@ -33,7 +33,7 @@ use style::logical_geometry::LogicalSize; use style::properties::style_structs::Background; use style::properties::ComputedValues; use style::servo::restyle_damage::ServoRestyleDamage; -use style::values::computed::LengthPercentageOrAuto; +use style::values::computed::NonNegativeLengthPercentageOrAuto; use style::values::CSSFloat; #[allow(unsafe_code)] @@ -301,15 +301,15 @@ impl Flow for TableFlow { self.column_intrinsic_inline_sizes .push(ColumnIntrinsicInlineSize { minimum_length: match *specified_inline_size { - LengthPercentageOrAuto::Auto => Au(0), - LengthPercentageOrAuto::LengthPercentage(ref lp) => { + NonNegativeLengthPercentageOrAuto::Auto => Au(0), + NonNegativeLengthPercentageOrAuto::LengthPercentage(ref lp) => { lp.maybe_to_used_value(None).unwrap_or(Au(0)) }, }, percentage: match *specified_inline_size { - LengthPercentageOrAuto::Auto => 0.0, - LengthPercentageOrAuto::LengthPercentage(ref lp) => { - lp.as_percentage().map_or(0.0, |p| p.0) + NonNegativeLengthPercentageOrAuto::Auto => 0.0, + NonNegativeLengthPercentageOrAuto::LengthPercentage(ref lp) => { + lp.0.as_percentage().map_or(0.0, |p| p.0) }, }, preferred: Au(0), |