Skip to content
This repository was archived by the owner on Jul 10, 2023. It is now read-only.

Make percent width/height/margin/padding not crash #14

Merged
merged 1 commit into from
Jun 1, 2013
Merged

Make percent width/height/margin/padding not crash #14

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 29 additions & 5 deletions computed.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,30 +187,54 @@ fn convert_net_border_width(width: n::v::CssBorderWidthValue) -> CSSValue<CSSBor
fn convert_net_margin(margin: n::v::CssMarginValue) -> CSSValue<CSSMargin> {
match margin {
n::v::CssMarginInherit => Inherit,
n::v::CssMarginSet(length) => Specified(CSSMarginLength(convert_net_unit_to_length(length))),
n::v::CssMarginSet(value) => {
let length = convert_net_unit_to_length_or_percent(value);
match length {
Left(abs) => Specified(CSSMarginLength(abs)),
Right(percent) => Specified(CSSMarginPercentage(percent))
}
}
n::v::CssMarginAuto => Specified(CSSMarginAuto)
}
}

fn convert_net_padding(padding: n::v::CssPaddingValue) -> CSSValue<CSSPadding> {
match padding {
n::v::CssPaddingInherit => Inherit,
n::v::CssPaddingSet(length) => Specified(CSSPaddingLength(convert_net_unit_to_length(length)))
n::v::CssPaddingSet(value) => {
let length = convert_net_unit_to_length_or_percent(value);
match length {
Left(abs) => Specified(CSSPaddingLength(abs)),
Right(percent) => Specified(CSSPaddingPercentage(percent))
}
}
}
}

fn convert_net_width_value(value: n::v::CssWidthValue) -> CSSValue<CSSWidth> {
match value {
n::v::CssWidthInherit => Inherit,
n::v::CssWidthSet(length) => Specified(CSSWidthLength(convert_net_unit_to_length(length))),
n::v::CssWidthSet(value) => {
let length = convert_net_unit_to_length_or_percent(value);
match length {
Left(abs) => Specified(CSSWidthLength(abs)),
Right(percent) => Specified(CSSWidthPercentage(percent))
}
}
n::v::CssWidthAuto => Specified(CSSWidthAuto)
}
}

fn convert_net_height_value(value: n::v::CssHeightValue) -> CSSValue<CSSHeight> {
match value {
n::v::CssHeightInherit => Inherit,
n::v::CssHeightSet(length) => Specified(CSSHeightLength(convert_net_unit_to_length(length))),
n::v::CssHeightSet(value) => {
let length = convert_net_unit_to_length_or_percent(value);
match length {
Left(abs) => Specified(CSSHeightLength(abs)),
Right(percent) => Specified(CSSHeightPercentage(percent))
}
}
n::v::CssHeightAuto => Specified(CSSHeightAuto)
}
}
Expand Down Expand Up @@ -364,7 +388,7 @@ fn convert_net_line_height_value(value: n::v::CssLineHeightValue) -> CSSValue<CS
fn convert_net_unit_to_length(unit: n::t::CssUnit) -> Length {
match convert_net_unit_to_length_or_percent(unit) {
Left(v) => v,
Right(*) => Px(100.0), // FIXME(pcwalton): fill this in.
Right(*) => fail!(~"unexpected percentage unit"),
}
}

Expand Down