Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 05:30:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Mauricio Collares 2016-04-04 23:51:17 -03:00
parent aae8919da4
commit bbc5c51be8
3 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

7
components/layout/flex.rs
View file

@ -25,7 +25,6 @@ use std::cmp::max;
use std::sync::Arc; use std::sync::Arc;
use style::computed_values::flex_direction; use style::computed_values::flex_direction;
use style::logical_geometry::LogicalSize; use style::logical_geometry::LogicalSize;
use style::properties::style_structs;
use style::properties::{ComputedValues, ServoComputedValues}; use style::properties::{ComputedValues, ServoComputedValues};
use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone}; use style::values::computed::{LengthOrPercentage, LengthOrPercentageOrAuto, LengthOrPercentageOrNone};
@ -88,10 +87,6 @@ pub struct FlexFlow {
available_cross_size: AxisSize available_cross_size: AxisSize
} }
fn flex_style(fragment: &Fragment) -> &style_structs::Flex {
fragment.style.get_flex()
}
// TODO(zentner): This function should use flex-basis. // TODO(zentner): This function should use flex-basis.
fn flex_item_inline_sizes(flow: &mut Flow) -> IntrinsicISizes { fn flex_item_inline_sizes(flow: &mut Flow) -> IntrinsicISizes {
let _scope = layout_debug_scope!("flex::flex_item_inline_sizes"); let _scope = layout_debug_scope!("flex::flex_item_inline_sizes");
@ -113,7 +108,7 @@ impl FlexFlow {
flotation: Option<FloatKind>) flotation: Option<FloatKind>)
-> FlexFlow { -> 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::row_reverse | flex_direction::T::row => Mode::Inline,
flex_direction::T::column_reverse | flex_direction::T::column => Mode::Block flex_direction::T::column_reverse | flex_direction::T::column => Mode::Block
}; };

2
components/layout/incremental.rs
View file

@ -208,7 +208,7 @@ pub fn compute_damage(old: Option<&Arc<ServoComputedValues>>, new: &ServoCompute
get_inheritedtable.border_collapse, get_inheritedtable.border_collapse,
get_inheritedtable.border_spacing, get_inheritedtable.border_spacing,
get_column.column_gap, get_column.column_gap,
get_flex.flex_direction get_position.flex_direction
]) || add_if_not_equal!(old, new, damage, ]) || add_if_not_equal!(old, new, damage,
[ REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW ], [ [ REPAINT, STORE_OVERFLOW, REFLOW_OUT_OF_FLOW ], [
get_position.top, get_position.left, get_position.top, get_position.left,

2
components/style/properties.mako.rs
View file

@ -4860,7 +4860,7 @@ pub mod longhands {
// CSS Flexible Box Layout Module Level 1 // CSS Flexible Box Layout Module Level 1
// http://www.w3.org/TR/css3-flexbox/ // http://www.w3.org/TR/css3-flexbox/
${new_style_struct("Flex", is_inherited=False)} ${switch_to_style_struct("Position")}
// Flex container properties // Flex container properties
${single_keyword("flex-direction", "row row-reverse column column-reverse", experimental=True)} ${single_keyword("flex-direction", "row row-reverse column column-reverse", experimental=True)}