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

auto merge of #3694 : saneyuki/servo/node, r=jdm

Browse source 
`Node.unsafe_get_flags()` returns `*const NodeFlags`, but `NodeFlags` has only `u8` length.
So We should just returns a raw value instead of any pointers.
This commit is contained in:
bors-servo 2014-10-15 22:45:19 -06:00
commit 84b2fe54b9
1 changed files with 3 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -949,15 +949,15 @@ pub trait RawLayoutNodeHelpers {
impl RawLayoutNodeHelpers for Node { impl RawLayoutNodeHelpers for Node {
#[inline] #[inline]
unsafe fn get_hover_state_for_layout(&self) -> bool { unsafe fn get_hover_state_for_layout(&self) -> bool {
(*self.unsafe_get_flags()).contains(InHoverState) self.flags.get().contains(InHoverState)
} }
#[inline] #[inline]
unsafe fn get_disabled_state_for_layout(&self) -> bool { unsafe fn get_disabled_state_for_layout(&self) -> bool {
(*self.unsafe_get_flags()).contains(InDisabledState) self.flags.get().contains(InDisabledState)
} }
#[inline] #[inline]
unsafe fn get_enabled_state_for_layout(&self) -> bool { unsafe fn get_enabled_state_for_layout(&self) -> bool {
(*self.unsafe_get_flags()).contains(InEnabledState) self.flags.get().contains(InEnabledState)
} }
#[inline] #[inline]
fn type_id_for_layout(&self) -> NodeTypeId { fn type_id_for_layout(&self) -> NodeTypeId {
@ -1612,11 +1612,6 @@ impl Node {
} }
} }
#[inline]
pub unsafe fn unsafe_get_flags(&self) -> *const NodeFlags {
mem::transmute(&self.flags)
}
pub fn collect_text_contents<'a, T: Iterator<JSRef<'a, Node>>>(mut iterator: T) -> String { pub fn collect_text_contents<'a, T: Iterator<JSRef<'a, Node>>>(mut iterator: T) -> String {
let mut content = String::new(); let mut content = String::new();
for node in iterator { for node in iterator {