mirror of
https://github.com/servo/servo.git
synced 2025-08-06 06:00:15 +01:00
style: Use Option::as_deref() in style code.
And drive-by simplify another function that was only doing Option::clone(). Differential Revision: https://phabricator.services.mozilla.com/D92839
This commit is contained in:
parent
379fb984f1
commit
384fd59ad0
4 changed files with 10 additions and 16 deletions
|
@ -395,7 +395,7 @@ trait PrivateMatchMethods: TElement {
|
|||
if context.shared.traversal_flags.for_animation_only() {
|
||||
self.handle_display_change_for_smil_if_needed(
|
||||
context,
|
||||
old_values.as_ref().map(|v| &**v),
|
||||
old_values.as_deref(),
|
||||
new_values,
|
||||
restyle_hint,
|
||||
);
|
||||
|
@ -408,7 +408,7 @@ trait PrivateMatchMethods: TElement {
|
|||
let mut tasks = UpdateAnimationsTasks::empty();
|
||||
if self.needs_animations_update(
|
||||
context,
|
||||
old_values.as_ref().map(|s| &**s),
|
||||
old_values.as_deref(),
|
||||
new_values,
|
||||
/* pseudo_element = */ None,
|
||||
) {
|
||||
|
@ -417,7 +417,7 @@ trait PrivateMatchMethods: TElement {
|
|||
|
||||
let before_change_style = if self.might_need_transitions_update(
|
||||
context,
|
||||
old_values.as_ref().map(|s| &**s),
|
||||
old_values.as_deref(),
|
||||
new_values,
|
||||
/* pseudo_element = */ None,
|
||||
) {
|
||||
|
@ -460,7 +460,7 @@ trait PrivateMatchMethods: TElement {
|
|||
if important_rules_changed {
|
||||
tasks.insert(UpdateAnimationsTasks::CASCADE_RESULTS);
|
||||
}
|
||||
if new_values.is_display_property_changed_from_none(old_values.as_ref().map(|s| &**s)) {
|
||||
if new_values.is_display_property_changed_from_none(old_values.as_deref()) {
|
||||
tasks.insert(UpdateAnimationsTasks::DISPLAY_CHANGED_FROM_NONE);
|
||||
}
|
||||
}
|
||||
|
@ -638,14 +638,14 @@ trait PrivateMatchMethods: TElement {
|
|||
// map because this call will do a RwLock::read().
|
||||
let needs_animations_update = self.needs_animations_update(
|
||||
context,
|
||||
old_values.as_ref().map(|s| &**s),
|
||||
old_values.as_deref(),
|
||||
new_values,
|
||||
pseudo_element,
|
||||
);
|
||||
|
||||
let might_need_transitions_update = self.might_need_transitions_update(
|
||||
context,
|
||||
old_values.as_ref().map(|s| &**s),
|
||||
old_values.as_deref(),
|
||||
new_values,
|
||||
pseudo_element,
|
||||
);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue