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

Use bitflags! for NodeFlags

Browse source
This commit is contained in:
Brendan Zabarauskas 2014-06-05 15:43:57 -07:00
parent 7675b0ced0
commit 7212c3573e
1 changed files with 27 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -106,31 +106,22 @@ impl NodeDerived for EventTarget {
} }
} }
/// Flags for node items. bitflags! {
#[deriving(Encodable)] #[doc = "Flags for node items."]
pub struct NodeFlags(pub u8); #[deriving(Encodable)]
flags NodeFlags: u8 {
impl NodeFlags { #[doc = "Specifies whether this node is in a document."]
pub fn new(type_id: NodeTypeId) -> NodeFlags { static IsInDoc = 0x01,
let mut flags = NodeFlags(0); #[doc = "Specifies whether this node is hover state for this node"]
match type_id { static InHoverState = 0x02
DocumentNodeTypeId => { flags.set_is_in_doc(true); }
_ => {}
}
flags
} }
} }
/// Specifies whether this node is in a document. impl NodeFlags {
bitfield!(NodeFlags, is_in_doc, set_is_in_doc, 0x01) pub fn new(type_id: NodeTypeId) -> NodeFlags {
/// Specifies whether this node is hover state for this node match type_id {
bitfield!(NodeFlags, get_in_hover_state, set_is_in_hover_state, 0x02) DocumentNodeTypeId => IsInDoc,
_ => NodeFlags::empty(),
#[unsafe_destructor]
impl Drop for Node {
fn drop(&mut self) {
unsafe {
self.reap_layout_data()
} }
} }
} }
@ -424,7 +415,7 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
} }
fn is_in_doc(&self) -> bool { fn is_in_doc(&self) -> bool {
self.deref().flags.is_in_doc() self.deref().flags.contains(IsInDoc)
} }
/// Returns the type ID of this node. Fails if this node is borrowed mutably. /// Returns the type ID of this node. Fails if this node is borrowed mutably.
@ -483,11 +474,15 @@ impl<'a> NodeHelpers for JSRef<'a, Node> {
} }
fn get_hover_state(&self) -> bool { fn get_hover_state(&self) -> bool {
self.flags.get_in_hover_state() self.flags.contains(InHoverState)
} }
fn set_hover_state(&mut self, state: bool) { fn set_hover_state(&mut self, state: bool) {
self.flags.set_is_in_hover_state(state); if state {
self.flags.insert(InHoverState);
} else {
self.flags.remove(InHoverState);
}
} }
/// Iterates over this node and all its descendants, in preorder. /// Iterates over this node and all its descendants, in preorder.
@ -668,7 +663,7 @@ pub trait RawLayoutNodeHelpers {
impl RawLayoutNodeHelpers for Node { impl RawLayoutNodeHelpers for Node {
unsafe fn get_hover_state_for_layout(&self) -> bool { unsafe fn get_hover_state_for_layout(&self) -> bool {
self.flags.get_in_hover_state() self.flags.contains(InHoverState)
} }
} }
@ -1071,7 +1066,11 @@ impl Node {
// Step 8. // Step 8.
for node in nodes.mut_iter() { for node in nodes.mut_iter() {
parent.add_child(node, child); parent.add_child(node, child);
node.deref_mut().flags.set_is_in_doc(parent.is_in_doc()); if parent.is_in_doc() {
node.flags.insert(IsInDoc);
} else {
node.flags.remove(IsInDoc);
}
} }
// Step 9. // Step 9.
@ -1157,7 +1156,7 @@ impl Node {
// FIXME(2513): remove this `node_alias` when in fix mozilla#2513 // FIXME(2513): remove this `node_alias` when in fix mozilla#2513
let mut node_alias = node.clone(); let mut node_alias = node.clone();
node_alias.deref_mut().flags.set_is_in_doc(false); node_alias.deref_mut().flags.remove(IsInDoc);
// Step 9. // Step 9.
match suppress_observers { match suppress_observers {