diff options
author | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-15 05:32:51 +0530 |
---|---|---|
committer | Manish Goregaokar <manishsmail@gmail.com> | 2015-08-18 19:37:42 +0530 |
commit | 19241c95f7b2aa0c781de54b5fba0913b5614b4d (patch) | |
tree | cc26d9c5da124dec64ea461df5e6ce7b618ac7ba /components/script/dom/node.rs | |
parent | a53b86f1073a1c7d331cfc7630d01a5687790307 (diff) | |
download | servo-19241c95f7b2aa0c781de54b5fba0913b5614b4d.tar.gz servo-19241c95f7b2aa0c781de54b5fba0913b5614b4d.zip |
Cleanup NodeIterator, Range, ServoHTMLParser, TextEncoder, URLHelper, URL, VirtualMethods
Diffstat (limited to 'components/script/dom/node.rs')
-rw-r--r-- | components/script/dom/node.rs | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index bc5af4af038..6ca62f181e3 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -275,7 +275,7 @@ impl LayoutDataRef { /// prevent CSS selector matching from mutably accessing nodes it's not supposed to and racing /// on it. This has already resulted in one bug! #[inline] - pub fn borrow_mut(self) -> RefMut<Option<LayoutData>> { + pub fn borrow_mut(&self) -> RefMut<Option<LayoutData>> { debug_assert!(task_state::get().is_layout()); self.data_cell.borrow_mut() } @@ -2088,12 +2088,7 @@ impl<'a> NodeMethods for &'a Node { // https://dom.spec.whatwg.org/#dom-node-nodevalue fn GetNodeValue(self) -> Option<DOMString> { - if let NodeTypeId::CharacterData(..) = self.type_id { - let chardata: &CharacterData = CharacterDataCast::to_ref(self).unwrap(); - Some(chardata.Data()) - } else { - None - } + CharacterDataCast::to_ref(self).map(|c| c.Data()) } // https://dom.spec.whatwg.org/#dom-node-nodevalue |