Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

style: Sync changes from mozilla-central. #20637

Merged
merged 4 commits into from
Apr 14, 2018
Merged

style: Sync changes from mozilla-central. #20637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
156ef81
nsstring: Make ns{,C}String Sync/Send.
bholley Feb 15, 2018
245d848
style: Use a user defined type for font weight everywhere.
jwatt Apr 13, 2018
3ef77f5
style: Fix IsInAnonymousSubtree to account for XBL in Shadow DOM.
emilio Apr 13, 2018
0d15ab1
style: Update binidngs.
emilio Apr 14, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 0 additions & 8 deletions components/style/gecko/generated/atom_macro.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -896,8 +896,6 @@ cfg_if! {
pub static nsGkAtoms_flags: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms4flexE"]
pub static nsGkAtoms_flex: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms9flexgroupE"]
pub static nsGkAtoms_flexgroup: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms4flipE"]
pub static nsGkAtoms_flip: *mut nsStaticAtom;
#[link_name = "_ZN9nsGkAtoms8floatingE"]
Expand Down Expand Up @@ -6117,8 +6115,6 @@ cfg_if! {
pub static nsGkAtoms_flags: *mut nsStaticAtom;
#[link_name = "?flex@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_flex: *mut nsStaticAtom;
#[link_name = "?flexgroup@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_flexgroup: *mut nsStaticAtom;
#[link_name = "?flip@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
pub static nsGkAtoms_flip: *mut nsStaticAtom;
#[link_name = "?floating@nsGkAtoms@@2PEAVnsStaticAtom@@EA"]
Expand Down Expand Up @@ -11338,8 +11334,6 @@ cfg_if! {
pub static nsGkAtoms_flags: *mut nsStaticAtom;
#[link_name = "\x01?flex@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_flex: *mut nsStaticAtom;
#[link_name = "\x01?flexgroup@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_flexgroup: *mut nsStaticAtom;
#[link_name = "\x01?flip@nsGkAtoms@@2PAVnsStaticAtom@@A"]
pub static nsGkAtoms_flip: *mut nsStaticAtom;
#[link_name = "\x01?floating@nsGkAtoms@@2PAVnsStaticAtom@@A"]
Expand Down Expand Up @@ -16562,8 +16556,6 @@ macro_rules! atom {
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_flags as *mut _) } }};
("flex") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_flex as *mut _) } }};
("flexgroup") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_flexgroup as *mut _) } }};
("flip") =>
{{ #[allow(unsafe_code)] #[allow(unused_unsafe)]unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_flip as *mut _) } }};
("floating") =>
Expand Down
36 changes: 17 additions & 19 deletions components/style/gecko/generated/bindings.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use gecko_bindings::structs::mozilla::css::URLValueData;
use gecko_bindings::structs::mozilla::dom::CallerType;
use gecko_bindings::structs::mozilla::AnonymousCounterStyle;
use gecko_bindings::structs::mozilla::AtomArray;
use gecko_bindings::structs::mozilla::FontWeight;
use gecko_bindings::structs::mozilla::MallocSizeOf;
use gecko_bindings::structs::mozilla::OriginFlags;
use gecko_bindings::structs::mozilla::UniquePtr;
Expand Down Expand Up @@ -218,9 +219,6 @@ unsafe impl Sync for nsStyleUnit {}
use gecko_bindings::structs::nsStyleUserInterface;
unsafe impl Send for nsStyleUserInterface {}
unsafe impl Sync for nsStyleUserInterface {}
use gecko_bindings::structs::nsStyleVariables;
unsafe impl Send for nsStyleVariables {}
unsafe impl Sync for nsStyleVariables {}
use gecko_bindings::structs::nsStyleVisibility;
unsafe impl Send for nsStyleVisibility {}
unsafe impl Sync for nsStyleVisibility {}
Expand Down Expand Up @@ -1192,7 +1190,7 @@ extern "C" {
pub fn Gecko_CalcStyleDifference(
old_style: ComputedStyleBorrowed,
new_style: ComputedStyleBorrowed,
any_style_changed: *mut bool,
any_style_struct_changed: *mut bool,
reset_only_changed: *mut bool,
) -> u32;
}
Expand Down Expand Up @@ -1452,6 +1450,9 @@ extern "C" {
extern "C" {
pub fn Gecko_CSSValue_SetCalc(css_value: nsCSSValueBorrowedMut, calc: nsStyleCoord_CalcValue);
}
extern "C" {
pub fn Gecko_CSSValue_SetFontWeight(css_value: nsCSSValueBorrowedMut, weight: f32);
}
extern "C" {
pub fn Gecko_CSSValue_SetFunction(css_value: nsCSSValueBorrowedMut, len: i32);
}
Expand Down Expand Up @@ -1510,6 +1511,12 @@ extern "C" {
extern "C" {
pub fn Gecko_ReleaseCSSValueSharedListArbitraryThread(aPtr: *mut nsCSSValueSharedList);
}
extern "C" {
pub fn Gecko_FontWeight_ToFloat(aWeight: FontWeight) -> f32;
}
extern "C" {
pub fn Gecko_FontWeight_SetFloat(aWeight: *mut FontWeight, aFloatValue: f32);
}
extern "C" {
pub fn Gecko_nsStyleFont_SetLang(font: *mut nsStyleFont, atom: *mut nsAtom);
}
Expand Down Expand Up @@ -1701,21 +1708,6 @@ extern "C" {
extern "C" {
pub fn Gecko_Destroy_nsStyleSVG(ptr: *mut nsStyleSVG);
}
extern "C" {
pub fn Gecko_Construct_Default_nsStyleVariables(
ptr: *mut nsStyleVariables,
pres_context: RawGeckoPresContextBorrowed,
);
}
extern "C" {
pub fn Gecko_CopyConstruct_nsStyleVariables(
ptr: *mut nsStyleVariables,
other: *const nsStyleVariables,
);
}
extern "C" {
pub fn Gecko_Destroy_nsStyleVariables(ptr: *mut nsStyleVariables);
}
extern "C" {
pub fn Gecko_Construct_Default_nsStyleBackground(
ptr: *mut nsStyleBackground,
Expand Down Expand Up @@ -1985,6 +1977,9 @@ extern "C" {
extern "C" {
pub fn Servo_Element_IsDisplayNone(element: RawGeckoElementBorrowed) -> bool;
}
extern "C" {
pub fn Servo_Element_IsDisplayContents(element: RawGeckoElementBorrowed) -> bool;
}
extern "C" {
pub fn Servo_Element_IsPrimaryStyleReusedViaRuleNode(element: RawGeckoElementBorrowed) -> bool;
}
Expand Down Expand Up @@ -3389,6 +3384,9 @@ extern "C" {
extern "C" {
pub fn Servo_Property_IsShorthand(name: *const nsACString, found: *mut bool) -> bool;
}
extern "C" {
pub fn Servo_Property_IsInherited(name: *const nsACString) -> bool;
}
extern "C" {
pub fn Servo_PseudoClass_GetStates(name: *const nsACString) -> u64;
}
Expand Down
Loading