diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2020-02-11 23:05:37 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-11 23:05:37 -0500 |
| commit | 6d6d16f7f492e6346f0391e352015226a4444806 (patch) | |
| tree | d991c986a7f83be25157934e93c248ea86ee4b00 /components/style/values/computed/align.rs | |
| parent | baac1e2c69d3b6e840ced2be4b5e03bb39bd40d5 (diff) | |
| parent | d1f8d576f83714fe674a36c5b718341c236312e6 (diff) | |
| download | servo-6d6d16f7f492e6346f0391e352015226a4444806.tar.gz servo-6d6d16f7f492e6346f0391e352015226a4444806.zip | |
Auto merge of #25717 - emilio:gecko-sync, r=emilio,nox
style: Sync changes from mozilla-central.
See individual commits for details. https://bugzilla.mozilla.org/show_bug.cgi?id=1614394
Diffstat (limited to 'components/style/values/computed/align.rs')
| -rw-r--r-- | components/style/values/computed/align.rs | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/components/style/values/computed/align.rs b/components/style/values/computed/align.rs index ea6088db5d5..45d6cfac323 100644 --- a/components/style/values/computed/align.rs +++ b/components/style/values/computed/align.rs @@ -9,7 +9,9 @@ use crate::values::computed::{Context, ToComputedValue}; use crate::values::specified; -pub use super::specified::{AlignContent, AlignItems, JustifyContent, SelfAlignment}; +pub use super::specified::{ + AlignContent, AlignItems, ContentDistribution, JustifyContent, SelfAlignment, +}; pub use super::specified::{AlignSelf, JustifySelf}; /// The computed value for the `justify-items` property. @@ -34,7 +36,8 @@ pub use super::specified::{AlignSelf, JustifySelf}; /// /// See the discussion in https://bugzil.la/1384542. #[derive(Clone, Copy, Debug, Eq, PartialEq, ToCss, ToResolvedValue)] -pub struct JustifyItems { +#[repr(C)] +pub struct ComputedJustifyItems { /// The specified value for the property. Can contain the bare `legacy` /// keyword. #[css(skip)] @@ -45,6 +48,8 @@ pub struct JustifyItems { pub computed: specified::JustifyItems, } +pub use self::ComputedJustifyItems as JustifyItems; + impl JustifyItems { /// Returns the `legacy` value. pub fn legacy() -> Self { |