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

Move width and height from Box to Position.

Browse source 
This helps with style struct alignment between Servo and Gecko.
This commit is contained in:
Cameron McCormack 2016-05-04 11:06:42 +10:00
parent 2c69278067
commit 550d780e17
7 changed files with 25 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

8
components/style/animation.rs
View file

@ -158,7 +158,7 @@ impl PropertyAnimation {
[Color; get_color; color],
[FontSize; get_font; font_size],
[FontWeight; get_font; font_weight],
[Height; get_box; height],
[Height; get_position; height],
[Left; get_position; left],
[LineHeight; get_inheritedtext; line_height],
[MarginBottom; get_margin; margin_bottom],
@ -181,7 +181,7 @@ impl PropertyAnimation {
[Top; get_position; top],
[VerticalAlign; get_box; vertical_align],
[Visibility; get_inheritedbox; visibility],
[Width; get_box; width],
[Width; get_position; width],
[ZIndex; get_position; z_index]);
let property_animation = PropertyAnimation {
@ -256,7 +256,7 @@ impl PropertyAnimation {
[Color; mutate_color; color],
[FontSize; mutate_font; font_size],
[FontWeight; mutate_font; font_weight],
[Height; mutate_box; height],
[Height; mutate_position; height],
[Left; mutate_position; left],
[LineHeight; mutate_inheritedtext; line_height],
[MarginBottom; mutate_margin; margin_bottom],
@ -281,7 +281,7 @@ impl PropertyAnimation {
[Transform; mutate_effects; transform],
[VerticalAlign; mutate_box; vertical_align],
[Visibility; mutate_inheritedbox; visibility],
[Width; mutate_box; width],
[Width; mutate_position; width],
[ZIndex; mutate_position; z_index]);
}

10
components/style/properties/longhand/box.mako.rs
View file

@ -122,16 +122,6 @@ ${helpers.single_keyword("clear", "none left right both", gecko_ffi_name="mBreak
</%helpers:longhand>
${helpers.predefined_type("width",
"LengthOrPercentageOrAuto",
"computed::LengthOrPercentageOrAuto::Auto",
"parse_non_negative")}
${helpers.predefined_type("height",
"LengthOrPercentageOrAuto",
"computed::LengthOrPercentageOrAuto::Auto",
"parse_non_negative")}
<%helpers:longhand name="vertical-align">
use cssparser::ToCss;
use std::fmt;

10
components/style/properties/longhand/position.mako.rs
View file

@ -96,6 +96,16 @@ ${helpers.predefined_type("flex-basis",
${helpers.single_keyword("flex-wrap", "nowrap wrap wrap-reverse", products="gecko")}
${helpers.predefined_type("width",
"LengthOrPercentageOrAuto",
"computed::LengthOrPercentageOrAuto::Auto",
"parse_non_negative")}
${helpers.predefined_type("height",
"LengthOrPercentageOrAuto",
"computed::LengthOrPercentageOrAuto::Auto",
"parse_non_negative")}
${helpers.predefined_type("min-width",
"LengthOrPercentage",
"computed::LengthOrPercentage::Length(Au(0))",

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

@ -972,18 +972,18 @@ impl ServoComputedValues {
#[inline]
pub fn content_inline_size(&self) -> computed::LengthOrPercentageOrAuto {
let box_style = self.get_box();
let position_style = self.get_position();
if self.writing_mode.is_vertical() {
box_style.height
position_style.height
} else {
box_style.width
position_style.width
}
}
#[inline]
pub fn content_block_size(&self) -> computed::LengthOrPercentageOrAuto {
let box_style = self.get_box();
if self.writing_mode.is_vertical() { box_style.width } else { box_style.height }
let position_style = self.get_position();
if self.writing_mode.is_vertical() { position_style.width } else { position_style.height }
}
#[inline]