diff options
author | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
---|---|---|
committer | bors-servo <metajack+bors@gmail.com> | 2015-10-14 12:47:48 -0600 |
commit | 32daa17d5cbcad02db0713e21e52410cdc60480e (patch) | |
tree | d5cf3137ab06523b1c8958d830751b74642f048e /components/script/dom/bindings/utils.rs | |
parent | 8db8a86ab1e943b5102a05d6d31800579fdb7875 (diff) | |
parent | aab2c40389c71c4b0db3ffa75bdec99cd440b8af (diff) | |
download | servo-32daa17d5cbcad02db0713e21e52410cdc60480e.tar.gz servo-32daa17d5cbcad02db0713e21e52410cdc60480e.zip |
Auto merge of #7873 - nox:codegen-typeid, r=Ms2ger
Generate the various TypeId enums in codegen
This frees us forever from caring about maintaining these enums. The last commit removes their use from the initialisation of interface objects derived from Node.
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7873)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/bindings/utils.rs')
-rw-r--r-- | components/script/dom/bindings/utils.rs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/components/script/dom/bindings/utils.rs b/components/script/dom/bindings/utils.rs index d00c164d0a9..52cf58e4ff0 100644 --- a/components/script/dom/bindings/utils.rs +++ b/components/script/dom/bindings/utils.rs @@ -4,6 +4,7 @@ //! Various utilities to glue JavaScript and the DOM implementation together. +use dom::bindings::codegen::InheritTypes::TopTypeId; use dom::bindings::codegen::PrototypeList; use dom::bindings::codegen::PrototypeList::MAX_PROTO_CHAIN_LENGTH; use dom::bindings::conversions::native_from_handleobject; @@ -15,7 +16,6 @@ use dom::bindings::global::GlobalRef; use dom::bindings::js::Root; use dom::bindings::trace::trace_object; use dom::browsercontext; -use dom::eventtarget::EventTargetTypeId; use dom::window; use js; use js::glue::{CallJitGetterOp, CallJitMethodOp, CallJitSetterOp, IsWrapper}; @@ -156,8 +156,8 @@ pub struct DOMClass { /// derivedness. pub interface_chain: [PrototypeList::ID; MAX_PROTO_CHAIN_LENGTH], - /// The EventTarget type, if this is derived from an EventTarget. - pub type_id: Option<EventTargetTypeId>, + /// The type ID of that interface. + pub type_id: TopTypeId, /// The NativePropertyHooks for the interface associated with this class. pub native_hooks: &'static NativePropertyHooks, |