Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

stylo: Use the improved version of Gecko_GetStyleContext()

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2016-08-11 22:00:22 -07:00
parent ad5fb58e07
commit d85a60e366
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
3 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
components/style/gecko_selector_impl.rs
View file

@ -34,7 +34,7 @@ pub struct PseudoElement(Atom, bool);
impl PseudoElement { impl PseudoElement {
#[inline] #[inline]
fn as_atom(&self) -> &Atom { pub fn as_atom(&self) -> &Atom {
&self.0 &self.0
} }

2
components/style/properties/gecko.mako.rs
View file

@ -455,7 +455,7 @@ impl Clone for ${style_struct.gecko_struct_name} {
impl Debug for ${style_struct.gecko_struct_name} { impl Debug for ${style_struct.gecko_struct_name} {
// FIXME(bholley): Generate this. // FIXME(bholley): Generate this.
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result { fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
write!(f, "GECKO STYLE STRUCT") write!(f, "Gecko style struct: ${style_struct.gecko_struct_name}")
} }
} }
%else: %else:

11
ports/geckolib/wrapper.rs
View file

@ -319,15 +319,10 @@ impl<'ln> TNode for GeckoNode<'ln> {
return None; return None;
} }
if pseudo.is_some() {
// FIXME(emilio): This makes us reconstruct frame for pseudos every
// restyle, add a FFI call to get the style context associated with
// a PE.
return None;
}
unsafe { unsafe {
let context_ptr = Gecko_GetStyleContext(self.node); let atom_ptr = pseudo.map(|p| p.as_atom().as_ptr())
.unwrap_or(ptr::null_mut());
let context_ptr = Gecko_GetStyleContext(self.node, atom_ptr);
context_ptr.as_ref() context_ptr.as_ref()
} }
} }