Auto merge of #16937 - nox:clamp-calc, r=emilio

Fix calc() clamping issues

<!-- Reviewable:start -->
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/16937)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-18 15:15:04 -05:00 committed by GitHub
commit b4204b5e2d
9 changed files with 36 additions and 24 deletions

View file

@ -24,7 +24,7 @@ impl From<CalcLengthOrPercentage> for nsStyleCoord_CalcValue {
fn from(other: CalcLengthOrPercentage) -> nsStyleCoord_CalcValue {
let has_percentage = other.percentage.is_some();
nsStyleCoord_CalcValue {
mLength: other.length().0,
mLength: other.unclamped_length().0,
mPercent: other.percentage.unwrap_or(0.0),
mHasPercent: has_percentage,
}