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

style: Inline maybe_restyle, since it only has one caller.

Browse source
This commit is contained in:
Emilio Cobos Álvarez 2018-02-16 18:50:48 +01:00
parent a6113af873
commit 36e6d57aee
No known key found for this signature in database
GPG key ID: 056B727BB9C1027C
1 changed files with 18 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

43
components/style/gecko/wrapper.rs
View file

@ -692,32 +692,13 @@ impl<'le> GeckoElement<'le> {
unsafe { Gecko_GetDocumentLWTheme(node.owner_doc().0) } unsafe { Gecko_GetDocumentLWTheme(node.owner_doc().0) }
} }
/// Only safe to call on the main thread, with exclusive access to the element and /// Only safe to call on the main thread, with exclusive access to the
/// its ancestors. /// element and its ancestors.
/// This function is also called after display property changed for SMIL animation. ///
/// This function is also called after display property changed for SMIL
/// animation.
/// ///
/// Also this function schedules style flush. /// Also this function schedules style flush.
unsafe fn maybe_restyle<'a>(
&self,
data: &'a mut ElementData,
animation_only: bool,
) -> bool {
if !data.has_styles() {
return false;
}
// Propagate the bit up the chain.
if animation_only {
bindings::Gecko_NoteAnimationOnlyDirtyElement(self.0);
} else {
bindings::Gecko_NoteDirtyElement(self.0);
}
// Ensure and return the RestyleData.
true
}
/// Set restyle and change hints to the element data.
pub fn note_explicit_hints( pub fn note_explicit_hints(
&self, &self,
restyle_hint: nsRestyleHint, restyle_hint: nsRestyleHint,
@ -737,8 +718,20 @@ impl<'le> GeckoElement<'le> {
let mut maybe_data = self.mutate_data(); let mut maybe_data = self.mutate_data();
let should_restyle = maybe_data.as_mut().map_or(false, |d| unsafe { let should_restyle = maybe_data.as_mut().map_or(false, |d| unsafe {
self.maybe_restyle(d, restyle_hint.has_animation_hint()) if !d.has_styles() {
return false;
}
// Propagate the bit up the chain.
if restyle_hint.has_animation_hint() {
bindings::Gecko_NoteAnimationOnlyDirtyElement(self.0);
} else {
bindings::Gecko_NoteDirtyElement(self.0);
}
true
}); });
if should_restyle { if should_restyle {
maybe_data maybe_data
.as_mut() .as_mut()