зеркало из https://github.com/mozilla/gecko-dev.git
servo: Merge #15935 - Binding update (from upsuper:binding-update); r=Wafflespeanut
Source-Repo: https://github.com/servo/servo Source-Revision: f90e19f7055387a14cabdf11f77335c7763e3fb7 --HG-- extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear extra : subtree_revision : 26fc6b21ac14db90a44457da24956c38072a4eeb
This commit is contained in:
Родитель
65a1818359
Коммит
24707b4d2b
|
@ -429,10 +429,6 @@ mod bindings {
|
|||
"mozilla::dom::Sequence",
|
||||
"mozilla::dom::Optional",
|
||||
"mozilla::dom::Nullable",
|
||||
"nsAString_internal_char_traits",
|
||||
"nsAString_internal_incompatible_char_type",
|
||||
"nsACString_internal_char_traits",
|
||||
"nsACString_internal_incompatible_char_type",
|
||||
"RefPtr_Proxy",
|
||||
"RefPtr_Proxy_member_function",
|
||||
"nsAutoPtr_Proxy",
|
||||
|
@ -461,6 +457,10 @@ mod bindings {
|
|||
"mozilla::StyleAnimationValue",
|
||||
"StyleAnimationValue", // pulls in a whole bunch of stuff we don't need in the bindings
|
||||
];
|
||||
let blacklist = [
|
||||
".*_char_traits",
|
||||
".*_incompatible_char_type",
|
||||
];
|
||||
|
||||
struct MappedGenericType {
|
||||
generic: bool,
|
||||
|
@ -499,6 +499,9 @@ mod bindings {
|
|||
for &ty in opaque_types.iter() {
|
||||
builder = builder.opaque_type(ty);
|
||||
}
|
||||
for &ty in blacklist.iter() {
|
||||
builder = builder.hide_type(ty);
|
||||
}
|
||||
for ty in servo_mapped_generic_types.iter() {
|
||||
let gecko_name = ty.gecko.rsplit("::").next().unwrap();
|
||||
builder = builder.hide_type(ty.gecko)
|
||||
|
@ -722,6 +725,7 @@ pub fn generate() {
|
|||
use self::common::*;
|
||||
use std::fs;
|
||||
use std::thread;
|
||||
println!("cargo:rerun-if-changed=build_gecko.rs");
|
||||
fs::create_dir_all(&*OUTDIR_PATH).unwrap();
|
||||
let threads = vec![
|
||||
thread::spawn(|| bindings::generate_structs(BuildType::Debug)),
|
||||
|
|
|
@ -4,16 +4,6 @@ pub use nsstring::{nsACString, nsAString, nsString};
|
|||
type nsACString_internal = nsACString;
|
||||
type nsAString_internal = nsAString;
|
||||
use gecko_bindings::structs::mozilla::css::URLValue;
|
||||
pub type RawServoMediaListStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaList>;
|
||||
pub type RawServoMediaListBorrowedOrNull<'a> = Option<&'a RawServoMediaList>;
|
||||
pub type RawServoMediaListBorrowed<'a> = &'a RawServoMediaList;
|
||||
enum RawServoMediaListVoid{ }
|
||||
pub struct RawServoMediaList(RawServoMediaListVoid);
|
||||
pub type RawServoMediaRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaRule>;
|
||||
pub type RawServoMediaRuleBorrowedOrNull<'a> = Option<&'a RawServoMediaRule>;
|
||||
pub type RawServoMediaRuleBorrowed<'a> = &'a RawServoMediaRule;
|
||||
enum RawServoMediaRuleVoid{ }
|
||||
pub struct RawServoMediaRule(RawServoMediaRuleVoid);
|
||||
use gecko_bindings::structs::RawGeckoDocument;
|
||||
use gecko_bindings::structs::RawGeckoElement;
|
||||
use gecko_bindings::structs::RawGeckoKeyframeList;
|
||||
|
@ -211,6 +201,16 @@ pub struct RawServoImportRule(RawServoImportRuleVoid);
|
|||
pub type RawServoAnimationValueStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoAnimationValue>;
|
||||
pub type RawServoAnimationValueBorrowed<'a> = &'a RawServoAnimationValue;
|
||||
pub type RawServoAnimationValueBorrowedOrNull<'a> = Option<&'a RawServoAnimationValue>;
|
||||
pub type RawServoMediaListStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaList>;
|
||||
pub type RawServoMediaListBorrowed<'a> = &'a RawServoMediaList;
|
||||
pub type RawServoMediaListBorrowedOrNull<'a> = Option<&'a RawServoMediaList>;
|
||||
enum RawServoMediaListVoid { }
|
||||
pub struct RawServoMediaList(RawServoMediaListVoid);
|
||||
pub type RawServoMediaRuleStrong = ::gecko_bindings::sugar::ownership::Strong<RawServoMediaRule>;
|
||||
pub type RawServoMediaRuleBorrowed<'a> = &'a RawServoMediaRule;
|
||||
pub type RawServoMediaRuleBorrowedOrNull<'a> = Option<&'a RawServoMediaRule>;
|
||||
enum RawServoMediaRuleVoid { }
|
||||
pub struct RawServoMediaRule(RawServoMediaRuleVoid);
|
||||
pub type RawServoStyleSetOwned = ::gecko_bindings::sugar::ownership::Owned<RawServoStyleSet>;
|
||||
pub type RawServoStyleSetOwnedOrNull = ::gecko_bindings::sugar::ownership::OwnedOrNull<RawServoStyleSet>;
|
||||
pub type RawServoStyleSetBorrowed<'a> = &'a RawServoStyleSet;
|
||||
|
@ -296,24 +296,12 @@ extern "C" {
|
|||
pub fn Servo_DeclarationBlock_Release(ptr:
|
||||
RawServoDeclarationBlockBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaList_AddRef(ptr: RawServoMediaListBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaList_Release(ptr: RawServoMediaListBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_StyleRule_AddRef(ptr: RawServoStyleRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_StyleRule_Release(ptr: RawServoStyleRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaRule_AddRef(ptr: RawServoMediaRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaRule_Release(ptr: RawServoMediaRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_ImportRule_AddRef(ptr: RawServoImportRuleBorrowed);
|
||||
}
|
||||
|
@ -326,6 +314,18 @@ extern "C" {
|
|||
extern "C" {
|
||||
pub fn Servo_AnimationValue_Release(ptr: RawServoAnimationValueBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaList_AddRef(ptr: RawServoMediaListBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaList_Release(ptr: RawServoMediaListBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaRule_AddRef(ptr: RawServoMediaRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_MediaRule_Release(ptr: RawServoMediaRuleBorrowed);
|
||||
}
|
||||
extern "C" {
|
||||
pub fn Servo_StyleSet_Drop(ptr: RawServoStyleSetOwned);
|
||||
}
|
||||
|
|
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
Разница между файлами не показана из-за своего большого размера
Загрузить разницу
|
@ -2616,6 +2616,8 @@ cfg_if! {
|
|||
pub static nsGkAtoms_widget: *mut nsIAtom;
|
||||
#[link_name = "_ZN9nsGkAtoms5widthE"]
|
||||
pub static nsGkAtoms_width: *mut nsIAtom;
|
||||
#[link_name = "_ZN9nsGkAtoms10willChangeE"]
|
||||
pub static nsGkAtoms_willChange: *mut nsIAtom;
|
||||
#[link_name = "_ZN9nsGkAtoms6windowE"]
|
||||
pub static nsGkAtoms_window: *mut nsIAtom;
|
||||
#[link_name = "_ZN9nsGkAtoms18headerWindowTargetE"]
|
||||
|
@ -7543,6 +7545,8 @@ cfg_if! {
|
|||
pub static nsGkAtoms_widget: *mut nsIAtom;
|
||||
#[link_name = "?width@nsGkAtoms@@2PEAVnsIAtom@@EA"]
|
||||
pub static nsGkAtoms_width: *mut nsIAtom;
|
||||
#[link_name = "?willChange@nsGkAtoms@@2PEAVnsIAtom@@EA"]
|
||||
pub static nsGkAtoms_willChange: *mut nsIAtom;
|
||||
#[link_name = "?window@nsGkAtoms@@2PEAVnsIAtom@@EA"]
|
||||
pub static nsGkAtoms_window: *mut nsIAtom;
|
||||
#[link_name = "?headerWindowTarget@nsGkAtoms@@2PEAVnsIAtom@@EA"]
|
||||
|
@ -12470,6 +12474,8 @@ cfg_if! {
|
|||
pub static nsGkAtoms_widget: *mut nsIAtom;
|
||||
#[link_name = "\x01?width@nsGkAtoms@@2PAVnsIAtom@@A"]
|
||||
pub static nsGkAtoms_width: *mut nsIAtom;
|
||||
#[link_name = "\x01?willChange@nsGkAtoms@@2PAVnsIAtom@@A"]
|
||||
pub static nsGkAtoms_willChange: *mut nsIAtom;
|
||||
#[link_name = "\x01?window@nsGkAtoms@@2PAVnsIAtom@@A"]
|
||||
pub static nsGkAtoms_window: *mut nsIAtom;
|
||||
#[link_name = "\x01?headerWindowTarget@nsGkAtoms@@2PAVnsIAtom@@A"]
|
||||
|
@ -17400,6 +17406,8 @@ macro_rules! atom {
|
|||
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_widget as *mut _) } };
|
||||
("width") =>
|
||||
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_width as *mut _) } };
|
||||
("will-change") =>
|
||||
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_willChange as *mut _) } };
|
||||
("window") =>
|
||||
{ unsafe { $crate::string_cache::atom_macro::atom_from_static($crate::string_cache::atom_macro::nsGkAtoms_window as *mut _) } };
|
||||
("window-target") =>
|
||||
|
|
Загрузка…
Ссылка в новой задаче