diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-01-06 19:27:39 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-06 19:27:39 -0500 |
| commit | bffe2a699e9f0b2c41aa811ea2c3e90e40342419 (patch) | |
| tree | ffa50ac65f6ecec0de2de4d4c283184391351a58 /components/script | |
| parent | 0196160551e03061027005bf4456e8eeb24e4d8b (diff) | |
| parent | ecd9794a81d0ead13e47348994ea323556f969b1 (diff) | |
| download | servo-bffe2a699e9f0b2c41aa811ea2c3e90e40342419.tar.gz servo-bffe2a699e9f0b2c41aa811ea2c3e90e40342419.zip | |
Auto merge of #22641 - emilio:gecko-sync, r=emilio
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/22641)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script')
| -rw-r--r-- | components/script/dom/element.rs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/components/script/dom/element.rs b/components/script/dom/element.rs index 91cc8939590..233d4a01bb3 100644 --- a/components/script/dom/element.rs +++ b/components/script/dom/element.rs @@ -128,6 +128,7 @@ use style::selector_parser::{ }; use style::shared_lock::{Locked, SharedRwLock}; use style::thread_state; +use style::values::generics::NonNegative; use style::values::{computed, specified}; use style::values::{CSSFloat, Either}; use style::CaseSensitivityExt; @@ -847,8 +848,9 @@ impl LayoutElementHelpers for LayoutDom<Element> { }; if let Some(border) = border { - let width_value = - specified::BorderSideWidth::Length(specified::Length::from_px(border as f32)); + let width_value = specified::BorderSideWidth::Length(NonNegative( + specified::Length::from_px(border as f32), + )); hints.push(from_declaration( shared_lock, PropertyDeclaration::BorderTopWidth(width_value.clone()), |