diff options
Diffstat (limited to 'components/layout/flex.rs')
-rw-r--r-- | components/layout/flex.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/flex.rs b/components/layout/flex.rs index d84373a7c21..7b8d694494c 100644 --- a/components/layout/flex.rs +++ b/components/layout/flex.rs @@ -19,14 +19,14 @@ use fragment::{Fragment, FragmentBorderBoxIterator, Overflow}; use gfx::display_list::StackingContext; use gfx_traits::ScrollRootId; use layout_debug; -use model::{IntrinsicISizes, MaybeAuto, MinMaxConstraint}; +use model::{IntrinsicISizes, MaybeAuto, SizeConstraint}; use model::{specified, specified_or_none}; use std::cmp::{max, min}; use std::ops::Range; use std::sync::Arc; use style::computed_values::{align_content, align_self, flex_direction, flex_wrap, justify_content}; use style::computed_values::border_collapse; -use style::context::{SharedStyleContext, StyleContext}; +use style::context::SharedStyleContext; use style::logical_geometry::{Direction, LogicalSize}; use style::properties::ServoComputedValues; use style::servo::restyle_damage::{REFLOW, REFLOW_OUT_OF_FLOW}; @@ -38,7 +38,7 @@ use style::values::computed::{LengthOrPercentageOrAutoOrContent, LengthOrPercent #[derive(Debug)] enum AxisSize { Definite(Au), - MinMax(MinMaxConstraint), + MinMax(SizeConstraint), Infinite, } @@ -62,7 +62,7 @@ impl AxisSize { } } LengthOrPercentageOrAuto::Auto => { - AxisSize::MinMax(MinMaxConstraint::new(content_size, min, max)) + AxisSize::MinMax(SizeConstraint::new(content_size, min, max, None)) } } } |