Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 21:20:23 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #22645 - emilio:gecko-sync, r=emilio,mbrubeck

Browse source 
style: Sync changes from mozilla-central.

See each individual commit for details.

<!-- 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/22645)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-01-08 06:33:28 -05:00 • committed by GitHub
commit a0ba56cdf0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
82 changed files with 1277 additions and 1844 deletions
Download patch file Download diff file Expand all files Collapse all files

34
components/script/dom/element.rs
View file

@ -718,7 +718,9 @@ impl LayoutElementHelpers for LayoutDom<Element> {
specified::NoCalcLength::ServoCharacterWidth(specified::CharacterWidth(size));
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::Width(specified::LengthOrPercentageOrAuto::Length(value)),
PropertyDeclaration::Width(specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Length(value),
)),
));
}
@ -743,8 +745,8 @@ impl LayoutElementHelpers for LayoutDom<Element> {
match width {
LengthOrPercentageOrAuto::Auto => {},
LengthOrPercentageOrAuto::Percentage(percentage) => {
let width_value = specified::LengthOrPercentageOrAuto::Percentage(
computed::Percentage(percentage),
let width_value = specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Percentage(computed::Percentage(percentage)),
);
hints.push(from_declaration(
shared_lock,
@ -752,10 +754,11 @@ impl LayoutElementHelpers for LayoutDom<Element> {
));
},
LengthOrPercentageOrAuto::Length(length) => {
let width_value =
specified::LengthOrPercentageOrAuto::Length(specified::NoCalcLength::Absolute(
let width_value = specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Length(specified::NoCalcLength::Absolute(
specified::AbsoluteLength::Px(length.to_f32_px()),
));
)),
);
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::Width(width_value),
@ -776,8 +779,8 @@ impl LayoutElementHelpers for LayoutDom<Element> {
match height {
LengthOrPercentageOrAuto::Auto => {},
LengthOrPercentageOrAuto::Percentage(percentage) => {
let height_value = specified::LengthOrPercentageOrAuto::Percentage(
computed::Percentage(percentage),
let height_value = specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Percentage(computed::Percentage(percentage)),
);
hints.push(from_declaration(
shared_lock,
@ -785,10 +788,11 @@ impl LayoutElementHelpers for LayoutDom<Element> {
));
},
LengthOrPercentageOrAuto::Length(length) => {
let height_value =
specified::LengthOrPercentageOrAuto::Length(specified::NoCalcLength::Absolute(
let height_value = specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Length(specified::NoCalcLength::Absolute(
specified::AbsoluteLength::Px(length.to_f32_px()),
));
)),
);
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::Height(height_value),
@ -815,7 +819,9 @@ impl LayoutElementHelpers for LayoutDom<Element> {
specified::NoCalcLength::ServoCharacterWidth(specified::CharacterWidth(cols));
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::Width(specified::LengthOrPercentageOrAuto::Length(value)),
PropertyDeclaration::Width(specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Length(value),
)),
));
}
@ -837,7 +843,9 @@ impl LayoutElementHelpers for LayoutDom<Element> {
));
hints.push(from_declaration(
shared_lock,
PropertyDeclaration::Height(specified::LengthOrPercentageOrAuto::Length(value)),
PropertyDeclaration::Height(specified::LengthPercentageOrAuto::LengthPercentage(
specified::LengthPercentage::Length(value),
)),
));
}