Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-22 23:03:42 +01:00
Code Issues Projects Releases Packages Wiki Activity

Remove most RootedReference uses

Browse source 
We can replace all uses of RootedReference for Option<T> by Option::deref calls.
This commit is contained in:
Anthony Ramine 2019-03-10 13:20:07 +01:00
parent 7bdfad92a5
commit 5fe5e5d6de
34 changed files with 186 additions and 185 deletions
Download patch file Download diff file Expand all files Collapse all files

18
components/script/dom/range.rs
View file

@ -14,7 +14,7 @@ use crate::dom::bindings::error::{Error, ErrorResult, Fallible};
use crate::dom::bindings::inheritance::Castable;
use crate::dom::bindings::inheritance::{CharacterDataTypeId, NodeTypeId};
use crate::dom::bindings::reflector::{reflect_dom_object, Reflector};
use crate::dom::bindings::root::{Dom, DomRoot, MutDom, RootedReference};
use crate::dom::bindings::root::{Dom, DomRoot, MutDom};
use crate::dom::bindings::str::DOMString;
use crate::dom::bindings::trace::JSTraceable;
use crate::dom::bindings::weakref::{WeakRef, WeakRefVec};
@ -730,7 +730,7 @@ impl RangeMethods for Range {
};
// Step 6.
Node::ensure_pre_insertion_validity(node, &parent, reference_node.r())?;
Node::ensure_pre_insertion_validity(node, &parent, reference_node.deref())?;
// Step 7.
let split_text;
@ -738,14 +738,14 @@ impl RangeMethods for Range {
Some(text) => {
split_text = text.SplitText(start_offset)?;
let new_reference = DomRoot::upcast::<Node>(split_text);
assert!(new_reference.GetParentNode().r() == Some(&parent));
assert!(new_reference.GetParentNode().deref() == Some(&parent));
Some(new_reference)
},
_ => reference_node,
};
// Step 8.
let reference_node = if Some(node) == reference_node.r() {
let reference_node = if Some(node) == reference_node.deref() {
node.GetNextSibling()
} else {
reference_node
@ -755,7 +755,9 @@ impl RangeMethods for Range {
node.remove_self();
// Step 10.
let new_offset = reference_node.r().map_or(parent.len(), |node| node.index());
let new_offset = reference_node
.as_ref()
.map_or(parent.len(), |node| node.index());
// Step 11
let new_offset = new_offset +
@ -766,7 +768,7 @@ impl RangeMethods for Range {
};
// Step 12.
Node::pre_insert(node, &parent, reference_node.r())?;
Node::pre_insert(node, &parent, reference_node.deref())?;
// Step 13.
if self.Collapsed() {
@ -842,7 +844,7 @@ impl RangeMethods for Range {
}
// Step 8.
for child in contained_children.r() {
for child in &*contained_children {
child.remove_self();
}
@ -959,7 +961,7 @@ impl RangeMethods for Range {
};
// Step 2.
let element = Element::fragment_parsing_context(&owner_doc, element.r());
let element = Element::fragment_parsing_context(&owner_doc, element.deref());
// Step 3.
let fragment_node = element.parse_fragment(fragment)?;