Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

Rename Root<T> to DomRoot<T>

Browse source 
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.
This commit is contained in:
Anthony Ramine 2017-09-26 01:53:40 +02:00
parent 577370746e
commit f87c2a8d76
291 changed files with 1774 additions and 1770 deletions
Download patch file Download diff file Expand all files Collapse all files

20
components/script/dom/mutationobserver.rs
View file

@ -10,7 +10,7 @@ use dom::bindings::codegen::Bindings::MutationObserverBinding::MutationObserverB
use dom::bindings::codegen::Bindings::MutationObserverBinding::MutationObserverInit;
use dom::bindings::error::{Error, Fallible};
use dom::bindings::reflector::{Reflector, reflect_dom_object};
use dom::bindings::root::Root;
use dom::bindings::root::DomRoot;
use dom::bindings::str::DOMString;
use dom::mutationrecord::MutationRecord;
use dom::node::Node;
@ -26,7 +26,7 @@ pub struct MutationObserver {
reflector_: Reflector,
#[ignore_heap_size_of = "can't measure Rc values"]
callback: Rc<MutationCallback>,
record_queue: DomRefCell<Vec<Root<MutationRecord>>>,
record_queue: DomRefCell<Vec<DomRoot<MutationRecord>>>,
}
pub enum Mutation<'a> {
@ -37,7 +37,7 @@ pub enum Mutation<'a> {
#[derive(HeapSizeOf, JSTraceable)]
pub struct RegisteredObserver {
observer: Root<MutationObserver>,
observer: DomRoot<MutationObserver>,
options: ObserverOptions,
}
@ -53,7 +53,7 @@ pub struct ObserverOptions {
}
impl MutationObserver {
fn new(global: &Window, callback: Rc<MutationCallback>) -> Root<MutationObserver> {
fn new(global: &Window, callback: Rc<MutationCallback>) -> DomRoot<MutationObserver> {
let boxed_observer = box MutationObserver::new_inherited(callback);
reflect_dom_object(boxed_observer, global, MutationObserverBinding::Wrap)
}
@ -66,7 +66,7 @@ impl MutationObserver {
}
}
pub fn Constructor(global: &Window, callback: Rc<MutationCallback>) -> Fallible<Root<MutationObserver>> {
pub fn Constructor(global: &Window, callback: Rc<MutationCallback>) -> Fallible<DomRoot<MutationObserver>> {
let observer = MutationObserver::new(global, callback);
ScriptThread::add_mutation_observer(&*observer);
Ok(observer)
@ -93,7 +93,7 @@ impl MutationObserver {
// TODO: steps 3-4 (slots)
// Step 5
for mo in &notify_list {
let queue: Vec<Root<MutationRecord>> = mo.record_queue.borrow().clone();
let queue: Vec<DomRoot<MutationRecord>> = mo.record_queue.borrow().clone();
mo.record_queue.borrow_mut().clear();
// TODO: Step 5.3 Remove all transient registered observers whose observer is mo.
if !queue.is_empty() {
@ -106,7 +106,7 @@ impl MutationObserver {
/// https://dom.spec.whatwg.org/#queueing-a-mutation-record
pub fn queue_a_mutation_record(target: &Node, attr_type: Mutation) {
// Step 1
let mut interestedObservers: Vec<(Root<MutationObserver>, Option<DOMString>)> = vec![];
let mut interestedObservers: Vec<(DomRoot<MutationObserver>, Option<DOMString>)> = vec![];
// Step 2 & 3
for node in target.inclusive_ancestors() {
for registered in &*node.registered_mutation_observers() {
@ -141,7 +141,7 @@ impl MutationObserver {
if let Some(idx) = idx {
interestedObservers[idx].1 = paired_string;
} else {
interestedObservers.push((Root::from_ref(&*registered.observer),
interestedObservers.push((DomRoot::from_ref(&*registered.observer),
paired_string));
}
},
@ -149,7 +149,7 @@ impl MutationObserver {
if !registered.options.child_list {
continue;
}
interestedObservers.push((Root::from_ref(&*registered.observer), None));
interestedObservers.push((DomRoot::from_ref(&*registered.observer), None));
}
}
}
@ -246,7 +246,7 @@ impl MutationObserverMethods for MutationObserver {
// Step 8
if add_new_observer {
target.registered_mutation_observers().push(RegisteredObserver {
observer: Root::from_ref(self),
observer: DomRoot::from_ref(self),
options: ObserverOptions {
attributes,
attribute_old_value,