aboutsummaryrefslogtreecommitdiffstats
path: root/components/layout/flex.rs
diff options
context:
space:
mode:
authorCameron McCormack <cam@mcc.id.au>2016-05-04 11:06:42 +1000
committerCameron McCormack <cam@mcc.id.au>2016-05-04 11:06:42 +1000
commit550d780e17860c463220246dcae1e84841c83887 (patch)
tree3b9ff8084616aaf3762d4b878c492dcca6796be0 /components/layout/flex.rs
parent2c69278067a23703b251a69c875bee49449c6bfc (diff)
downloadservo-550d780e17860c463220246dcae1e84841c83887.tar.gz
servo-550d780e17860c463220246dcae1e84841c83887.zip
Move width and height from Box to Position.
This helps with style struct alignment between Servo and Gecko.
Diffstat (limited to 'components/layout/flex.rs')
-rw-r--r--components/layout/flex.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/components/layout/flex.rs b/components/layout/flex.rs
index eed7ec8aae3..789018e4121 100644
--- a/components/layout/flex.rs
+++ b/components/layout/flex.rs
@@ -125,7 +125,7 @@ impl FlexFlow {
// Currently, this is the core of BlockFlow::bubble_inline_sizes() with all float logic
// stripped out, and max replaced with union_nonbreaking_inline.
fn inline_mode_bubble_inline_sizes(&mut self) {
- let fixed_width = match self.block_flow.fragment.style().get_box().width {
+ let fixed_width = match self.block_flow.fragment.style().get_position().width {
LengthOrPercentageOrAuto::Length(_) => true,
_ => false,
};
@@ -151,7 +151,7 @@ impl FlexFlow {
// Currently, this is the core of BlockFlow::bubble_inline_sizes() with all float logic
// stripped out.
fn block_mode_bubble_inline_sizes(&mut self) {
- let fixed_width = match self.block_flow.fragment.style().get_box().width {
+ let fixed_width = match self.block_flow.fragment.style().get_position().width {
LengthOrPercentageOrAuto::Length(_) => true,
_ => false,
};
@@ -398,9 +398,9 @@ impl Flow for FlexFlow {
let (available_block_size, available_inline_size) = {
let style = &self.block_flow.fragment.style;
let (specified_block_size, specified_inline_size) = if style.writing_mode.is_vertical() {
- (style.get_box().width, style.get_box().height)
+ (style.get_position().width, style.get_position().height)
} else {
- (style.get_box().height, style.get_box().width)
+ (style.get_position().height, style.get_position().width)
};
let available_inline_size = AxisSize::new(specified_inline_size,