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

Rename nsIAtom as nsAtom.

Browse source 
Bug 1400459 devirtualized nsIAtom so that it is no longer a subclass of
nsISupports. This means that nsAtom is now a better name for it than
nsIAtom.
This commit is contained in:
Nicholas Nethercote 2017-10-09 09:27:11 +11:00
parent 55a37930b2
commit 7628c1236a
12 changed files with 12752 additions and 12752 deletions
Download patch file Download diff file Expand all files Collapse all files

25004
components/style/gecko/generated/atom_macro.rs
View file

File diff suppressed because it is too large Load diff

148
components/style/gecko/generated/bindings.rs
View file

@ -80,7 +80,7 @@ use gecko_bindings::structs::nsCSSValueSharedList;
use gecko_bindings::structs::nsChangeHint; use gecko_bindings::structs::nsChangeHint;
use gecko_bindings::structs::nsCursorImage; use gecko_bindings::structs::nsCursorImage;
use gecko_bindings::structs::nsFont; use gecko_bindings::structs::nsFont;
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsAtom;
use gecko_bindings::structs::nsIURI; use gecko_bindings::structs::nsIURI;
use gecko_bindings::structs::nsCompatibility; use gecko_bindings::structs::nsCompatibility;
use gecko_bindings::structs::nsRestyleHint; use gecko_bindings::structs::nsRestyleHint;
@ -556,7 +556,7 @@ extern "C" {
RawGeckoPresContextBorrowed, RawGeckoPresContextBorrowed,
values: ServoComputedDataBorrowed, values: ServoComputedDataBorrowed,
pseudo_type: CSSPseudoElementType, pseudo_type: CSSPseudoElementType,
pseudo_tag: *mut nsIAtom); pseudo_tag: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_ServoStyleContext_Destroy(context: *mut ServoStyleContext); pub fn Gecko_ServoStyleContext_Destroy(context: *mut ServoStyleContext);
@ -600,17 +600,17 @@ extern "C" {
element: RawGeckoElementBorrowed) -> bool; element: RawGeckoElementBorrowed) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_Namespace(element: RawGeckoElementBorrowed) -> *mut nsIAtom; pub fn Gecko_Namespace(element: RawGeckoElementBorrowed) -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_MatchLang(element: RawGeckoElementBorrowed, pub fn Gecko_MatchLang(element: RawGeckoElementBorrowed,
override_lang: *mut nsIAtom, override_lang: *mut nsAtom,
has_override_lang: bool, value: *const u16) has_override_lang: bool, value: *const u16)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_GetXMLLangValue(element: RawGeckoElementBorrowed) pub fn Gecko_GetXMLLangValue(element: RawGeckoElementBorrowed)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_GetDocumentLWTheme(aDocument: *const nsIDocument) pub fn Gecko_GetDocumentLWTheme(aDocument: *const nsIDocument)
@ -618,108 +618,108 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_AtomAttrValue(element: RawGeckoElementBorrowed, pub fn Gecko_AtomAttrValue(element: RawGeckoElementBorrowed,
attribute: *mut nsIAtom) -> *mut nsIAtom; attribute: *mut nsAtom) -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_LangValue(element: RawGeckoElementBorrowed) -> *mut nsIAtom; pub fn Gecko_LangValue(element: RawGeckoElementBorrowed) -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_HasAttr(element: RawGeckoElementBorrowed, ns: *mut nsIAtom, pub fn Gecko_HasAttr(element: RawGeckoElementBorrowed, ns: *mut nsAtom,
name: *mut nsIAtom) -> bool; name: *mut nsAtom) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrEquals(element: RawGeckoElementBorrowed, pub fn Gecko_AttrEquals(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignoreCase: bool) -> bool; str: *mut nsAtom, ignoreCase: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrDashEquals(element: RawGeckoElementBorrowed, pub fn Gecko_AttrDashEquals(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) -> bool; str: *mut nsAtom, ignore_case: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrIncludes(element: RawGeckoElementBorrowed, pub fn Gecko_AttrIncludes(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) -> bool; str: *mut nsAtom, ignore_case: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrHasSubstring(element: RawGeckoElementBorrowed, pub fn Gecko_AttrHasSubstring(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) str: *mut nsAtom, ignore_case: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrHasPrefix(element: RawGeckoElementBorrowed, pub fn Gecko_AttrHasPrefix(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) -> bool; str: *mut nsAtom, ignore_case: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AttrHasSuffix(element: RawGeckoElementBorrowed, pub fn Gecko_AttrHasSuffix(element: RawGeckoElementBorrowed,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) -> bool; str: *mut nsAtom, ignore_case: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_ClassOrClassList(element: RawGeckoElementBorrowed, pub fn Gecko_ClassOrClassList(element: RawGeckoElementBorrowed,
class_: *mut *mut nsIAtom, class_: *mut *mut nsAtom,
classList: *mut *mut *mut nsIAtom) -> u32; classList: *mut *mut *mut nsAtom) -> u32;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAtomAttrValue(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAtomAttrValue(element: *const ServoElementSnapshot,
attribute: *mut nsIAtom) attribute: *mut nsAtom)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotLangValue(element: *const ServoElementSnapshot) pub fn Gecko_SnapshotLangValue(element: *const ServoElementSnapshot)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotHasAttr(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotHasAttr(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom) ns: *mut nsAtom, name: *mut nsAtom)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrEquals(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAttrEquals(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignoreCase: bool) str: *mut nsAtom, ignoreCase: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrDashEquals(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAttrDashEquals(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) str: *mut nsAtom, ignore_case: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrIncludes(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAttrIncludes(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) str: *mut nsAtom, ignore_case: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrHasSubstring(element: pub fn Gecko_SnapshotAttrHasSubstring(element:
*const ServoElementSnapshot, *const ServoElementSnapshot,
ns: *mut nsIAtom, ns: *mut nsAtom,
name: *mut nsIAtom, name: *mut nsAtom,
str: *mut nsIAtom, str: *mut nsAtom,
ignore_case: bool) -> bool; ignore_case: bool) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrHasPrefix(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAttrHasPrefix(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) str: *mut nsAtom, ignore_case: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotAttrHasSuffix(element: *const ServoElementSnapshot, pub fn Gecko_SnapshotAttrHasSuffix(element: *const ServoElementSnapshot,
ns: *mut nsIAtom, name: *mut nsIAtom, ns: *mut nsAtom, name: *mut nsAtom,
str: *mut nsIAtom, ignore_case: bool) str: *mut nsAtom, ignore_case: bool)
-> bool; -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_SnapshotClassOrClassList(element: pub fn Gecko_SnapshotClassOrClassList(element:
*const ServoElementSnapshot, *const ServoElementSnapshot,
class_: *mut *mut nsIAtom, class_: *mut *mut nsAtom,
classList: *mut *mut *mut nsIAtom) classList: *mut *mut *mut nsAtom)
-> u32; -> u32;
} }
extern "C" { extern "C" {
@ -841,32 +841,32 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_StyleTransition_SetUnsupportedProperty(aTransition: pub fn Gecko_StyleTransition_SetUnsupportedProperty(aTransition:
*mut StyleTransition, *mut StyleTransition,
aAtom: *mut nsIAtom); aAtom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_Atomize(aString: *const ::std::os::raw::c_char, aLength: u32) pub fn Gecko_Atomize(aString: *const ::std::os::raw::c_char, aLength: u32)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_Atomize16(aString: *const nsAString) -> *mut nsIAtom; pub fn Gecko_Atomize16(aString: *const nsAString) -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_AddRefAtom(aAtom: *mut nsIAtom); pub fn Gecko_AddRefAtom(aAtom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_ReleaseAtom(aAtom: *mut nsIAtom); pub fn Gecko_ReleaseAtom(aAtom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_GetAtomAsUTF16(aAtom: *mut nsIAtom, aLength: *mut u32) pub fn Gecko_GetAtomAsUTF16(aAtom: *mut nsAtom, aLength: *mut u32)
-> *const u16; -> *const u16;
} }
extern "C" { extern "C" {
pub fn Gecko_AtomEqualsUTF8(aAtom: *mut nsIAtom, pub fn Gecko_AtomEqualsUTF8(aAtom: *mut nsAtom,
aString: *const ::std::os::raw::c_char, aString: *const ::std::os::raw::c_char,
aLength: u32) -> bool; aLength: u32) -> bool;
} }
extern "C" { extern "C" {
pub fn Gecko_AtomEqualsUTF8IgnoreCase(aAtom: *mut nsIAtom, pub fn Gecko_AtomEqualsUTF8IgnoreCase(aAtom: *mut nsAtom,
aString: aString:
*const ::std::os::raw::c_char, *const ::std::os::raw::c_char,
aLength: u32) -> bool; aLength: u32) -> bool;
@ -880,7 +880,7 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_nsTArray_FontFamilyName_AppendNamed(aNames: pub fn Gecko_nsTArray_FontFamilyName_AppendNamed(aNames:
*mut nsTArray<FontFamilyName>, *mut nsTArray<FontFamilyName>,
aName: *mut nsIAtom, aName: *mut nsAtom,
aQuoted: bool); aQuoted: bool);
} }
extern "C" { extern "C" {
@ -924,9 +924,9 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_AppendFeatureValueHashEntry(value_set: pub fn Gecko_AppendFeatureValueHashEntry(value_set:
*mut gfxFontFeatureValueSet, *mut gfxFontFeatureValueSet,
family: *mut nsIAtom, family: *mut nsAtom,
alternate: u32, alternate: u32,
name: *mut nsIAtom) name: *mut nsAtom)
-> *mut nsTArray<::std::os::raw::c_uint>; -> *mut nsTArray<::std::os::raw::c_uint>;
} }
extern "C" { extern "C" {
@ -942,7 +942,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_AppendAlternateValues(font: *mut nsFont, alternate_name: u32, pub fn Gecko_AppendAlternateValues(font: *mut nsFont, alternate_name: u32,
atom: *mut nsIAtom); atom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_CopyAlternateValuesFrom(dest: *mut nsFont, pub fn Gecko_CopyAlternateValuesFrom(dest: *mut nsFont,
@ -962,7 +962,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_SetCounterStyleToName(ptr: *mut CounterStylePtr, pub fn Gecko_SetCounterStyleToName(ptr: *mut CounterStylePtr,
name: *mut nsIAtom, name: *mut nsAtom,
pres_context: pres_context:
RawGeckoPresContextBorrowed); RawGeckoPresContextBorrowed);
} }
@ -982,7 +982,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_CounterStyle_GetName(ptr: *const CounterStylePtr) pub fn Gecko_CounterStyle_GetName(ptr: *const CounterStylePtr)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_CounterStyle_GetAnonymous(ptr: *const CounterStylePtr) pub fn Gecko_CounterStyle_GetAnonymous(ptr: *const CounterStylePtr)
@ -1016,7 +1016,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_SetImageElement(image: *mut nsStyleImage, pub fn Gecko_SetImageElement(image: *mut nsStyleImage,
atom: *mut nsIAtom); atom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_CopyImageValueFrom(image: *mut nsStyleImage, pub fn Gecko_CopyImageValueFrom(image: *mut nsStyleImage,
@ -1035,7 +1035,7 @@ extern "C" {
-> *const URLValueData; -> *const URLValueData;
} }
extern "C" { extern "C" {
pub fn Gecko_GetImageElement(image: *const nsStyleImage) -> *mut nsIAtom; pub fn Gecko_GetImageElement(image: *const nsStyleImage) -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Gecko_GetGradientImageValue(image: *const nsStyleImage) pub fn Gecko_GetGradientImageValue(image: *const nsStyleImage)
@ -1189,7 +1189,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_AppendWillChange(display: *mut nsStyleDisplay, pub fn Gecko_AppendWillChange(display: *mut nsStyleDisplay,
atom: *mut nsIAtom); atom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_CopyWillChangeFrom(dest: *mut nsStyleDisplay, pub fn Gecko_CopyWillChangeFrom(dest: *mut nsStyleDisplay,
@ -1397,12 +1397,12 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_CSSValue_SetStringFromAtom(css_value: nsCSSValueBorrowedMut, pub fn Gecko_CSSValue_SetStringFromAtom(css_value: nsCSSValueBorrowedMut,
atom: *mut nsIAtom, atom: *mut nsAtom,
unit: nsCSSUnit); unit: nsCSSUnit);
} }
extern "C" { extern "C" {
pub fn Gecko_CSSValue_SetAtomIdent(css_value: nsCSSValueBorrowedMut, pub fn Gecko_CSSValue_SetAtomIdent(css_value: nsCSSValueBorrowedMut,
atom: *mut nsIAtom); atom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_CSSValue_SetArray(css_value: nsCSSValueBorrowedMut, pub fn Gecko_CSSValue_SetArray(css_value: nsCSSValueBorrowedMut,
@ -1445,7 +1445,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Gecko_nsStyleFont_SetLang(font: *mut nsStyleFont, pub fn Gecko_nsStyleFont_SetLang(font: *mut nsStyleFont,
atom: *mut nsIAtom); atom: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Gecko_nsStyleFont_CopyLangFrom(aFont: *mut nsStyleFont, pub fn Gecko_nsStyleFont_CopyLangFrom(aFont: *mut nsStyleFont,
@ -1468,7 +1468,7 @@ extern "C" {
RawGeckoPresContextBorrowed); RawGeckoPresContextBorrowed);
} }
extern "C" { extern "C" {
pub fn Gecko_GetBaseSize(lang: *mut nsIAtom) -> FontSizePrefs; pub fn Gecko_GetBaseSize(lang: *mut nsAtom) -> FontSizePrefs;
} }
extern "C" { extern "C" {
pub fn Gecko_GetBindingParent(aElement: RawGeckoElementBorrowed) pub fn Gecko_GetBindingParent(aElement: RawGeckoElementBorrowed)
@ -1537,7 +1537,7 @@ extern "C" {
pub fn Gecko_CSSFontFaceRule_Release(aPtr: *mut nsCSSFontFaceRule); pub fn Gecko_CSSFontFaceRule_Release(aPtr: *mut nsCSSFontFaceRule);
} }
extern "C" { extern "C" {
pub fn Gecko_CSSCounterStyle_Create(name: *mut nsIAtom) pub fn Gecko_CSSCounterStyle_Create(name: *mut nsAtom)
-> *mut nsCSSCounterStyleRule; -> *mut nsCSSCounterStyleRule;
} }
extern "C" { extern "C" {
@ -1575,7 +1575,7 @@ extern "C" {
arg2: nsCSSPropertyID); arg2: nsCSSPropertyID);
} }
extern "C" { extern "C" {
pub fn Gecko_RegisterNamespace(ns: *mut nsIAtom) -> i32; pub fn Gecko_RegisterNamespace(ns: *mut nsAtom) -> i32;
} }
extern "C" { extern "C" {
pub fn Gecko_ShouldCreateStyleThreadPool() -> bool; pub fn Gecko_ShouldCreateStyleThreadPool() -> bool;
@ -2073,7 +2073,7 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Servo_StyleSet_GetCounterStyleRule(set: RawServoStyleSetBorrowed, pub fn Servo_StyleSet_GetCounterStyleRule(set: RawServoStyleSetBorrowed,
name: *mut nsIAtom) name: *mut nsAtom)
-> *mut nsCSSCounterStyleRule; -> *mut nsCSSCounterStyleRule;
} }
extern "C" { extern "C" {
@ -2116,7 +2116,7 @@ extern "C" {
element: element:
RawGeckoElementBorrowed, RawGeckoElementBorrowed,
local_name: local_name:
*mut nsIAtom) *mut nsAtom)
-> bool; -> bool;
} }
extern "C" { extern "C" {
@ -2367,11 +2367,11 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Servo_KeyframesRule_GetName(rule: RawServoKeyframesRuleBorrowed) pub fn Servo_KeyframesRule_GetName(rule: RawServoKeyframesRuleBorrowed)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed, pub fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed,
name: *mut nsIAtom); name: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Servo_KeyframesRule_GetCount(rule: RawServoKeyframesRuleBorrowed) pub fn Servo_KeyframesRule_GetCount(rule: RawServoKeyframesRuleBorrowed)
@ -2404,11 +2404,11 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Servo_NamespaceRule_GetPrefix(rule: RawServoNamespaceRuleBorrowed) pub fn Servo_NamespaceRule_GetPrefix(rule: RawServoNamespaceRuleBorrowed)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Servo_NamespaceRule_GetURI(rule: RawServoNamespaceRuleBorrowed) pub fn Servo_NamespaceRule_GetURI(rule: RawServoNamespaceRuleBorrowed)
-> *mut nsIAtom; -> *mut nsAtom;
} }
extern "C" { extern "C" {
pub fn Servo_PageRule_GetStyle(rule: RawServoPageRuleBorrowed) pub fn Servo_PageRule_GetStyle(rule: RawServoPageRuleBorrowed)
@ -2728,7 +2728,7 @@ extern "C" {
RawServoDeclarationBlockBorrowed, RawServoDeclarationBlockBorrowed,
property: property:
nsCSSPropertyID, nsCSSPropertyID,
value: *mut nsIAtom); value: *mut nsAtom);
} }
extern "C" { extern "C" {
pub fn Servo_DeclarationBlock_SetKeywordValue(declarations: pub fn Servo_DeclarationBlock_SetKeywordValue(declarations:
@ -2844,14 +2844,14 @@ extern "C" {
extern "C" { extern "C" {
pub fn Servo_ComputedValues_GetForAnonymousBox(parent_style_or_null: pub fn Servo_ComputedValues_GetForAnonymousBox(parent_style_or_null:
ServoStyleContextBorrowedOrNull, ServoStyleContextBorrowedOrNull,
pseudo_tag: *mut nsIAtom, pseudo_tag: *mut nsAtom,
set: set:
RawServoStyleSetBorrowed) RawServoStyleSetBorrowed)
-> ServoStyleContextStrong; -> ServoStyleContextStrong;
} }
extern "C" { extern "C" {
pub fn Servo_ComputedValues_Inherit(set: RawServoStyleSetBorrowed, pub fn Servo_ComputedValues_Inherit(set: RawServoStyleSetBorrowed,
pseudo_tag: *mut nsIAtom, pseudo_tag: *mut nsAtom,
parent_style: parent_style:
ServoStyleContextBorrowedOrNull, ServoStyleContextBorrowedOrNull,
target: InheritTarget) target: InheritTarget)

2
components/style/gecko/generated/pseudo_element_definition.rs
View file

@ -867,7 +867,7 @@ None
} }
/// Get a PseudoInfo for a pseudo /// Get a PseudoInfo for a pseudo
pub fn pseudo_info(&self) -> (*mut structs::nsIAtom, CSSPseudoElementType) { pub fn pseudo_info(&self) -> (*mut structs::nsAtom, CSSPseudoElementType) {
(self.atom().as_ptr(), self.pseudo_type()) (self.atom().as_ptr(), self.pseudo_type())
} }

254
components/style/gecko/generated/structs.rs
View file

@ -2411,7 +2411,7 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)] #[derive(Debug, Copy)]
pub struct Element_MappedAttributeEntry { pub struct Element_MappedAttributeEntry {
pub attribute: *mut *mut root::nsIAtom, pub attribute: *mut *mut root::nsAtom,
} }
#[test] #[test]
fn bindgen_test_layout_Element_MappedAttributeEntry() { fn bindgen_test_layout_Element_MappedAttributeEntry() {
@ -2537,12 +2537,12 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)] #[derive(Debug, Copy)]
pub struct NodeInfo_NodeInfoInner { pub struct NodeInfo_NodeInfoInner {
pub mName: *const root::nsIAtom, pub mName: *const root::nsAtom,
pub mPrefix: *mut root::nsIAtom, pub mPrefix: *mut root::nsAtom,
pub mNamespaceID: i32, pub mNamespaceID: i32,
pub mNodeType: u16, pub mNodeType: u16,
pub mNameString: *const root::nsAString, pub mNameString: *const root::nsAString,
pub mExtraName: *mut root::nsIAtom, pub mExtraName: *mut root::nsAtom,
pub mHash: root::PLHashNumber, pub mHash: root::PLHashNumber,
pub mHashInitialized: bool, pub mHashInitialized: bool,
} }
@ -6811,7 +6811,7 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct LangGroupFontPrefs { pub struct LangGroupFontPrefs {
pub mLangGroup: root::RefPtr<root::nsIAtom>, pub mLangGroup: root::RefPtr<root::nsAtom>,
pub mMinimumFontSize: root::nscoord, pub mMinimumFontSize: root::nscoord,
pub mDefaultVariableFont: root::nsFont, pub mDefaultVariableFont: root::nsFont,
pub mDefaultFixedFont: root::nsFont, pub mDefaultFixedFont: root::nsFont,
@ -7337,7 +7337,7 @@ pub mod root {
pub mDuration: f32, pub mDuration: f32,
pub mDelay: f32, pub mDelay: f32,
pub mProperty: root::nsCSSPropertyID, pub mProperty: root::nsCSSPropertyID,
pub mUnknownProperty: root::RefPtr<root::nsIAtom>, pub mUnknownProperty: root::RefPtr<root::nsAtom>,
} }
#[test] #[test]
fn bindgen_test_layout_StyleTransition() { fn bindgen_test_layout_StyleTransition() {
@ -12399,7 +12399,7 @@ pub mod root {
pub mScriptUnconstrainedSize: root::nscoord, pub mScriptUnconstrainedSize: root::nscoord,
pub mScriptMinSize: root::nscoord, pub mScriptMinSize: root::nscoord,
pub mScriptSizeMultiplier: f32, pub mScriptSizeMultiplier: f32,
pub mLanguage: root::RefPtr<root::nsIAtom>, pub mLanguage: root::RefPtr<root::nsAtom>,
} }
pub const nsStyleFont_kHasFinishStyle: bool = false; pub const nsStyleFont_kHasFinishStyle: bool = false;
#[test] #[test]
@ -13038,7 +13038,7 @@ pub mod root {
pub mMarkerMid: root::RefPtr<root::mozilla::css::URLValue>, pub mMarkerMid: root::RefPtr<root::mozilla::css::URLValue>,
pub mMarkerStart: root::RefPtr<root::mozilla::css::URLValue>, pub mMarkerStart: root::RefPtr<root::mozilla::css::URLValue>,
pub mStrokeDasharray: root::nsTArray<root::nsStyleCoord>, pub mStrokeDasharray: root::nsTArray<root::nsStyleCoord>,
pub mContextProps: root::nsTArray<root::RefPtr<root::nsIAtom>>, pub mContextProps: root::nsTArray<root::RefPtr<root::nsAtom>>,
pub mStrokeDashoffset: root::nsStyleCoord, pub mStrokeDashoffset: root::nsStyleCoord,
pub mStrokeWidth: root::nsStyleCoord, pub mStrokeWidth: root::nsStyleCoord,
pub mFillOpacity: f32, pub mFillOpacity: f32,
@ -13569,7 +13569,7 @@ pub mod root {
pub mIsolation: u8, pub mIsolation: u8,
pub mTopLayer: u8, pub mTopLayer: u8,
pub mWillChangeBitField: u8, pub mWillChangeBitField: u8,
pub mWillChange: root::nsTArray<root::RefPtr<root::nsIAtom>>, pub mWillChange: root::nsTArray<root::RefPtr<root::nsAtom>>,
pub mTouchAction: u8, pub mTouchAction: u8,
pub mScrollBehavior: u8, pub mScrollBehavior: u8,
pub mScrollSnapTypeX: u8, pub mScrollSnapTypeX: u8,
@ -14793,7 +14793,7 @@ pub mod root {
} }
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct nsIAtom { pub struct nsAtom {
pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt, pub mRefCnt: root::mozilla::ThreadSafeAutoRefCnt,
pub _bitfield_1: u32, pub _bitfield_1: u32,
pub mHash: u32, pub mHash: u32,
@ -14801,35 +14801,35 @@ pub mod root {
} }
#[repr(u8)] #[repr(u8)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum nsIAtom_AtomKind { pub enum nsAtom_AtomKind {
DynamicAtom = 0, DynamicAtom = 0,
StaticAtom = 1, StaticAtom = 1,
HTML5Atom = 2, HTML5Atom = 2,
} }
pub type nsIAtom_HasThreadSafeRefCnt = root::mozilla::TrueType; pub type nsAtom_HasThreadSafeRefCnt = root::mozilla::TrueType;
#[test] #[test]
fn bindgen_test_layout_nsIAtom() { fn bindgen_test_layout_nsAtom() {
assert_eq!(::std::mem::size_of::<nsIAtom>() , 24usize , concat ! ( assert_eq!(::std::mem::size_of::<nsAtom>() , 24usize , concat ! (
"Size of: " , stringify ! ( nsIAtom ) )); "Size of: " , stringify ! ( nsAtom ) ));
assert_eq! (::std::mem::align_of::<nsIAtom>() , 8usize , concat ! ( assert_eq! (::std::mem::align_of::<nsAtom>() , 8usize , concat ! (
"Alignment of " , stringify ! ( nsIAtom ) )); "Alignment of " , stringify ! ( nsAtom ) ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const nsIAtom ) ) . mRefCnt as * const _ as & ( * ( 0 as * const nsAtom ) ) . mRefCnt as * const _ as
usize } , 0usize , concat ! ( usize } , 0usize , concat ! (
"Alignment of field: " , stringify ! ( nsIAtom ) , "::" , "Alignment of field: " , stringify ! ( nsAtom ) , "::" ,
stringify ! ( mRefCnt ) )); stringify ! ( mRefCnt ) ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const nsIAtom ) ) . mHash as * const _ as & ( * ( 0 as * const nsAtom ) ) . mHash as * const _ as
usize } , 12usize , concat ! ( usize } , 12usize , concat ! (
"Alignment of field: " , stringify ! ( nsIAtom ) , "::" , "Alignment of field: " , stringify ! ( nsAtom ) , "::" ,
stringify ! ( mHash ) )); stringify ! ( mHash ) ));
assert_eq! (unsafe { assert_eq! (unsafe {
& ( * ( 0 as * const nsIAtom ) ) . mString as * const _ as & ( * ( 0 as * const nsAtom ) ) . mString as * const _ as
usize } , 16usize , concat ! ( usize } , 16usize , concat ! (
"Alignment of field: " , stringify ! ( nsIAtom ) , "::" , "Alignment of field: " , stringify ! ( nsAtom ) , "::" ,
stringify ! ( mString ) )); stringify ! ( mString ) ));
} }
impl nsIAtom { impl nsAtom {
#[inline] #[inline]
pub fn mLength(&self) -> u32 { pub fn mLength(&self) -> u32 {
let mut unit_field_val: u32 = let mut unit_field_val: u32 =
@ -19270,7 +19270,7 @@ pub mod root {
pub struct nsCSSCounterStyleRule { pub struct nsCSSCounterStyleRule {
pub _base: root::mozilla::css::Rule, pub _base: root::mozilla::css::Rule,
pub _base_1: root::nsIDOMCSSCounterStyleRule, pub _base_1: root::nsIDOMCSSCounterStyleRule,
pub mName: root::RefPtr<root::nsIAtom>, pub mName: root::RefPtr<root::nsAtom>,
pub mValues: [root::nsCSSValue; 10usize], pub mValues: [root::nsCSSValue; 10usize],
pub mGeneration: u32, pub mGeneration: u32,
} }
@ -19375,7 +19375,7 @@ pub mod root {
/// @param aCaseSensitive Whether to do a case-sensitive compare on the values. /// @param aCaseSensitive Whether to do a case-sensitive compare on the values.
/// @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index /// @return ATTR_MISSING, ATTR_VALUE_NO_MATCH or the non-negative index
/// indicating the first value of aValues that matched /// indicating the first value of aValues that matched
pub type nsIContent_AttrValuesArray = *const *const root::nsIAtom; pub type nsIContent_AttrValuesArray = *const *const root::nsAtom;
#[repr(u32)] #[repr(u32)]
#[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)] #[derive(Debug, Copy, Clone, PartialEq, Eq, Hash)]
pub enum nsIContent_FlattenedParentType { pub enum nsIContent_FlattenedParentType {
@ -19425,7 +19425,7 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct nsStyleContext { pub struct nsStyleContext {
pub mPseudoTag: root::RefPtr<root::nsIAtom>, pub mPseudoTag: root::RefPtr<root::nsAtom>,
pub mBits: u64, pub mBits: u64,
} }
pub const nsStyleContext_kAllResolvedStructs: pub const nsStyleContext_kAllResolvedStructs:
@ -19470,11 +19470,11 @@ pub mod root {
pub mAnimationManager: root::RefPtr<root::nsAnimationManager>, pub mAnimationManager: root::RefPtr<root::nsAnimationManager>,
pub mRestyleManager: root::RefPtr<root::mozilla::RestyleManager>, pub mRestyleManager: root::RefPtr<root::mozilla::RestyleManager>,
pub mCounterStyleManager: root::RefPtr<root::mozilla::CounterStyleManager>, pub mCounterStyleManager: root::RefPtr<root::mozilla::CounterStyleManager>,
pub mMedium: *mut root::nsIAtom, pub mMedium: *mut root::nsAtom,
pub mMediaEmulated: root::RefPtr<root::nsIAtom>, pub mMediaEmulated: root::RefPtr<root::nsAtom>,
pub mFontFeatureValuesLookup: root::RefPtr<root::gfxFontFeatureValueSet>, pub mFontFeatureValuesLookup: root::RefPtr<root::gfxFontFeatureValueSet>,
pub mLinkHandler: *mut root::nsILinkHandler, pub mLinkHandler: *mut root::nsILinkHandler,
pub mLanguage: root::RefPtr<root::nsIAtom>, pub mLanguage: root::RefPtr<root::nsAtom>,
pub mInflationDisabledForShrinkWrap: bool, pub mInflationDisabledForShrinkWrap: bool,
pub mContainer: u64, pub mContainer: u64,
pub mBaseMinFontSize: i32, pub mBaseMinFontSize: i32,
@ -22484,7 +22484,7 @@ pub mod root {
pub mBits: usize, pub mBits: usize,
} }
pub type nsAttrValue_AtomArray = pub type nsAttrValue_AtomArray =
root::nsTArray<root::RefPtr<root::nsIAtom>>; root::nsTArray<root::RefPtr<root::nsAtom>>;
pub const nsAttrValue_ValueType_eSVGTypesBegin: pub const nsAttrValue_ValueType_eSVGTypesBegin:
root::nsAttrValue_ValueType = root::nsAttrValue_ValueType =
nsAttrValue_ValueType::eSVGAngle; nsAttrValue_ValueType::eSVGAngle;
@ -24918,7 +24918,7 @@ pub mod root {
#[derive(Debug)] #[derive(Debug)]
pub struct nsLanguageAtomService { pub struct nsLanguageAtomService {
pub mLangToGroup: [u64; 4usize], pub mLangToGroup: [u64; 4usize],
pub mLocaleLanguage: root::RefPtr<root::nsIAtom>, pub mLocaleLanguage: root::RefPtr<root::nsAtom>,
} }
pub type nsLanguageAtomService_Encoding = root::mozilla::Encoding; pub type nsLanguageAtomService_Encoding = root::mozilla::Encoding;
pub type nsLanguageAtomService_NotNull<T> = root::mozilla::NotNull<T>; pub type nsLanguageAtomService_NotNull<T> = root::mozilla::NotNull<T>;
@ -25985,7 +25985,7 @@ pub mod root {
pub mFloat: root::__BindgenUnionField<f32>, pub mFloat: root::__BindgenUnionField<f32>,
pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>, pub mString: root::__BindgenUnionField<*mut root::nsStringBuffer>,
pub mColor: root::__BindgenUnionField<root::nscolor>, pub mColor: root::__BindgenUnionField<root::nscolor>,
pub mAtom: root::__BindgenUnionField<*mut root::nsIAtom>, pub mAtom: root::__BindgenUnionField<*mut root::nsAtom>,
pub mArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>, pub mArray: root::__BindgenUnionField<*mut root::nsCSSValue_Array>,
pub mURL: root::__BindgenUnionField<*mut root::mozilla::css::URLValue>, pub mURL: root::__BindgenUnionField<*mut root::mozilla::css::URLValue>,
pub mImage: root::__BindgenUnionField<*mut root::mozilla::css::ImageValue>, pub mImage: root::__BindgenUnionField<*mut root::mozilla::css::ImageValue>,
@ -29795,7 +29795,7 @@ pub mod root {
pub mImage: root::__BindgenUnionField<*mut root::nsStyleImageRequest>, pub mImage: root::__BindgenUnionField<*mut root::nsStyleImageRequest>,
pub mGradient: root::__BindgenUnionField<*mut root::nsStyleGradient>, pub mGradient: root::__BindgenUnionField<*mut root::nsStyleGradient>,
pub mURLValue: root::__BindgenUnionField<*mut root::nsStyleImage_URLValue>, pub mURLValue: root::__BindgenUnionField<*mut root::nsStyleImage_URLValue>,
pub mElementId: root::__BindgenUnionField<*mut root::nsIAtom>, pub mElementId: root::__BindgenUnionField<*mut root::nsAtom>,
pub bindgen_union_field: u64, pub bindgen_union_field: u64,
} }
#[test] #[test]
@ -31907,7 +31907,7 @@ pub mod root {
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)] #[derive(Debug, Copy)]
pub struct nsMediaFeature { pub struct nsMediaFeature {
pub mName: *mut *mut root::nsIAtom, pub mName: *mut *mut root::nsAtom,
pub mRangeType: root::nsMediaFeature_RangeType, pub mRangeType: root::nsMediaFeature_RangeType,
pub mValueType: root::nsMediaFeature_ValueType, pub mValueType: root::nsMediaFeature_ValueType,
pub mReqFlags: u8, pub mReqFlags: u8,
@ -31945,7 +31945,7 @@ pub mod root {
pub struct nsMediaFeature__bindgen_ty_1 { pub struct nsMediaFeature__bindgen_ty_1 {
pub mInitializer_: root::__BindgenUnionField<*const ::std::os::raw::c_void>, pub mInitializer_: root::__BindgenUnionField<*const ::std::os::raw::c_void>,
pub mKeywordTable: root::__BindgenUnionField<*const root::nsCSSProps_KTableEntry>, pub mKeywordTable: root::__BindgenUnionField<*const root::nsCSSProps_KTableEntry>,
pub mMetric: root::__BindgenUnionField<*const *const root::nsIAtom>, pub mMetric: root::__BindgenUnionField<*const *const root::nsAtom>,
pub bindgen_union_field: u64, pub bindgen_union_field: u64,
} }
#[test] #[test]
@ -32339,7 +32339,7 @@ pub mod root {
pub mHasOnly: bool, pub mHasOnly: bool,
pub mTypeOmitted: bool, pub mTypeOmitted: bool,
pub mHadUnknownExpression: bool, pub mHadUnknownExpression: bool,
pub mMediaType: root::RefPtr<root::nsIAtom>, pub mMediaType: root::RefPtr<root::nsAtom>,
pub mExpressions: root::nsTArray<root::nsMediaExpression>, pub mExpressions: root::nsTArray<root::nsMediaExpression>,
} }
#[test] #[test]
@ -32691,15 +32691,15 @@ pub mod root {
root::nsTArray<*mut root::nsCSSSelector> ) )); root::nsTArray<*mut root::nsCSSSelector> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation() { fn __bindgen_test_layout_RefPtr_open0_nsStyleImageRequest_close0_instantiation() {
@ -32790,26 +32790,26 @@ pub mod root {
root::nsTArray<root::nsStyleCoord> ) )); root::nsTArray<root::nsStyleCoord> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsIAtom_close1_close0_instantiation() { fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_1() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_1() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation() { fn __bindgen_test_layout_UniquePtr_open0_nsStyleGridTemplate_DefaultDelete_open1_nsStyleGridTemplate_close1_close0_instantiation() {
@ -32869,26 +32869,26 @@ pub mod root {
)); ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsIAtom_close1_close0_instantiation_1() { fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_1() {
assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_2() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_2() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_Position_close0_instantiation() { fn __bindgen_test_layout_nsTArray_open0_Position_close0_instantiation() {
@ -34504,15 +34504,15 @@ pub mod root {
u64 ) )); u64 ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_3() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_3() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsCSSFontFaceRule_close0_instantiation() { fn __bindgen_test_layout_RefPtr_open0_nsCSSFontFaceRule_close0_instantiation() {
@ -34548,15 +34548,15 @@ pub mod root {
root::nsTArray<*mut root::nsIContent> ) )); root::nsTArray<*mut root::nsIContent> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_4() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_4() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsCOMPtr_open0_nsIStyleRule_close0_instantiation() { fn __bindgen_test_layout_nsCOMPtr_open0_nsIStyleRule_close0_instantiation() {
@ -34761,15 +34761,15 @@ pub mod root {
root::RefPtr<root::mozilla::CounterStyleManager> ) )); root::RefPtr<root::mozilla::CounterStyleManager> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_5() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_5() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1() { fn __bindgen_test_layout_RefPtr_open0_gfxFontFeatureValueSet_close0_instantiation_1() {
@ -34783,15 +34783,15 @@ pub mod root {
root::RefPtr<root::gfxFontFeatureValueSet> ) )); root::RefPtr<root::gfxFontFeatureValueSet> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_6() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_6() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsCOMPtr_open0_nsITheme_close0_instantiation() { fn __bindgen_test_layout_nsCOMPtr_open0_nsITheme_close0_instantiation() {
@ -34882,37 +34882,37 @@ pub mod root {
root::nsAutoPtr<root::gfxMissingFontRecorder> ) )); root::nsAutoPtr<root::gfxMissingFontRecorder> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsIAtom_close0_instantiation() { fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation() {
assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 16usize , concat ! ( , 16usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsIAtom_close1_close0_instantiation_2() { fn __bindgen_test_layout_nsTArray_open0_RefPtr_open1_nsAtom_close1_close0_instantiation_2() {
assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::size_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsIAtom>>>() assert_eq!(::std::mem::align_of::<root::nsTArray<root::RefPtr<root::nsAtom>>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsTArray<root::RefPtr<root::nsIAtom>> ) )); root::nsTArray<root::RefPtr<root::nsAtom>> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_7() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_7() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_4() { fn __bindgen_test_layout_nsCOMPtr_open0_nsIPrincipal_close0_instantiation_4() {
@ -35251,26 +35251,26 @@ pub mod root {
root::mozilla::StaticRefPtr<root::nsIContent> ) )); root::mozilla::StaticRefPtr<root::nsIContent> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsIAtom_close0_instantiation_1() { fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_1() {
assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 16usize , concat ! ( , 16usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_8() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_8() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_UniquePtr_open0_TimeoutManager_DefaultDelete_open1_TimeoutManager_close1_close0_instantiation() { fn __bindgen_test_layout_UniquePtr_open0_TimeoutManager_DefaultDelete_open1_TimeoutManager_close1_close0_instantiation() {
@ -35751,15 +35751,15 @@ pub mod root {
root::nsTArray<::nsstring::nsStringRepr> ) )); root::nsTArray<::nsstring::nsStringRepr> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_9() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_9() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsAutoPtr_open0_LangGroupFontPrefs_close0_instantiation() { fn __bindgen_test_layout_nsAutoPtr_open0_LangGroupFontPrefs_close0_instantiation() {
@ -35786,15 +35786,15 @@ pub mod root {
) )); ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsIAtom_close0_instantiation_2() { fn __bindgen_test_layout_nsRefPtrHashKey_open0_nsAtom_close0_instantiation_2() {
assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::size_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 16usize , concat ! ( , 16usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsIAtom>>() assert_eq!(::std::mem::align_of::<root::nsRefPtrHashKey<root::nsAtom>>()
, 8usize , concat ! ( , 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::nsRefPtrHashKey<root::nsIAtom> ) )); root::nsRefPtrHashKey<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_228468_close0_instantiation() { fn __bindgen_test_layout_nsTArray_open0__bindgen_ty_id_228468_close0_instantiation() {
@ -36388,15 +36388,15 @@ pub mod root {
root::nsTArray<::nsstring::nsStringRepr> ) )); root::nsTArray<::nsstring::nsStringRepr> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_10() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_10() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_3() { fn __bindgen_test_layout_nsTArray_open0_nsStyleCoord_close0_instantiation_3() {
@ -37301,15 +37301,15 @@ pub mod root {
root::nsTArray<*mut root::mozilla::css::DocumentRule> ) )); root::nsTArray<*mut root::mozilla::css::DocumentRule> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_RefPtr_open0_nsIAtom_close0_instantiation_11() { fn __bindgen_test_layout_RefPtr_open0_nsAtom_close0_instantiation_11() {
assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::size_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Size of template specialization: " , stringify ! ( "Size of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsIAtom>>() , assert_eq!(::std::mem::align_of::<root::RefPtr<root::nsAtom>>() ,
8usize , concat ! ( 8usize , concat ! (
"Alignment of template specialization: " , stringify ! ( "Alignment of template specialization: " , stringify ! (
root::RefPtr<root::nsIAtom> ) )); root::RefPtr<root::nsAtom> ) ));
} }
#[test] #[test]
fn __bindgen_test_layout_nsTArray_open0_nsMediaExpression_close0_instantiation() { fn __bindgen_test_layout_nsTArray_open0_nsMediaExpression_close0_instantiation() {

2
components/style/gecko/pseudo_element_definition.mako.rs
View file

@ -143,7 +143,7 @@ impl PseudoElement {
} }
/// Get a PseudoInfo for a pseudo /// Get a PseudoInfo for a pseudo
pub fn pseudo_info(&self) -> (*mut structs::nsIAtom, CSSPseudoElementType) { pub fn pseudo_info(&self) -> (*mut structs::nsAtom, CSSPseudoElementType) {
(self.atom().as_ptr(), self.pseudo_type()) (self.atom().as_ptr(), self.pseudo_type())
} }

10
components/style/gecko/regen_atoms.py
View file

@ -42,14 +42,14 @@ class GkAtomSource:
PATTERN = re.compile('^(GK_ATOM)\((.+),\s*"(.*)"\)') PATTERN = re.compile('^(GK_ATOM)\((.+),\s*"(.*)"\)')
FILE = "include/nsGkAtomList.h" FILE = "include/nsGkAtomList.h"
CLASS = "nsGkAtoms" CLASS = "nsGkAtoms"
TYPE = "nsIAtom" TYPE = "nsAtom"
class CSSPseudoElementsAtomSource: class CSSPseudoElementsAtomSource:
PATTERN = re.compile('^(CSS_PSEUDO_ELEMENT)\((.+),\s*"(.*)",') PATTERN = re.compile('^(CSS_PSEUDO_ELEMENT)\((.+),\s*"(.*)",')
FILE = "include/nsCSSPseudoElementList.h" FILE = "include/nsCSSPseudoElementList.h"
CLASS = "nsCSSPseudoElements" CLASS = "nsCSSPseudoElements"
# NB: nsICSSPseudoElement is effectively the same as a nsIAtom, but we need # NB: nsICSSPseudoElement is effectively the same as a nsAtom, but we need
# this for MSVC name mangling. # this for MSVC name mangling.
TYPE = "nsICSSPseudoElement" TYPE = "nsICSSPseudoElement"
@ -163,14 +163,14 @@ class FileAvoidWrite(BytesIO):
self.close() self.close()
IMPORTS = ("\nuse gecko_bindings::structs::nsIAtom;" IMPORTS = ("\nuse gecko_bindings::structs::nsAtom;"
"\nuse string_cache::Atom;\n\n") "\nuse string_cache::Atom;\n\n")
ATOM_TEMPLATE = (" #[link_name = \"{link_name}\"]\n" ATOM_TEMPLATE = (" #[link_name = \"{link_name}\"]\n"
" pub static {name}: *mut {type};") " pub static {name}: *mut {type};")
UNSAFE_STATIC = ("#[inline(always)]\n" UNSAFE_STATIC = ("#[inline(always)]\n"
"pub unsafe fn atom_from_static(ptr: *mut nsIAtom) -> Atom {\n" "pub unsafe fn atom_from_static(ptr: *mut nsAtom) -> Atom {\n"
" Atom::from_static(ptr)\n" " Atom::from_static(ptr)\n"
"}\n\n") "}\n\n")
@ -220,7 +220,7 @@ def write_atom_macro(atoms, file_name):
f.write(IMPORTS) f.write(IMPORTS)
for source in SOURCES: for source in SOURCES:
if source.TYPE != "nsIAtom": if source.TYPE != "nsAtom":
f.write("pub enum {} {{}}\n\n".format(source.TYPE)) f.write("pub enum {} {{}}\n\n".format(source.TYPE))
f.write(UNSAFE_STATIC) f.write(UNSAFE_STATIC)

12
components/style/gecko/snapshot_helpers.rs
View file

@ -5,7 +5,7 @@
//! Element an snapshot common logic. //! Element an snapshot common logic.
use CaseSensitivityExt; use CaseSensitivityExt;
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsAtom;
use gecko_string_cache::WeakAtom; use gecko_string_cache::WeakAtom;
use selectors::attr::CaseSensitivity; use selectors::attr::CaseSensitivity;
use std::{ptr, slice}; use std::{ptr, slice};
@ -13,7 +13,7 @@ use string_cache::Atom;
/// A function that, given an element of type `T`, allows you to get a single /// A function that, given an element of type `T`, allows you to get a single
/// class or a class list. /// class or a class list.
pub type ClassOrClassList<T> = unsafe extern fn (T, *mut *mut nsIAtom, *mut *mut *mut nsIAtom) -> u32; pub type ClassOrClassList<T> = unsafe extern fn (T, *mut *mut nsAtom, *mut *mut *mut nsAtom) -> u32;
/// Given an item `T`, a class name, and a getter function, return whether that /// Given an item `T`, a class name, and a getter function, return whether that
/// element has the class that `name` represents. /// element has the class that `name` represents.
@ -23,8 +23,8 @@ pub fn has_class<T>(item: T,
getter: ClassOrClassList<T>) -> bool getter: ClassOrClassList<T>) -> bool
{ {
unsafe { unsafe {
let mut class: *mut nsIAtom = ptr::null_mut(); let mut class: *mut nsAtom = ptr::null_mut();
let mut list: *mut *mut nsIAtom = ptr::null_mut(); let mut list: *mut *mut nsAtom = ptr::null_mut();
let length = getter(item, &mut class, &mut list); let length = getter(item, &mut class, &mut list);
match length { match length {
0 => false, 0 => false,
@ -46,8 +46,8 @@ pub fn each_class<F, T>(item: T,
where F: FnMut(&Atom) where F: FnMut(&Atom)
{ {
unsafe { unsafe {
let mut class: *mut nsIAtom = ptr::null_mut(); let mut class: *mut nsAtom = ptr::null_mut();
let mut list: *mut *mut nsIAtom = ptr::null_mut(); let mut list: *mut *mut nsAtom = ptr::null_mut();
let length = getter(item, &mut class, &mut list); let length = getter(item, &mut class, &mut list);
match length { match length {
0 => {} 0 => {}

6
components/style/gecko/wrapper.rs
View file

@ -54,7 +54,7 @@ use gecko_bindings::bindings::Gecko_UnsetDirtyStyleAttr;
use gecko_bindings::bindings::Gecko_UpdateAnimations; use gecko_bindings::bindings::Gecko_UpdateAnimations;
use gecko_bindings::structs; use gecko_bindings::structs;
use gecko_bindings::structs::{RawGeckoElement, RawGeckoNode, RawGeckoXBLBinding}; use gecko_bindings::structs::{RawGeckoElement, RawGeckoNode, RawGeckoXBLBinding};
use gecko_bindings::structs::{nsIAtom, nsIContent, nsINode_BooleanFlag}; use gecko_bindings::structs::{nsAtom, nsIContent, nsINode_BooleanFlag};
use gecko_bindings::structs::ELEMENT_HANDLED_SNAPSHOT; use gecko_bindings::structs::ELEMENT_HANDLED_SNAPSHOT;
use gecko_bindings::structs::ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO; use gecko_bindings::structs::ELEMENT_HAS_ANIMATION_ONLY_DIRTY_DESCENDANTS_FOR_SERVO;
use gecko_bindings::structs::ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO; use gecko_bindings::structs::ELEMENT_HAS_DIRTY_DESCENDANTS_FOR_SERVO;
@ -2065,11 +2065,11 @@ impl<'le> ::selectors::Element for GeckoElement<'le> {
/// A few helpers to help with attribute selectors and snapshotting. /// A few helpers to help with attribute selectors and snapshotting.
pub trait NamespaceConstraintHelpers { pub trait NamespaceConstraintHelpers {
/// Returns the namespace of the selector, or null otherwise. /// Returns the namespace of the selector, or null otherwise.
fn atom_or_null(&self) -> *mut nsIAtom; fn atom_or_null(&self) -> *mut nsAtom;
} }
impl<'a> NamespaceConstraintHelpers for NamespaceConstraint<&'a Namespace> { impl<'a> NamespaceConstraintHelpers for NamespaceConstraint<&'a Namespace> {
fn atom_or_null(&self) -> *mut nsIAtom { fn atom_or_null(&self) -> *mut nsAtom {
match *self { match *self {
NamespaceConstraint::Any => ptr::null_mut(), NamespaceConstraint::Any => ptr::null_mut(),
NamespaceConstraint::Specific(ref ns) => ns.0.as_ptr(), NamespaceConstraint::Specific(ref ns) => ns.0.as_ptr(),

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

@ -4,13 +4,13 @@
#![allow(unsafe_code)] #![allow(unsafe_code)]
//! A drop-in replacement for string_cache, but backed by Gecko `nsIAtom`s. //! A drop-in replacement for string_cache, but backed by Gecko `nsAtom`s.
use gecko_bindings::bindings::Gecko_AddRefAtom; use gecko_bindings::bindings::Gecko_AddRefAtom;
use gecko_bindings::bindings::Gecko_Atomize; use gecko_bindings::bindings::Gecko_Atomize;
use gecko_bindings::bindings::Gecko_Atomize16; use gecko_bindings::bindings::Gecko_Atomize16;
use gecko_bindings::bindings::Gecko_ReleaseAtom; use gecko_bindings::bindings::Gecko_ReleaseAtom;
use gecko_bindings::structs::{nsIAtom, nsIAtom_AtomKind}; use gecko_bindings::structs::{nsAtom, nsAtom_AtomKind};
use nsstring::{nsAString, nsStr}; use nsstring::{nsAString, nsStr};
use precomputed_hash::PrecomputedHash; use precomputed_hash::PrecomputedHash;
use std::ascii::AsciiExt; use std::ascii::AsciiExt;
@ -46,9 +46,9 @@ pub struct Atom(*mut WeakAtom);
/// ///
/// Only usable as `&'a WeakAtom`, /// Only usable as `&'a WeakAtom`,
/// where `'a` is the lifetime of something that holds a strong reference to that atom. /// where `'a` is the lifetime of something that holds a strong reference to that atom.
pub struct WeakAtom(nsIAtom); pub struct WeakAtom(nsAtom);
/// A BorrowedAtom for Gecko is just a weak reference to a `nsIAtom`, that /// A BorrowedAtom for Gecko is just a weak reference to a `nsAtom`, that
/// hasn't been bumped. /// hasn't been bumped.
pub type BorrowedAtom<'a> = &'a WeakAtom; pub type BorrowedAtom<'a> = &'a WeakAtom;
@ -92,9 +92,9 @@ unsafe impl Sync for Atom {}
unsafe impl Sync for WeakAtom {} unsafe impl Sync for WeakAtom {}
impl WeakAtom { impl WeakAtom {
/// Construct a `WeakAtom` from a raw `nsIAtom`. /// Construct a `WeakAtom` from a raw `nsAtom`.
#[inline] #[inline]
pub unsafe fn new<'a>(atom: *const nsIAtom) -> &'a mut Self { pub unsafe fn new<'a>(atom: *const nsAtom) -> &'a mut Self {
&mut *(atom as *mut WeakAtom) &mut *(atom as *mut WeakAtom)
} }
@ -149,7 +149,7 @@ impl WeakAtom {
#[inline] #[inline]
pub fn is_static(&self) -> bool { pub fn is_static(&self) -> bool {
unsafe { unsafe {
(*self.as_ptr()).mKind() == nsIAtom_AtomKind::StaticAtom as u32 (*self.as_ptr()).mKind() == nsAtom_AtomKind::StaticAtom as u32
} }
} }
@ -169,9 +169,9 @@ impl WeakAtom {
/// Returns the atom as a mutable pointer. /// Returns the atom as a mutable pointer.
#[inline] #[inline]
pub fn as_ptr(&self) -> *mut nsIAtom { pub fn as_ptr(&self) -> *mut nsAtom {
let const_ptr: *const nsIAtom = &self.0; let const_ptr: *const nsAtom = &self.0;
const_ptr as *mut nsIAtom const_ptr as *mut nsAtom
} }
/// Convert this atom to ASCII lower-case /// Convert this atom to ASCII lower-case
@ -240,7 +240,7 @@ impl fmt::Display for WeakAtom {
impl Atom { impl Atom {
/// Execute a callback with the atom represented by `ptr`. /// Execute a callback with the atom represented by `ptr`.
pub unsafe fn with<F, R>(ptr: *mut nsIAtom, callback: F) -> R where F: FnOnce(&Atom) -> R { pub unsafe fn with<F, R>(ptr: *mut nsAtom, callback: F) -> R where F: FnOnce(&Atom) -> R {
let atom = Atom(WeakAtom::new(ptr)); let atom = Atom(WeakAtom::new(ptr));
let ret = callback(&atom); let ret = callback(&atom);
mem::forget(atom); mem::forget(atom);
@ -254,7 +254,7 @@ impl Atom {
/// that way, now we have sugar for is_static, creating atoms using /// that way, now we have sugar for is_static, creating atoms using
/// Atom::from should involve almost no overhead. /// Atom::from should involve almost no overhead.
#[inline] #[inline]
unsafe fn from_static(ptr: *mut nsIAtom) -> Self { unsafe fn from_static(ptr: *mut nsAtom) -> Self {
let atom = Atom(ptr as *mut WeakAtom); let atom = Atom(ptr as *mut WeakAtom);
debug_assert!(atom.is_static(), debug_assert!(atom.is_static(),
"Called from_static for a non-static atom!"); "Called from_static for a non-static atom!");
@ -264,16 +264,16 @@ impl Atom {
/// Creates an atom from a dynamic atom pointer that has already had AddRef /// Creates an atom from a dynamic atom pointer that has already had AddRef
/// called on it. /// called on it.
#[inline] #[inline]
pub unsafe fn from_addrefed(ptr: *mut nsIAtom) -> Self { pub unsafe fn from_addrefed(ptr: *mut nsAtom) -> Self {
assert!(!ptr.is_null()); assert!(!ptr.is_null());
unsafe { unsafe {
Atom(WeakAtom::new(ptr)) Atom(WeakAtom::new(ptr))
} }
} }
/// Convert this atom into an addrefed nsIAtom pointer. /// Convert this atom into an addrefed nsAtom pointer.
#[inline] #[inline]
pub fn into_addrefed(self) -> *mut nsIAtom { pub fn into_addrefed(self) -> *mut nsAtom {
let ptr = self.as_ptr(); let ptr = self.as_ptr();
mem::forget(self); mem::forget(self);
ptr ptr
@ -375,9 +375,9 @@ impl From<String> for Atom {
} }
} }
impl From<*mut nsIAtom> for Atom { impl From<*mut nsAtom> for Atom {
#[inline] #[inline]
fn from(ptr: *mut nsIAtom) -> Atom { fn from(ptr: *mut nsAtom) -> Atom {
assert!(!ptr.is_null()); assert!(!ptr.is_null());
unsafe { unsafe {
let ret = Atom(WeakAtom::new(ptr)); let ret = Atom(WeakAtom::new(ptr));

4
components/style/gecko_string_cache/namespace.rs
View file

@ -4,7 +4,7 @@
//! A type to represent a namespace. //! A type to represent a namespace.
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsAtom;
use precomputed_hash::PrecomputedHash; use precomputed_hash::PrecomputedHash;
use std::borrow::Borrow; use std::borrow::Borrow;
use std::fmt; use std::fmt;
@ -76,7 +76,7 @@ impl Borrow<WeakNamespace> for Namespace {
impl WeakNamespace { impl WeakNamespace {
/// Trivially construct a WeakNamespace. /// Trivially construct a WeakNamespace.
#[inline] #[inline]
pub unsafe fn new<'a>(atom: *mut nsIAtom) -> &'a Self { pub unsafe fn new<'a>(atom: *mut nsAtom) -> &'a Self {
&*(atom as *const WeakNamespace) &*(atom as *const WeakNamespace)
} }

8
components/style/properties/gecko.mako.rs
View file

@ -175,7 +175,7 @@ impl Clone for ComputedValuesInner {
} }
} }
type PseudoInfo = (*mut structs::nsIAtom, structs::CSSPseudoElementType); type PseudoInfo = (*mut structs::nsAtom, structs::CSSPseudoElementType);
type ParentStyleContextInfo<'a> = Option< &'a ComputedValues>; type ParentStyleContextInfo<'a> = Option< &'a ComputedValues>;
impl ComputedValuesInner { impl ComputedValuesInner {
@ -220,7 +220,7 @@ impl ComputedValuesInner {
pres_context: bindings::RawGeckoPresContextBorrowed, pres_context: bindings::RawGeckoPresContextBorrowed,
parent: ParentStyleContextInfo, parent: ParentStyleContextInfo,
pseudo_ty: structs::CSSPseudoElementType, pseudo_ty: structs::CSSPseudoElementType,
pseudo_tag: *mut structs::nsIAtom pseudo_tag: *mut structs::nsAtom
) -> Arc<ComputedValues> { ) -> Arc<ComputedValues> {
let arc = unsafe { let arc = unsafe {
let arc: Arc<ComputedValues> = Arc::new(uninitialized()); let arc: Arc<ComputedValues> = Arc::new(uninitialized());
@ -3456,7 +3456,7 @@ fn static_assert() {
pub fn clone_will_change(&self) -> longhands::will_change::computed_value::T { pub fn clone_will_change(&self) -> longhands::will_change::computed_value::T {
use properties::longhands::will_change::computed_value::T; use properties::longhands::will_change::computed_value::T;
use gecko_bindings::structs::nsIAtom; use gecko_bindings::structs::nsAtom;
use values::CustomIdent; use values::CustomIdent;
if self.gecko.mWillChange.len() == 0 { if self.gecko.mWillChange.len() == 0 {
@ -3464,7 +3464,7 @@ fn static_assert() {
} else { } else {
T::AnimateableFeatures( T::AnimateableFeatures(
self.gecko.mWillChange.iter().map(|gecko_atom| { self.gecko.mWillChange.iter().map(|gecko_atom| {
CustomIdent((gecko_atom.mRawPtr as *mut nsIAtom).into()) CustomIdent((gecko_atom.mRawPtr as *mut nsAtom).into())
}).collect() }).collect()
) )
} }

20
ports/geckolib/glue.rs
View file

@ -80,7 +80,7 @@ use style::gecko_bindings::structs;
use style::gecko_bindings::structs::{CSSPseudoElementType, CompositeOperation}; use style::gecko_bindings::structs::{CSSPseudoElementType, CompositeOperation};
use style::gecko_bindings::structs::{Loader, LoaderReusableStyleSheets}; use style::gecko_bindings::structs::{Loader, LoaderReusableStyleSheets};
use style::gecko_bindings::structs::{RawServoStyleRule, ServoStyleContextStrong, RustString}; use style::gecko_bindings::structs::{RawServoStyleRule, ServoStyleContextStrong, RustString};
use style::gecko_bindings::structs::{ServoStyleSheet, SheetParsingMode, nsIAtom, nsCSSPropertyID}; use style::gecko_bindings::structs::{ServoStyleSheet, SheetParsingMode, nsAtom, nsCSSPropertyID};
use style::gecko_bindings::structs::{nsCSSFontFaceRule, nsCSSCounterStyleRule}; use style::gecko_bindings::structs::{nsCSSFontFaceRule, nsCSSCounterStyleRule};
use style::gecko_bindings::structs::{nsRestyleHint, nsChangeHint, PropertyValuePair}; use style::gecko_bindings::structs::{nsRestyleHint, nsChangeHint, PropertyValuePair};
use style::gecko_bindings::structs::IterationCompositeOperation; use style::gecko_bindings::structs::IterationCompositeOperation;
@ -1589,12 +1589,12 @@ pub extern "C" fn Servo_Keyframe_SetStyle(keyframe: RawServoKeyframeBorrowed,
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_KeyframesRule_GetName(rule: RawServoKeyframesRuleBorrowed) -> *mut nsIAtom { pub extern "C" fn Servo_KeyframesRule_GetName(rule: RawServoKeyframesRuleBorrowed) -> *mut nsAtom {
read_locked_arc(rule, |rule: &KeyframesRule| rule.name.as_atom().as_ptr()) read_locked_arc(rule, |rule: &KeyframesRule| rule.name.as_atom().as_ptr())
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed, name: *mut nsIAtom) { pub extern "C" fn Servo_KeyframesRule_SetName(rule: RawServoKeyframesRuleBorrowed, name: *mut nsAtom) {
write_locked_arc(rule, |rule: &mut KeyframesRule| { write_locked_arc(rule, |rule: &mut KeyframesRule| {
rule.name = KeyframesName::Ident(CustomIdent(unsafe { Atom::from_addrefed(name) })); rule.name = KeyframesName::Ident(CustomIdent(unsafe { Atom::from_addrefed(name) }));
}) })
@ -1665,14 +1665,14 @@ pub extern "C" fn Servo_MediaRule_GetMedia(rule: RawServoMediaRuleBorrowed) -> R
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_NamespaceRule_GetPrefix(rule: RawServoNamespaceRuleBorrowed) -> *mut nsIAtom { pub extern "C" fn Servo_NamespaceRule_GetPrefix(rule: RawServoNamespaceRuleBorrowed) -> *mut nsAtom {
read_locked_arc(rule, |rule: &NamespaceRule| { read_locked_arc(rule, |rule: &NamespaceRule| {
rule.prefix.as_ref().unwrap_or(&atom!("")).as_ptr() rule.prefix.as_ref().unwrap_or(&atom!("")).as_ptr()
}) })
} }
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_NamespaceRule_GetURI(rule: RawServoNamespaceRuleBorrowed) -> *mut nsIAtom { pub extern "C" fn Servo_NamespaceRule_GetURI(rule: RawServoNamespaceRuleBorrowed) -> *mut nsAtom {
read_locked_arc(rule, |rule: &NamespaceRule| rule.url.0.as_ptr()) read_locked_arc(rule, |rule: &NamespaceRule| rule.url.0.as_ptr())
} }
@ -1726,7 +1726,7 @@ pub extern "C" fn Servo_FontFeatureValuesRule_GetValueText(rule: RawServoFontFea
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_ComputedValues_GetForAnonymousBox(parent_style_or_null: ServoStyleContextBorrowedOrNull, pub extern "C" fn Servo_ComputedValues_GetForAnonymousBox(parent_style_or_null: ServoStyleContextBorrowedOrNull,
pseudo_tag: *mut nsIAtom, pseudo_tag: *mut nsAtom,
raw_data: RawServoStyleSetBorrowed) raw_data: RawServoStyleSetBorrowed)
-> ServoStyleContextStrong { -> ServoStyleContextStrong {
let global_style_data = &*GLOBAL_STYLE_DATA; let global_style_data = &*GLOBAL_STYLE_DATA;
@ -1981,7 +1981,7 @@ fn get_pseudo_style(
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_ComputedValues_Inherit( pub extern "C" fn Servo_ComputedValues_Inherit(
raw_data: RawServoStyleSetBorrowed, raw_data: RawServoStyleSetBorrowed,
pseudo_tag: *mut nsIAtom, pseudo_tag: *mut nsAtom,
parent_style_context: ServoStyleContextBorrowedOrNull, parent_style_context: ServoStyleContextBorrowedOrNull,
target: structs::InheritTarget target: structs::InheritTarget
) -> ServoStyleContextStrong { ) -> ServoStyleContextStrong {
@ -2662,7 +2662,7 @@ pub extern "C" fn Servo_DeclarationBlock_SetIdentStringValue(declarations:
property: property:
nsCSSPropertyID, nsCSSPropertyID,
value: value:
*mut nsIAtom) { *mut nsAtom) {
use style::properties::{PropertyDeclaration, LonghandId}; use style::properties::{PropertyDeclaration, LonghandId};
use style::properties::longhands::_x_lang::computed_value::T as Lang; use style::properties::longhands::_x_lang::computed_value::T as Lang;
@ -3821,7 +3821,7 @@ pub extern "C" fn Servo_StyleSet_GetFontFaceRules(raw_data: RawServoStyleSetBorr
#[no_mangle] #[no_mangle]
pub extern "C" fn Servo_StyleSet_GetCounterStyleRule(raw_data: RawServoStyleSetBorrowed, pub extern "C" fn Servo_StyleSet_GetCounterStyleRule(raw_data: RawServoStyleSetBorrowed,
name: *mut nsIAtom) -> *mut nsCSSCounterStyleRule { name: *mut nsAtom) -> *mut nsCSSCounterStyleRule {
let data = PerDocumentStyleData::from_ffi(raw_data).borrow(); let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
unsafe { unsafe {
@ -3925,7 +3925,7 @@ pub extern "C" fn Servo_UACache_AddSizeOf(
pub extern "C" fn Servo_StyleSet_MightHaveAttributeDependency( pub extern "C" fn Servo_StyleSet_MightHaveAttributeDependency(
raw_data: RawServoStyleSetBorrowed, raw_data: RawServoStyleSetBorrowed,
element: RawGeckoElementBorrowed, element: RawGeckoElementBorrowed,
local_name: *mut nsIAtom, local_name: *mut nsAtom,
) -> bool { ) -> bool {
let data = PerDocumentStyleData::from_ffi(raw_data).borrow(); let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
let element = GeckoElement(element); let element = GeckoElement(element);