Skip to content
Permalink
Browse files

Move CSS flex-direction property from Flex to Position and delete Flex

  • Loading branch information...
mauricioc committed Apr 5, 2016
1 parent aae8919 commit bbc5c51be89143f12b1693922c7d9892a51009c1
Showing with 3 additions and 8 deletions.
  1. +1 −6 components/layout/flex.rs
  2. +1 −1 components/layout/incremental.rs
  3. +1 −1 components/style/properties.mako.rs
@@ -25,7 +25,6 @@ use std::cmp::max;
use std::sync::Arc;
use style::computed_values::flex_direction;
use style::logical_geometry::LogicalSize;
use style::properties::style_structs;
use style::properties::{ComputedValues, ServoComputedValues};
use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};

@@ -88,10 +87,6 @@ pub struct FlexFlow {
available_cross_size: AxisSize
}

fn flex_style(fragment: &Fragment) -> &style_structs::Flex {
fragment.style.get_flex()
}

// TODO(zentner): This function should use flex-basis.
fn flex_item_inline_sizes(flow: &mut Flow) -> IntrinsicISizes {
let _scope = layout_debug_scope!("flex::flex_item_inline_sizes");
@@ -113,7 +108,7 @@ impl FlexFlow {
flotation: Option<FloatKind>)
-> FlexFlow {

let main_mode = match flex_style(&fragment).flex_direction {
let main_mode = match fragment.style.get_position().flex_direction {
flex_direction::T::row_reverse | flex_direction::T::row => Mode::Inline,
flex_direction::T::column_reverse | flex_direction::T::column => Mode::Block
};
@@ -208,7 +208,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
get_inheritedtable.border_collapse,
get_inheritedtable.border_spacing,
get_column.column_gap,
get_flex.flex_direction
get_position.flex_direction
]) || add_if_not_equal!(old, new, damage,
[ REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW ], [
get_position.top, get_position.left,
@@ -4860,7 +4860,7 @@ pub mod longhands {
// CSS Flexible Box Layout Module Level 1
// http://www.w3.org/TR/css3-flexbox/

${new_style_struct("Flex", is_inherited=False)}
${switch_to_style_struct("Position")}

// Flex container properties
${single_keyword("flex-direction", "row row-reverse column column-reverse", experimental=True)}

0 comments on commit bbc5c51

Please sign in to comment.
You can’t perform that action at this time.