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

Rename cb_width to containing_width.

Browse source
This commit is contained in:
Jack Moffitt 2013-07-18 20:11:10 -06:00
parent b2c042df94
commit e10b36210c
1 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/components/main/layout/model.rs
View file

@ -31,10 +31,10 @@ pub enum MaybeAuto {
} }
impl MaybeAuto { impl MaybeAuto {
pub fn from_margin(margin: CSSMargin, cb_width: Au, font_size: CSSFontSize) -> MaybeAuto { pub fn from_margin(margin: CSSMargin, containing_width: Au, font_size: CSSFontSize) -> MaybeAuto {
match margin { match margin {
CSSMarginAuto => Auto, CSSMarginAuto => Auto,
CSSMarginPercentage(percent) => Specified(cb_width.scale_by(percent/100.0)), CSSMarginPercentage(percent) => Specified(containing_width.scale_by(percent/100.0)),
CSSMarginLength(Px(v)) => Specified(Au::from_frac_px(v)), CSSMarginLength(Px(v)) => Specified(Au::from_frac_px(v)),
CSSMarginLength(Pt(v)) => Specified(Au::from_pt(v)), CSSMarginLength(Pt(v)) => Specified(Au::from_pt(v)),
CSSMarginLength(Em(em)) => { CSSMarginLength(Em(em)) => {
@ -47,10 +47,10 @@ impl MaybeAuto {
} }
} }
pub fn from_width(width: CSSWidth, cb_width: Au, font_size: CSSFontSize) -> MaybeAuto { pub fn from_width(width: CSSWidth, containing_width: Au, font_size: CSSFontSize) -> MaybeAuto {
match width { match width {
CSSWidthAuto => Auto, CSSWidthAuto => Auto,
CSSWidthPercentage(percent) => Specified(cb_width.scale_by(percent/100.0)), CSSWidthPercentage(percent) => Specified(containing_width.scale_by(percent/100.0)),
CSSWidthLength(Px(v)) => Specified(Au::from_frac_px(v)), CSSWidthLength(Px(v)) => Specified(Au::from_frac_px(v)),
CSSWidthLength(Pt(v)) => Specified(Au::from_pt(v)), CSSWidthLength(Pt(v)) => Specified(Au::from_pt(v)),
CSSWidthLength(Em(em)) => { CSSWidthLength(Em(em)) => {
@ -117,11 +117,11 @@ impl BoxModel {
self.border.left = self.compute_border_width(style.border_left_width(), style.font_size()); self.border.left = self.compute_border_width(style.border_left_width(), style.font_size());
} }
pub fn compute_padding(&mut self, style: CompleteStyle, cb_width: Au) { pub fn compute_padding(&mut self, style: CompleteStyle, containing_width: Au) {
self.padding.top = self.compute_padding_length(style.padding_top(), cb_width, style.font_size()); self.padding.top = self.compute_padding_length(style.padding_top(), containing_width, style.font_size());
self.padding.right = self.compute_padding_length(style.padding_right(), cb_width, style.font_size()); self.padding.right = self.compute_padding_length(style.padding_right(), containing_width, style.font_size());
self.padding.bottom = self.compute_padding_length(style.padding_bottom(), cb_width, style.font_size()); self.padding.bottom = self.compute_padding_length(style.padding_bottom(), containing_width, style.font_size());
self.padding.left = self.compute_padding_length(style.padding_left(), cb_width, style.font_size()); self.padding.left = self.compute_padding_length(style.padding_left(), containing_width, style.font_size());
} }
pub fn noncontent_width(&self) -> Au { pub fn noncontent_width(&self) -> Au {