Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 12:40:06 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #16892 - pamadini:master, r=Manishearth

Browse source 
Allow -moz-stack-sizing to work in a single direction only.

<!-- 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. -->

<!-- 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/16892)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-05-18 21:47:21 -05:00 • committed by GitHub
commit 486dac31c5
4 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

17
components/style/gecko/generated/structs_debug.rs
View file

@ -185,9 +185,6 @@ pub mod root {
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_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_FAR_LEFT: ::std::os::raw::c_uint = 1;
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
@ -6121,6 +6118,14 @@ pub mod root {
}
#[repr(u8)]
#[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 {
None = 0,
Auto = 1,
@ -30008,7 +30013,7 @@ pub mod root {
pub mBoxDirection: root::mozilla::StyleBoxDirection,
pub mBoxOrient: root::mozilla::StyleBoxOrient,
pub mBoxPack: root::mozilla::StyleBoxPack,
pub mStretchStack: bool,
pub mStackSizing: root::mozilla::StyleStackSizing,
}
#[test]
fn bindgen_test_layout_nsStyleXUL() {
@ -30047,10 +30052,10 @@ pub mod root {
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
, stringify ! ( mBoxPack ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as *
& ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as *
const _ as usize } , 12usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
, stringify ! ( mStretchStack ) ));
, stringify ! ( mStackSizing ) ));
}
#[repr(C)]
#[derive(Debug)]

17
components/style/gecko/generated/structs_release.rs
View file

@ -185,9 +185,6 @@ pub mod root {
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_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_FAR_LEFT: ::std::os::raw::c_uint = 1;
pub const NS_STYLE_AZIMUTH_LEFT: ::std::os::raw::c_uint = 2;
@ -5994,6 +5991,14 @@ pub mod root {
}
#[repr(u8)]
#[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 {
None = 0,
Auto = 1,
@ -29537,7 +29542,7 @@ pub mod root {
pub mBoxDirection: root::mozilla::StyleBoxDirection,
pub mBoxOrient: root::mozilla::StyleBoxOrient,
pub mBoxPack: root::mozilla::StyleBoxPack,
pub mStretchStack: bool,
pub mStackSizing: root::mozilla::StyleStackSizing,
}
#[test]
fn bindgen_test_layout_nsStyleXUL() {
@ -29576,10 +29581,10 @@ pub mod root {
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
, stringify ! ( mBoxPack ) ));
assert_eq! (unsafe {
& ( * ( 0 as * const nsStyleXUL ) ) . mStretchStack as *
& ( * ( 0 as * const nsStyleXUL ) ) . mStackSizing as *
const _ as usize } , 12usize , concat ! (
"Alignment of field: " , stringify ! ( nsStyleXUL ) , "::"
, stringify ! ( mStretchStack ) ));
, stringify ! ( mStackSizing ) ));
}
#[repr(C)]
#[derive(Debug)]