mirror of
https://github.com/servo/servo.git
synced 2025-08-06 14:10:11 +01:00
auto merge of #4173 : Manishearth/servo/a-more-dom-struct, r=kmcallister
Now `#[dom_struct]` also generates Reflectable impls, and there's another lint to ensure that a DOM struct only contains one bare DOM field (as the first field) or a Reflector. A lot of this was generated by sed -- each autogenerated change has its own commit for easy review; these will be squashed later.
This commit is contained in:
commit
56d1b16d1b
131 changed files with 289 additions and 794 deletions
|
@ -8,7 +8,7 @@ use dom::bindings::codegen::Bindings::EventBinding::{EventConstants, EventMethod
|
|||
use dom::bindings::error::Fallible;
|
||||
use dom::bindings::global::GlobalRef;
|
||||
use dom::bindings::js::{MutNullableJS, JSRef, Temporary};
|
||||
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
|
||||
use dom::bindings::utils::{Reflector, reflect_dom_object};
|
||||
use dom::eventtarget::EventTarget;
|
||||
use servo_util::str::DOMString;
|
||||
use std::cell::Cell;
|
||||
|
@ -51,8 +51,8 @@ pub enum EventCancelable {
|
|||
|
||||
#[dom_struct]
|
||||
pub struct Event {
|
||||
type_id: EventTypeId,
|
||||
reflector_: Reflector,
|
||||
type_id: EventTypeId,
|
||||
current_target: MutNullableJS<EventTarget>,
|
||||
target: MutNullableJS<EventTarget>,
|
||||
type_: DOMRefCell<DOMString>,
|
||||
|
@ -71,8 +71,8 @@ pub struct Event {
|
|||
impl Event {
|
||||
pub fn new_inherited(type_id: EventTypeId) -> Event {
|
||||
Event {
|
||||
type_id: type_id,
|
||||
reflector_: Reflector::new(),
|
||||
type_id: type_id,
|
||||
current_target: Default::default(),
|
||||
target: Default::default(),
|
||||
phase: Cell::new(EventPhase::None),
|
||||
|
@ -240,12 +240,6 @@ impl<'a> EventMethods for JSRef<'a, Event> {
|
|||
}
|
||||
}
|
||||
|
||||
impl Reflectable for Event {
|
||||
fn reflector<'a>(&'a self) -> &'a Reflector {
|
||||
&self.reflector_
|
||||
}
|
||||
}
|
||||
|
||||
pub trait EventHelpers {
|
||||
fn set_trusted(self, trusted: bool);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue