diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-05-24 18:27:26 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-05-24 18:27:26 -0500 |
| commit | 542519ebfd073662bc9421ac5fa0aa01ebc0d6fe (patch) | |
| tree | 4f6814d089be78af598f1d9f536c18a6a61f8e54 /components/script/dom/node.rs | |
| parent | 16f19b628fa630aab8cfd275a90128da7b59723b (diff) | |
| parent | 5793add4cdc9e96930160dfc90025f43607f9f5d (diff) | |
| download | servo-542519ebfd073662bc9421ac5fa0aa01ebc0d6fe.tar.gz servo-542519ebfd073662bc9421ac5fa0aa01ebc0d6fe.zip | |
Auto merge of #6174 - frewsxcv:cleanup-long-lines, r=SimonSapin
Part of https://github.com/servo/servo/issues/6041
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/6174)
<!-- Reviewable:end -->
Diffstat (limited to 'components/script/dom/node.rs')
| -rw-r--r-- | components/script/dom/node.rs | 30 |
1 files changed, 20 insertions, 10 deletions
diff --git a/components/script/dom/node.rs b/components/script/dom/node.rs index 92ed3f41f6e..d9e9ef25b7c 100644 --- a/components/script/dom/node.rs +++ b/components/script/dom/node.rs @@ -177,7 +177,8 @@ impl NodeFlags { NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptGroupElement)) | NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLOptionElement)) | //NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLMenuItemElement)) | - NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement)) => IN_ENABLED_STATE | dirty, + NodeTypeId::Element(ElementTypeId::HTMLElement(HTMLElementTypeId::HTMLFieldSetElement)) => + IN_ENABLED_STATE | dirty, _ => dirty, } } @@ -1809,13 +1810,20 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // https://dom.spec.whatwg.org/#dom-node-nodetype fn NodeType(self) -> u16 { match self.type_id { - NodeTypeId::CharacterData(CharacterDataTypeId::Text) => NodeConstants::TEXT_NODE, - NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) => NodeConstants::PROCESSING_INSTRUCTION_NODE, - NodeTypeId::CharacterData(CharacterDataTypeId::Comment) => NodeConstants::COMMENT_NODE, - NodeTypeId::Document => NodeConstants::DOCUMENT_NODE, - NodeTypeId::DocumentType => NodeConstants::DOCUMENT_TYPE_NODE, - NodeTypeId::DocumentFragment => NodeConstants::DOCUMENT_FRAGMENT_NODE, - NodeTypeId::Element(_) => NodeConstants::ELEMENT_NODE, + NodeTypeId::CharacterData(CharacterDataTypeId::Text) => + NodeConstants::TEXT_NODE, + NodeTypeId::CharacterData(CharacterDataTypeId::ProcessingInstruction) => + NodeConstants::PROCESSING_INSTRUCTION_NODE, + NodeTypeId::CharacterData(CharacterDataTypeId::Comment) => + NodeConstants::COMMENT_NODE, + NodeTypeId::Document => + NodeConstants::DOCUMENT_NODE, + NodeTypeId::DocumentType => + NodeConstants::DOCUMENT_TYPE_NODE, + NodeTypeId::DocumentFragment => + NodeConstants::DOCUMENT_FRAGMENT_NODE, + NodeTypeId::Element(_) => + NodeConstants::ELEMENT_NODE, } } @@ -2008,7 +2016,8 @@ impl<'a> NodeMethods for JSRef<'a, Node> { // Step 4-5. match node.type_id() { - NodeTypeId::CharacterData(CharacterDataTypeId::Text) if self.is_document() => return Err(HierarchyRequest), + NodeTypeId::CharacterData(CharacterDataTypeId::Text) if self.is_document() => + return Err(HierarchyRequest), NodeTypeId::DocumentType if !self.is_document() => return Err(HierarchyRequest), NodeTypeId::DocumentFragment | NodeTypeId::DocumentType | @@ -2159,7 +2168,8 @@ impl<'a> NodeMethods for JSRef<'a, Node> { match prev_text { Some(ref text_node) => { let text_node = text_node.clone().root(); - let prev_characterdata: JSRef<CharacterData> = CharacterDataCast::from_ref(text_node.r()); + let prev_characterdata: JSRef<CharacterData> = + CharacterDataCast::from_ref(text_node.r()); let _ = prev_characterdata.AppendData(characterdata.Data()); self.remove_child(child.r()); }, |