зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #16892 - Allow -moz-stack-sizing to work in a single direction only (from pamadini:master); r=Manishearth
<!-- Please describe your changes on the following line: --> https://bugzilla.mozilla.org/show_bug.cgi?id=1364115 https://reviewboard.mozilla.org/r/138434/ --- <!-- 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 - [ ] These changes fix #__ (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because these properties are not implemented <!-- 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. --> Source-Repo: https://github.com/servo/servo Source-Revision: 486dac31c59c77acc281f1a45a4331880d35105b --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : fcd008892e39d5560d5e5aca6039136b99c6ba69
This commit is contained in:
Родитель
cddfee06c7
Коммит
b1de6f090b
|
@ -185,9 +185,6 @@ pub mod root {
|
||||||
pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.;
|
pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.;
|
||||||
pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
|
pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
|
||||||
pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
|
pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
|
||||||
pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0;
|
|
||||||
pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint =
|
|
||||||
1;
|
|
||||||
pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0;
|
pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0;
|
||||||
pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1;
|
pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1;
|
||||||
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
|
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
|
||||||
|
@ -6121,6 +6118,14 @@ pub mod root {
|
||||||
}
|
}
|
||||||
#[repr(u8)]
|
#[repr(u8)]
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
||||||
|
pub enum StyleStackSizing {
|
||||||
|
Ignore = 0,
|
||||||
|
StretchToFit = 1,
|
||||||
|
IgnoreHorizontal = 2,
|
||||||
|
IgnoreVertical = 3,
|
||||||
|
}
|
||||||
|
#[repr(u8)]
|
||||||
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
||||||
pub enum StyleTextJustify {
|
pub enum StyleTextJustify {
|
||||||
None = 0,
|
None = 0,
|
||||||
Auto = 1,
|
Auto = 1,
|
||||||
|
@ -30008,7 +30013,7 @@ pub mod root {
|
||||||
pub mBoxDirection: root::mozilla::StyleBoxDirection,
|
pub mBoxDirection: root::mozilla::StyleBoxDirection,
|
||||||
pub mBoxOrient: root::mozilla::StyleBoxOrient,
|
pub mBoxOrient: root::mozilla::StyleBoxOrient,
|
||||||
pub mBoxPack: root::mozilla::StyleBoxPack,
|
pub mBoxPack: root::mozilla::StyleBoxPack,
|
||||||
pub mStretchStack: bool,
|
pub mStackSizing: root::mozilla::StyleStackSizing,
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn bindgen_test_layout_nsStyleXUL() {
|
fn bindgen_test_layout_nsStyleXUL() {
|
||||||
|
@ -30047,10 +30052,10 @@ pub mod root {
|
||||||
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
||||||
, stringify ! ( mBoxPack ) ));
|
, stringify ! ( mBoxPack ) ));
|
||||||
assert_eq! (unsafe {
|
assert_eq! (unsafe {
|
||||||
& ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as *
|
& ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as *
|
||||||
const _ as usize } , 12usize , concat ! (
|
const _ as usize } , 12usize , concat ! (
|
||||||
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
||||||
, stringify ! ( mStretchStack ) ));
|
, stringify ! ( mStackSizing ) ));
|
||||||
}
|
}
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|
|
@ -185,9 +185,6 @@ pub mod root {
|
||||||
pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.;
|
pub const NS_FONT_SUB_SUPER_LARGE_SIZE: f64 = 45.;
|
||||||
pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
|
pub const NS_FONT_VARIANT_NORMAL: ::std::os::raw::c_uint = 0;
|
||||||
pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
|
pub const NS_FONT_VARIANT_SMALL_CAPS: ::std::os::raw::c_uint = 1;
|
||||||
pub const NS_STYLE_STACK_SIZING_IGNORE: ::std::os::raw::c_uint = 0;
|
|
||||||
pub const NS_STYLE_STACK_SIZING_STRETCH_TO_FIT: ::std::os::raw::c_uint =
|
|
||||||
1;
|
|
||||||
pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0;
|
pub const NS_STYLE_AZIMUTH_LEFT_SIDE: ::std::os::raw::c_uint = 0;
|
||||||
pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1;
|
pub const NS_STYLE_AZIMUTH_FAR_LEFT: ::std::os::raw::c_uint = 1;
|
||||||
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
|
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
|
||||||
|
@ -5994,6 +5991,14 @@ pub mod root {
|
||||||
}
|
}
|
||||||
#[repr(u8)]
|
#[repr(u8)]
|
||||||
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
||||||
|
pub enum StyleStackSizing {
|
||||||
|
Ignore = 0,
|
||||||
|
StretchToFit = 1,
|
||||||
|
IgnoreHorizontal = 2,
|
||||||
|
IgnoreVertical = 3,
|
||||||
|
}
|
||||||
|
#[repr(u8)]
|
||||||
|
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
|
||||||
pub enum StyleTextJustify {
|
pub enum StyleTextJustify {
|
||||||
None = 0,
|
None = 0,
|
||||||
Auto = 1,
|
Auto = 1,
|
||||||
|
@ -29537,7 +29542,7 @@ pub mod root {
|
||||||
pub mBoxDirection: root::mozilla::StyleBoxDirection,
|
pub mBoxDirection: root::mozilla::StyleBoxDirection,
|
||||||
pub mBoxOrient: root::mozilla::StyleBoxOrient,
|
pub mBoxOrient: root::mozilla::StyleBoxOrient,
|
||||||
pub mBoxPack: root::mozilla::StyleBoxPack,
|
pub mBoxPack: root::mozilla::StyleBoxPack,
|
||||||
pub mStretchStack: bool,
|
pub mStackSizing: root::mozilla::StyleStackSizing,
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn bindgen_test_layout_nsStyleXUL() {
|
fn bindgen_test_layout_nsStyleXUL() {
|
||||||
|
@ -29576,10 +29581,10 @@ pub mod root {
|
||||||
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
||||||
, stringify ! ( mBoxPack ) ));
|
, stringify ! ( mBoxPack ) ));
|
||||||
assert_eq! (unsafe {
|
assert_eq! (unsafe {
|
||||||
& ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as *
|
& ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as *
|
||||||
const _ as usize } , 12usize , concat ! (
|
const _ as usize } , 12usize , concat ! (
|
||||||
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
|
||||||
, stringify ! ( mStretchStack ) ));
|
, stringify ! ( mStackSizing ) ));
|
||||||
}
|
}
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
|
|
@ -4339,16 +4339,7 @@ clip-path
|
||||||
</%self:impl_trait>
|
</%self:impl_trait>
|
||||||
|
|
||||||
<%self:impl_trait style_struct_name="XUL"
|
<%self:impl_trait style_struct_name="XUL"
|
||||||
skip_longhands="-moz-stack-sizing -moz-box-ordinal-group">
|
skip_longhands="-moz-box-ordinal-group">
|
||||||
|
|
||||||
#[allow(non_snake_case)]
|
|
||||||
pub fn set__moz_stack_sizing(&mut self, v: longhands::_moz_stack_sizing::computed_value::T) {
|
|
||||||
use properties::longhands::_moz_stack_sizing::computed_value::T;
|
|
||||||
self.gecko.mStretchStack = v == T::stretch_to_fit;
|
|
||||||
}
|
|
||||||
|
|
||||||
${impl_simple_copy('_moz_stack_sizing', 'mStretchStack')}
|
|
||||||
|
|
||||||
#[allow(non_snake_case)]
|
#[allow(non_snake_case)]
|
||||||
pub fn set__moz_box_ordinal_group(&mut self, v: i32) {
|
pub fn set__moz_box_ordinal_group(&mut self, v: i32) {
|
||||||
self.gecko.mBoxOrdinal = v as u32;
|
self.gecko.mBoxOrdinal = v as u32;
|
||||||
|
|
|
@ -44,9 +44,9 @@ ${helpers.single_keyword("-moz-box-pack", "start center end justify",
|
||||||
alias="-webkit-box-pack",
|
alias="-webkit-box-pack",
|
||||||
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)")}
|
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/box-pack)")}
|
||||||
|
|
||||||
${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore",
|
${helpers.single_keyword("-moz-stack-sizing", "stretch-to-fit ignore ignore-horizontal ignore-vertical",
|
||||||
products="gecko", gecko_ffi_name="mStretchStack",
|
products="gecko", gecko_ffi_name="mStackSizing",
|
||||||
gecko_constant_prefix="NS_STYLE_STACK_SIZING",
|
gecko_enum_prefix="StyleStackSizing",
|
||||||
animation_value_type="none",
|
animation_value_type="none",
|
||||||
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-stack-sizing)")}
|
spec="Nonstandard (https://developer.mozilla.org/en-US/docs/Web/CSS/-moz-stack-sizing)")}
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче