diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-04-12 01:16:32 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-04-12 01:16:32 -0500 |
commit | c8cd70f333d41864ff7bf7dce84301509c71d1d6 (patch) | |
tree | ea19e42a502f3674c0d80f6c7f535531f1ce0199 /components/script/dom | |
parent | 3c5a21ebf39b31cb77cb1a2e162e4abdac325e74 (diff) | |
parent | 7ecee05e4a098788fcb5f2764914411ed8d0ad54 (diff) | |
download | servo-c8cd70f333d41864ff7bf7dce84301509c71d1d6.tar.gz servo-c8cd70f333d41864ff7bf7dce84301509c71d1d6.zip |
Auto merge of #16229 - tomhoule:fix-lengths, r=emilio
style: Do not immediately convert absolute specified lengths
<!-- Please describe your changes on the following line: -->
This PR aims to solve issue #15729. I tried to follow the recommendations there as much as possible.
This is my first attempt at contributing to Servo, so this will probably need a lot of input, although I'm eager to make it as polished as possible.
- The base inaccuracy issue seems solved, as can be easily verified with the `console.log` based example in the issue.
- Very basic unit tests were added.
I have doubts mainly about the right way to represent these new enum variants for the various length units:
1. With new enum variants in `NoCalcLength` *and* newtypes (current solution)
2. With a `NoCalcLength::Absolute` variant that contains a new `AbsoluteLength` enum, but without newtypes
3. Same as solution 2 but with newtypes
- I mostly cared about unit tests until now but will investigate other types of tests
- Tests to check the clamping
- Write a proper commit message
Thanks for your time and feedback :)
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [X] `./mach build -d` does not report any errors
- [X] `./mach test-tidy` does not report any errors
- [X] These changes fix #15729.
<!-- Either: -->
- [X] There are tests for these changes
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
<!-- 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/16229)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom')
-rw-r--r-- | components/script/dom/element.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 4b3a6010a9a..58fd6c33e3f 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -561,7 +561,7 @@ impl LayoutElementHelpers for LayoutJS<Element> { } LengthOrPercentageOrAuto::Length(length) => { let width_value = specified::LengthOrPercentageOrAuto::Length( - specified::NoCalcLength::Absolute(length)); + specified::NoCalcLength::Absolute(specified::AbsoluteLength::Px(length.to_f32_px()))); hints.push(from_declaration( shared_lock, PropertyDeclaration::Width(width_value))); @@ -590,7 +590,7 @@ impl LayoutElementHelpers for LayoutJS<Element> { } LengthOrPercentageOrAuto::Length(length) => { let height_value = specified::LengthOrPercentageOrAuto::Length( - specified::NoCalcLength::Absolute(length)); + specified::NoCalcLength::Absolute(specified::AbsoluteLength::Px(length.to_f32_px()))); hints.push(from_declaration( shared_lock, PropertyDeclaration::Height(height_value))); |