Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-04 13:10:20 +01:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup node.rs

Browse source
This commit is contained in:
Manish Goregaokar 2015-08-15 04:53:43 +05:30
parent 94cd004c28
commit b21df4844c
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

26
components/script/dom/node.rs
View file

@ -264,7 +264,7 @@ impl LayoutDataRef {
/// Borrows the layout data immutably. This function is *not* thread-safe. /// Borrows the layout data immutably. This function is *not* thread-safe.
#[inline] #[inline]
pub fn borrow<'a>(&'a self) -> Ref<'a, Option<LayoutData>> { pub fn borrow(&self) -> Ref<Option<LayoutData>> {
debug_assert!(task_state::get().is_layout()); debug_assert!(task_state::get().is_layout());
self.data_cell.borrow() self.data_cell.borrow()
} }
@ -275,7 +275,7 @@ impl LayoutDataRef {
/// prevent CSS selector matching from mutably accessing nodes it's not supposed to and racing /// prevent CSS selector matching from mutably accessing nodes it's not supposed to and racing
/// on it. This has already resulted in one bug! /// on it. This has already resulted in one bug!
#[inline] #[inline]
pub fn borrow_mut<'a>(&'a self) -> RefMut<'a, Option<LayoutData>> { pub fn borrow_mut(self) -> RefMut<Option<LayoutData>> {
debug_assert!(task_state::get().is_layout()); debug_assert!(task_state::get().is_layout());
self.data_cell.borrow_mut() self.data_cell.borrow_mut()
} }
@ -908,7 +908,7 @@ impl<'a> NodeHelpers for &'a Node {
// Step 1. // Step 1.
match parse_author_origin_selector_list_from_str(&selectors) { match parse_author_origin_selector_list_from_str(&selectors) {
// Step 2. // Step 2.
Err(()) => return Err(Syntax), Err(()) => Err(Syntax),
// Step 3. // Step 3.
Ok(ref selectors) => { Ok(ref selectors) => {
let root = self.ancestors().last(); let root = self.ancestors().last();
@ -1326,7 +1326,7 @@ impl Iterator for FollowingNodeIterator {
} }
} }
self.current = None; self.current = None;
return None None
} }
} }
@ -1372,7 +1372,7 @@ impl Iterator for PrecedingNodeIterator {
} }
self.current = None; self.current = None;
return None None
} }
} }
@ -1663,7 +1663,7 @@ impl Node {
Node::insert(node, parent, reference_child, SuppressObserver::Unsuppressed); Node::insert(node, parent, reference_child, SuppressObserver::Unsuppressed);
// Step 6. // Step 6.
return Ok(Root::from_ref(node)) Ok(Root::from_ref(node))
} }
// https://dom.spec.whatwg.org/#concept-node-insert // https://dom.spec.whatwg.org/#concept-node-insert
@ -2088,25 +2088,19 @@ impl<'a> NodeMethods for &'a Node {
// https://dom.spec.whatwg.org/#dom-node-nodevalue // https://dom.spec.whatwg.org/#dom-node-nodevalue
fn GetNodeValue(self) -> Option<DOMString> { fn GetNodeValue(self) -> Option<DOMString> {
match self.type_id { if let NodeTypeId::CharacterData(..) = self.type_id {
NodeTypeId::CharacterData(..) => {
let chardata: &CharacterData = CharacterDataCast::to_ref(self).unwrap(); let chardata: &CharacterData = CharacterDataCast::to_ref(self).unwrap();
Some(chardata.Data()) Some(chardata.Data())
} } else {
_ => {
None None
} }
} }
}
// https://dom.spec.whatwg.org/#dom-node-nodevalue // https://dom.spec.whatwg.org/#dom-node-nodevalue
fn SetNodeValue(self, val: Option<DOMString>) { fn SetNodeValue(self, val: Option<DOMString>) {
match self.type_id { if let NodeTypeId::CharacterData(..) = self.type_id {
NodeTypeId::CharacterData(..) => {
self.SetTextContent(val) self.SetTextContent(val)
} }
_ => {}
}
} }
// https://dom.spec.whatwg.org/#dom-node-textcontent // https://dom.spec.whatwg.org/#dom-node-textcontent
@ -2565,7 +2559,7 @@ pub fn window_from_node<T: NodeBase + Reflectable>(derived: &T) -> Root<Window>
} }
impl<'a> VirtualMethods for &'a Node { impl<'a> VirtualMethods for &'a Node {
fn super_type<'b>(&'b self) -> Option<&'b VirtualMethods> { fn super_type(&self) -> Option<&VirtualMethods> {
let eventtarget: &&EventTarget = EventTargetCast::from_borrowed_ref(self); let eventtarget: &&EventTarget = EventTargetCast::from_borrowed_ref(self);
Some(eventtarget as &VirtualMethods) Some(eventtarget as &VirtualMethods)
} }