diff options
author | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-26 01:53:40 +0200 |
---|---|---|
committer | Anthony Ramine <n.oxyde@gmail.com> | 2017-09-26 09:49:10 +0200 |
commit | f87c2a8d7616112ca924e30292db2d244cf87eec (patch) | |
tree | 7344afe7ec0ec1ac7d1d13f5385111ee9c4be332 /components/script/dom/event.rs | |
parent | 577370746e2ce3da7fa25a20b8e1bbeed319df65 (diff) | |
download | servo-f87c2a8d7616112ca924e30292db2d244cf87eec.tar.gz servo-f87c2a8d7616112ca924e30292db2d244cf87eec.zip |
Rename Root<T> to DomRoot<T>
In a later PR, DomRoot<T> will become a type alias of Root<Dom<T>>,
where Root<T> will be able to handle all the things that need to be
rooted that have a stable traceable address that doesn't move for the
whole lifetime of the root. Stay tuned.
Diffstat (limited to 'components/script/dom/event.rs')
-rw-r--r-- | components/script/dom/event.rs | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/components/script/dom/event.rs b/components/script/dom/event.rs index 24674147bc5..e693dd1c5eb 100644 --- a/components/script/dom/event.rs +++ b/components/script/dom/event.rs @@ -11,7 +11,7 @@ use dom::bindings::error::Fallible; use dom::bindings::inheritance::Castable; use dom::bindings::refcounted::Trusted; use dom::bindings::reflector::{DomObject, Reflector, reflect_dom_object}; -use dom::bindings::root::{Dom, MutNullableDom, Root, RootedReference}; +use dom::bindings::root::{Dom, DomRoot, MutNullableDom, RootedReference}; use dom::bindings::str::DOMString; use dom::document::Document; use dom::eventtarget::{CompiledEventListener, EventTarget, ListenerPhase}; @@ -64,7 +64,7 @@ impl Event { } } - pub fn new_uninitialized(global: &GlobalScope) -> Root<Event> { + pub fn new_uninitialized(global: &GlobalScope) -> DomRoot<Event> { reflect_dom_object(box Event::new_inherited(), global, EventBinding::Wrap) @@ -73,7 +73,7 @@ impl Event { pub fn new(global: &GlobalScope, type_: Atom, bubbles: EventBubbles, - cancelable: EventCancelable) -> Root<Event> { + cancelable: EventCancelable) -> DomRoot<Event> { let event = Event::new_uninitialized(global); event.init_event(type_, bool::from(bubbles), bool::from(cancelable)); event @@ -81,7 +81,7 @@ impl Event { pub fn Constructor(global: &GlobalScope, type_: DOMString, - init: &EventBinding::EventInit) -> Fallible<Root<Event>> { + init: &EventBinding::EventInit) -> Fallible<DomRoot<Event>> { let bubbles = EventBubbles::from(init.bubbles); let cancelable = EventCancelable::from(init.cancelable); Ok(Event::new(global, Atom::from(type_), bubbles, cancelable)) @@ -140,8 +140,8 @@ impl Event { event_path.push(Dom::from_ref(ancestor.upcast::<EventTarget>())); } let top_most_ancestor_or_target = - Root::from_ref(event_path.r().last().cloned().unwrap_or(target)); - if let Some(document) = Root::downcast::<Document>(top_most_ancestor_or_target) { + DomRoot::from_ref(event_path.r().last().cloned().unwrap_or(target)); + if let Some(document) = DomRoot::downcast::<Document>(top_most_ancestor_or_target) { if self.type_() != atom!("load") && document.browsing_context().is_some() { event_path.push(Dom::from_ref(document.window().upcast())); } @@ -233,12 +233,12 @@ impl EventMethods for Event { } // https://dom.spec.whatwg.org/#dom-event-target - fn GetTarget(&self) -> Option<Root<EventTarget>> { + fn GetTarget(&self) -> Option<DomRoot<EventTarget>> { self.target.get() } // https://dom.spec.whatwg.org/#dom-event-currenttarget - fn GetCurrentTarget(&self) -> Option<Root<EventTarget>> { + fn GetCurrentTarget(&self) -> Option<DomRoot<EventTarget>> { self.current_target.get() } @@ -416,7 +416,7 @@ fn dispatch_to_listeners(event: &Event, target: &EventTarget, event_path: &[&Eve assert!(!event.stop_propagation.get()); assert!(!event.stop_immediate.get()); - let window = match Root::downcast::<Window>(target.global()) { + let window = match DomRoot::downcast::<Window>(target.global()) { Some(window) => { if window.need_emit_timeline_marker(TimelineMarkerType::DOMEvent) { Some(window) |