Update binding files.

This commit is contained in:
Xidorn Quan 2017-04-03 21:56:58 +10:00
parent 3d483a986d
commit 35b638e50b
3 changed files with 61 additions and 13 deletions

View file

@ -428,11 +428,14 @@ extern "C" {
extern "C" { extern "C" {
pub fn Gecko_LoadStyleSheet(loader: *mut Loader, pub fn Gecko_LoadStyleSheet(loader: *mut Loader,
parent: *mut ServoStyleSheet, parent: *mut ServoStyleSheet,
import_rule: RawServoImportRuleBorrowed, child_sheet: RawServoStyleSheetBorrowed,
base_url_data: *mut RawGeckoURLExtraData, base_url_data: *mut RawGeckoURLExtraData,
url_bytes: *const u8, url_length: u32, url_bytes: *const u8, url_length: u32,
media_bytes: *const u8, media_length: u32); media_bytes: *const u8, media_length: u32);
} }
extern "C" {
pub fn Gecko_URLExtraData_CreateDummy() -> *mut RawGeckoURLExtraData;
}
extern "C" { extern "C" {
pub fn Gecko_MaybeCreateStyleChildrenIterator(node: RawGeckoNodeBorrowed) pub fn Gecko_MaybeCreateStyleChildrenIterator(node: RawGeckoNodeBorrowed)
-> StyleChildrenIteratorOwnedOrNull; -> StyleChildrenIteratorOwnedOrNull;
@ -1377,7 +1380,6 @@ extern "C" {
*mut ServoStyleSheet, *mut ServoStyleSheet,
data: *const nsACString, data: *const nsACString,
parsing_mode: SheetParsingMode, parsing_mode: SheetParsingMode,
base_url: *const nsACString,
extra_data: extra_data:
*mut RawGeckoURLExtraData) *mut RawGeckoURLExtraData)
-> RawServoStyleSheetStrong; -> RawServoStyleSheetStrong;
@ -1466,8 +1468,9 @@ extern "C" {
pub fn Servo_CssRules_InsertRule(rules: ServoCssRulesBorrowed, pub fn Servo_CssRules_InsertRule(rules: ServoCssRulesBorrowed,
sheet: RawServoStyleSheetBorrowed, sheet: RawServoStyleSheetBorrowed,
rule: *const nsACString, index: u32, rule: *const nsACString, index: u32,
nested: bool, rule_type: *mut u16) nested: bool, loader: *mut Loader,
-> nsresult; gecko_stylesheet: *mut ServoStyleSheet,
rule_type: *mut u16) -> nsresult;
} }
extern "C" { extern "C" {
pub fn Servo_CssRules_DeleteRule(rules: ServoCssRulesBorrowed, index: u32) pub fn Servo_CssRules_DeleteRule(rules: ServoCssRulesBorrowed, index: u32)
@ -1549,13 +1552,11 @@ extern "C" {
extern "C" { extern "C" {
pub fn Servo_ParseProperty(property: *const nsACString, pub fn Servo_ParseProperty(property: *const nsACString,
value: *const nsACString, value: *const nsACString,
base: *const nsACString,
data: *mut RawGeckoURLExtraData) data: *mut RawGeckoURLExtraData)
-> RawServoDeclarationBlockStrong; -> RawServoDeclarationBlockStrong;
} }
extern "C" { extern "C" {
pub fn Servo_ParseEasing(easing: *const nsAString, pub fn Servo_ParseEasing(easing: *const nsAString,
base: *const nsACString,
data: *mut RawGeckoURLExtraData, data: *mut RawGeckoURLExtraData,
output: nsTimingFunctionBorrowedMut) -> bool; output: nsTimingFunctionBorrowedMut) -> bool;
} }
@ -1610,7 +1611,6 @@ extern "C" {
} }
extern "C" { extern "C" {
pub fn Servo_ParseStyleAttribute(data: *const nsACString, pub fn Servo_ParseStyleAttribute(data: *const nsACString,
base: *const nsACString,
extra_data: *mut RawGeckoURLExtraData) extra_data: *mut RawGeckoURLExtraData)
-> RawServoDeclarationBlockStrong; -> RawServoDeclarationBlockStrong;
} }
@ -1678,7 +1678,6 @@ extern "C" {
property: *const nsACString, property: *const nsACString,
value: *const nsACString, value: *const nsACString,
is_important: bool, is_important: bool,
base: *const nsACString,
data: *mut RawGeckoURLExtraData) data: *mut RawGeckoURLExtraData)
-> bool; -> bool;
} }
@ -1688,7 +1687,6 @@ extern "C" {
property: nsCSSPropertyID, property: nsCSSPropertyID,
value: *const nsACString, value: *const nsACString,
is_important: bool, is_important: bool,
base: *const nsACString,
data: data:
*mut RawGeckoURLExtraData) *mut RawGeckoURLExtraData)
-> bool; -> bool;

View file

@ -5626,7 +5626,8 @@ pub mod root {
#[derive(Debug)] #[derive(Debug)]
pub struct StyleSheet { pub struct StyleSheet {
pub _base: root::nsIDOMCSSStyleSheet, pub _base: root::nsIDOMCSSStyleSheet,
pub _base_1: root::nsWrapperCache, pub _base_1: root::nsICSSLoaderObserver,
pub _base_2: root::nsWrapperCache,
pub mRefCnt: root::nsCycleCollectingAutoRefCnt, pub mRefCnt: root::nsCycleCollectingAutoRefCnt,
pub _mOwningThread: root::nsAutoOwningThread, pub _mOwningThread: root::nsAutoOwningThread,
pub mParent: *mut root::mozilla::StyleSheet, pub mParent: *mut root::mozilla::StyleSheet,
@ -5709,7 +5710,7 @@ pub mod root {
} }
#[test] #[test]
fn bindgen_test_layout_StyleSheet() { fn bindgen_test_layout_StyleSheet() {
assert_eq!(::std::mem::size_of::<StyleSheet>() , 128usize , concat assert_eq!(::std::mem::size_of::<StyleSheet>() , 136usize , concat
! ( "Size of: " , stringify ! ( StyleSheet ) )); ! ( "Size of: " , stringify ! ( StyleSheet ) ));
assert_eq! (::std::mem::align_of::<StyleSheet>() , 8usize , concat assert_eq! (::std::mem::align_of::<StyleSheet>() , 8usize , concat
! ( "Alignment of " , stringify ! ( StyleSheet ) )); ! ( "Alignment of " , stringify ! ( StyleSheet ) ));
@ -14743,6 +14744,30 @@ pub mod root {
fn clone(&self) -> Self { *self } fn clone(&self) -> Self { *self }
} }
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)]
pub struct nsICSSLoaderObserver {
pub _base: root::nsISupports,
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct nsICSSLoaderObserver_COMTypeInfo<T, U> {
pub _address: u8,
pub _phantom_0: ::std::marker::PhantomData<T>,
pub _phantom_1: ::std::marker::PhantomData<U>,
}
#[test]
fn bindgen_test_layout_nsICSSLoaderObserver() {
assert_eq!(::std::mem::size_of::<nsICSSLoaderObserver>() , 8usize ,
concat ! (
"Size of: " , stringify ! ( nsICSSLoaderObserver ) ));
assert_eq! (::std::mem::align_of::<nsICSSLoaderObserver>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( nsICSSLoaderObserver ) ));
}
impl Clone for nsICSSLoaderObserver {
fn clone(&self) -> Self { *self }
}
#[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct nsAttrValue { pub struct nsAttrValue {
pub mBits: usize, pub mBits: usize,

View file

@ -5535,7 +5535,8 @@ pub mod root {
#[derive(Debug)] #[derive(Debug)]
pub struct StyleSheet { pub struct StyleSheet {
pub _base: root::nsIDOMCSSStyleSheet, pub _base: root::nsIDOMCSSStyleSheet,
pub _base_1: root::nsWrapperCache, pub _base_1: root::nsICSSLoaderObserver,
pub _base_2: root::nsWrapperCache,
pub mRefCnt: root::nsCycleCollectingAutoRefCnt, pub mRefCnt: root::nsCycleCollectingAutoRefCnt,
pub mParent: *mut root::mozilla::StyleSheet, pub mParent: *mut root::mozilla::StyleSheet,
pub mTitle: ::nsstring::nsStringRepr, pub mTitle: ::nsstring::nsStringRepr,
@ -5617,7 +5618,7 @@ pub mod root {
} }
#[test] #[test]
fn bindgen_test_layout_StyleSheet() { fn bindgen_test_layout_StyleSheet() {
assert_eq!(::std::mem::size_of::<StyleSheet>() , 120usize , concat assert_eq!(::std::mem::size_of::<StyleSheet>() , 128usize , concat
! ( "Size of: " , stringify ! ( StyleSheet ) )); ! ( "Size of: " , stringify ! ( StyleSheet ) ));
assert_eq! (::std::mem::align_of::<StyleSheet>() , 8usize , concat assert_eq! (::std::mem::align_of::<StyleSheet>() , 8usize , concat
! ( "Alignment of " , stringify ! ( StyleSheet ) )); ! ( "Alignment of " , stringify ! ( StyleSheet ) ));
@ -14233,6 +14234,30 @@ pub mod root {
fn clone(&self) -> Self { *self } fn clone(&self) -> Self { *self }
} }
#[repr(C)] #[repr(C)]
#[derive(Debug, Copy)]
pub struct nsICSSLoaderObserver {
pub _base: root::nsISupports,
}
#[repr(C)]
#[derive(Debug, Copy, Clone)]
pub struct nsICSSLoaderObserver_COMTypeInfo<T, U> {
pub _address: u8,
pub _phantom_0: ::std::marker::PhantomData<T>,
pub _phantom_1: ::std::marker::PhantomData<U>,
}
#[test]
fn bindgen_test_layout_nsICSSLoaderObserver() {
assert_eq!(::std::mem::size_of::<nsICSSLoaderObserver>() , 8usize ,
concat ! (
"Size of: " , stringify ! ( nsICSSLoaderObserver ) ));
assert_eq! (::std::mem::align_of::<nsICSSLoaderObserver>() , 8usize ,
concat ! (
"Alignment of " , stringify ! ( nsICSSLoaderObserver ) ));
}
impl Clone for nsICSSLoaderObserver {
fn clone(&self) -> Self { *self }
}
#[repr(C)]
#[derive(Debug)] #[derive(Debug)]
pub struct nsAttrValue { pub struct nsAttrValue {
pub mBits: usize, pub mBits: usize,