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

Use 'NodeConstants' instead of magic numbers.

Browse source
This commit is contained in:
Tetsuharu OHZEKI 2014-03-16 13:36:47 +09:00
parent 620755b95f
commit d200a2e444
1 changed files with 27 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

48
src/components/script/dom/node.rs
View file

@ -9,6 +9,7 @@ use dom::bindings::codegen::InheritTypes::{CommentCast, DocumentCast, DocumentTy
use dom::bindings::codegen::InheritTypes::{ElementCast, TextCast, NodeCast}; use dom::bindings::codegen::InheritTypes::{ElementCast, TextCast, NodeCast};
use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDerived}; use dom::bindings::codegen::InheritTypes::{CharacterDataCast, NodeBase, NodeDerived};
use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast; use dom::bindings::codegen::InheritTypes::ProcessingInstructionCast;
use dom::bindings::codegen::NodeBinding::NodeConstants;
use dom::bindings::js::JS; use dom::bindings::js::JS;
use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object}; use dom::bindings::utils::{Reflectable, Reflector, reflect_dom_object};
use dom::bindings::error::{ErrorResult, Fallible, NotFound, HierarchyRequest}; use dom::bindings::error::{ErrorResult, Fallible, NotFound, HierarchyRequest};
@ -817,13 +818,13 @@ impl Node {
// http://dom.spec.whatwg.org/#dom-node-nodetype // http://dom.spec.whatwg.org/#dom-node-nodetype
pub fn NodeType(&self) -> u16 { pub fn NodeType(&self) -> u16 {
match self.type_id { match self.type_id {
ElementNodeTypeId(_) => 1, ElementNodeTypeId(_) => NodeConstants::ELEMENT_NODE,
TextNodeTypeId => 3, TextNodeTypeId => NodeConstants::TEXT_NODE,
ProcessingInstructionNodeTypeId => 7, ProcessingInstructionNodeTypeId => NodeConstants::PROCESSING_INSTRUCTION_NODE,
CommentNodeTypeId => 8, CommentNodeTypeId => NodeConstants::COMMENT_NODE,
DocumentNodeTypeId => 9, DocumentNodeTypeId => NodeConstants::DOCUMENT_NODE,
DoctypeNodeTypeId => 10, DoctypeNodeTypeId => NodeConstants::DOCUMENT_TYPE_NODE,
DocumentFragmentNodeTypeId => 11, DocumentFragmentNodeTypeId => NodeConstants::DOCUMENT_FRAGMENT_NODE,
} }
} }
@ -1659,45 +1660,50 @@ impl Node {
} }
// http://dom.spec.whatwg.org/#dom-node-comparedocumentposition // http://dom.spec.whatwg.org/#dom-node-comparedocumentposition
pub fn CompareDocumentPosition(&self, abstract_self: &JS<Node>, other: &JS<Node>) -> u16 { pub fn CompareDocumentPosition(&self, abstract_self: &JS<Node>, other: &JS<Node>) -> u16 {
static DOCUMENT_POSITION_DISCONNECTED: u16 = 0x01u16;
static DOCUMENT_POSITION_PRECEDING: u16 = 0x02u16;
static DOCUMENT_POSITION_FOLLOWING: u16 = 0x04u16;
static DOCUMENT_POSITION_CONTAINS: u16 = 0x08u16;
static DOCUMENT_POSITION_CONTAINED_BY: u16 = 0x10u16;
static DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC: u16 = 0x20u16;
if abstract_self == other { if abstract_self == other {
// step 2.
0 0
} else { } else {
let mut lastself = abstract_self.clone(); let mut lastself = abstract_self.clone();
let mut lastother = other.clone(); let mut lastother = other.clone();
for ancestor in abstract_self.ancestors() { for ancestor in abstract_self.ancestors() {
if &ancestor == other { if &ancestor == other {
return DOCUMENT_POSITION_CONTAINS + DOCUMENT_POSITION_PRECEDING; // step 4.
return NodeConstants::DOCUMENT_POSITION_CONTAINS +
NodeConstants::DOCUMENT_POSITION_PRECEDING;
} }
lastself = ancestor; lastself = ancestor;
} }
for ancestor in other.ancestors() { for ancestor in other.ancestors() {
if &ancestor == abstract_self { if &ancestor == abstract_self {
return DOCUMENT_POSITION_CONTAINED_BY + DOCUMENT_POSITION_FOLLOWING; // step 5.
return NodeConstants::DOCUMENT_POSITION_CONTAINED_BY +
NodeConstants::DOCUMENT_POSITION_FOLLOWING;
} }
lastother = ancestor; lastother = ancestor;
} }
if lastself != lastother { if lastself != lastother {
let random = if ptr::to_unsafe_ptr(abstract_self.get()) < ptr::to_unsafe_ptr(other.get()) { let random = if ptr::to_unsafe_ptr(abstract_self.get()) < ptr::to_unsafe_ptr(other.get()) {
DOCUMENT_POSITION_FOLLOWING NodeConstants::DOCUMENT_POSITION_FOLLOWING
} else { } else {
DOCUMENT_POSITION_PRECEDING NodeConstants::DOCUMENT_POSITION_PRECEDING
}; };
return random + DOCUMENT_POSITION_DISCONNECTED + DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC; // step 3.
return random +
NodeConstants::DOCUMENT_POSITION_DISCONNECTED +
NodeConstants::DOCUMENT_POSITION_IMPLEMENTATION_SPECIFIC;
} }
for child in lastself.traverse_preorder() { for child in lastself.traverse_preorder() {
if &child == other { if &child == other {
return DOCUMENT_POSITION_PRECEDING; // step 6.
return NodeConstants::DOCUMENT_POSITION_PRECEDING;
} }
if &child == abstract_self { if &child == abstract_self {
return DOCUMENT_POSITION_FOLLOWING; // step 7.
return NodeConstants::DOCUMENT_POSITION_FOLLOWING;
} }
} }
unreachable!() unreachable!()