servo: Merge #16929 - stylo: Avoid unconditional FFI calls to get the element state (from emilio:more-bits); r=bzbarsky

Source-Repo: https://github.com/servo/servo
Source-Revision: 448422c9a4f0cf28b92fd9e1479aa3d013b703f7

--HG--
extra : subtree_source : https%3A//hg.mozilla.org/projects/converted-servo-linear
extra : subtree_revision : b9bf17af3314032c022a73b0a9e951307672d9f6
This commit is contained in:
Emilio Cobos Álvarez 2017-05-19 06:44:25 -05:00
parent 21a5d387a2
commit 0f7f82d4bf

View File

@ -432,6 +432,14 @@ impl<'le> GeckoElement<'le> {
self.as_node().get_bool_flag(nsINode_BooleanFlag::ElementHasID)
}
#[inline]
fn get_state_internal(&self) -> u64 {
if !self.as_node().get_bool_flag(nsINode_BooleanFlag::ElementHasLockedStyleStates) {
return self.0.mState.mStates;
}
unsafe { Gecko_ElementState(self.0) }
}
#[inline]
fn may_have_class(&self) -> bool {
self.as_node().get_bool_flag(nsINode_BooleanFlag::ElementMayHaveClass)
@ -630,9 +638,7 @@ impl<'le> TElement for GeckoElement<'le> {
}
fn get_state(&self) -> ElementState {
unsafe {
ElementState::from_bits_truncate(Gecko_ElementState(self.0))
}
ElementState::from_bits_truncate(self.get_state_internal())
}
#[inline]