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

Bindgenup

Browse source 
Major pain point is that I had to write the bitfield stuff manually, but that
should be resolved soon again.

Now we generate proper layout for _every_ struct, including field offsets \o/.
This commit is contained in:
Emilio Cobos Álvarez 2017-02-16 06:12:13 +01:00
parent ab197de04f
commit 91e0ae2fe7
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
8 changed files with 21925 additions and 7876 deletions
Download patch file Download diff file Expand all files Collapse all files

16
components/style/gecko_string_cache/atom_macro.rs
View file

@ -1858,8 +1858,12 @@ cfg_if! {
pub static nsGkAtoms_onvoicechange: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms15onvoiceschangedE"]
pub static nsGkAtoms_onvoiceschanged: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms19onvrdisplayactivateE"]
pub static nsGkAtoms_onvrdisplayactivate: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms18onvrdisplayconnectE"]
pub static nsGkAtoms_onvrdisplayconnect: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms21onvrdisplaydeactivateE"]
pub static nsGkAtoms_onvrdisplaydeactivate: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms21onvrdisplaydisconnectE"]
pub static nsGkAtoms_onvrdisplaydisconnect: *mut nsIAtom;
#[link_name = "_ZN9nsGkAtoms24onvrdisplaypresentchangeE"]
@ -6771,8 +6775,12 @@ cfg_if! {
pub static nsGkAtoms_onvoicechange: *mut nsIAtom;
#[link_name = "?onvoiceschanged@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onvoiceschanged: *mut nsIAtom;
#[link_name = "?onvrdisplayactivate@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onvrdisplayactivate: *mut nsIAtom;
#[link_name = "?onvrdisplayconnect@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onvrdisplayconnect: *mut nsIAtom;
#[link_name = "?onvrdisplaydeactivate@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onvrdisplaydeactivate: *mut nsIAtom;
#[link_name = "?onvrdisplaydisconnect@nsGkAtoms@@2PEAVnsIAtom@@EA"]
pub static nsGkAtoms_onvrdisplaydisconnect: *mut nsIAtom;
#[link_name = "?onvrdisplaypresentchange@nsGkAtoms@@2PEAVnsIAtom@@EA"]
@ -11684,8 +11692,12 @@ cfg_if! {
pub static nsGkAtoms_onvoicechange: *mut nsIAtom;
#[link_name = "\x01?onvoiceschanged@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onvoiceschanged: *mut nsIAtom;
#[link_name = "\x01?onvrdisplayactivate@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onvrdisplayactivate: *mut nsIAtom;
#[link_name = "\x01?onvrdisplayconnect@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onvrdisplayconnect: *mut nsIAtom;
#[link_name = "\x01?onvrdisplaydeactivate@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onvrdisplaydeactivate: *mut nsIAtom;
#[link_name = "\x01?onvrdisplaydisconnect@nsGkAtoms@@2PAVnsIAtom@@A"]
pub static nsGkAtoms_onvrdisplaydisconnect: *mut nsIAtom;
#[link_name = "\x01?onvrdisplaypresentchange@nsGkAtoms@@2PAVnsIAtom@@A"]
@ -16600,8 +16612,12 @@ macro_rules! atom {
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvoicechange as *mut _) } };
("onvoiceschanged") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvoiceschanged as *mut _) } };
("onvrdisplayactivate") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvrdisplayactivate as *mut _) } };
("onvrdisplayconnect") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvrdisplayconnect as *mut _) } };
("onvrdisplaydeactivate") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvrdisplaydeactivate as *mut _) } };
("onvrdisplaydisconnect") =>
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_onvrdisplaydisconnect as *mut _) } };
("onvrdisplaypresentchange") =>

15
components/style/gecko_string_cache/mod.rs
View file

@ -135,16 +135,22 @@ impl WeakAtom {
/// Returns whether this atom is static.
#[inline]
pub fn is_static(&self) -> bool {
// FIXME(emilio): re-introduce bitfield accessors:
//
// https://github.com/servo/rust-bindgen/issues/519
unsafe {
(*self.as_ptr()).mIsStatic() != 0
((*self.as_ptr())._bitfield_1 & (0x80000000 as u32)) != 0
}
}
/// Returns the length of the atom string.
#[inline]
pub fn len(&self) -> u32 {
// FIXME(emilio): re-introduce bitfield accessors:
//
// https://github.com/servo/rust-bindgen/issues/519
unsafe {
(*self.as_ptr()).mLength()
(*self.as_ptr())._bitfield_1 & 0x7FFFFFFF
}
}
@ -282,10 +288,11 @@ impl From<*mut nsIAtom> for Atom {
fn from(ptr: *mut nsIAtom) -> Atom {
debug_assert!(!ptr.is_null());
unsafe {
if (*ptr).mIsStatic() == 0 {
let ret = Atom(WeakAtom::new(ptr));
if !ret.is_static() {
Gecko_AddRefAtom(ptr);
}
Atom(WeakAtom::new(ptr))
ret
}
}
}