summaryrefslogtreecommitdiffstats
path: root/servo/components/style/gecko/wrapper.rs
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-04-19 01:14:29 +0000
commitfbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8 (patch)
tree4c1ccaf5486d4f2009f9a338a98a83e886e29c97 /servo/components/style/gecko/wrapper.rs
parentReleasing progress-linux version 124.0.1-1~progress7.99u1. (diff)
downloadfirefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.tar.xz
firefox-fbaf0bb26397aa498eb9156f06d5a6fe34dd7dd8.zip
Merging upstream version 125.0.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'servo/components/style/gecko/wrapper.rs')
-rw-r--r--servo/components/style/gecko/wrapper.rs14
1 files changed, 5 insertions, 9 deletions
diff --git a/servo/components/style/gecko/wrapper.rs b/servo/components/style/gecko/wrapper.rs
index 61352ef9c0..43cf6e7941 100644
--- a/servo/components/style/gecko/wrapper.rs
+++ b/servo/components/style/gecko/wrapper.rs
@@ -865,7 +865,6 @@ impl<'le> GeckoElement<'le> {
after_change_style: &ComputedValues,
existing_transitions: &FxHashMap<OwnedPropertyDeclarationId, Arc<AnimationValue>>,
) -> bool {
- use crate::values::animated::{Animate, Procedure};
debug_assert!(!property_declaration_id.is_logical());
// If there is an existing transition, update only if the end value
@@ -882,20 +881,17 @@ impl<'le> GeckoElement<'le> {
return ***existing != after_value;
}
+ if combined_duration_seconds <= 0.0f32 {
+ return false;
+ }
+
let from =
AnimationValue::from_computed_values(property_declaration_id, before_change_style);
let to = AnimationValue::from_computed_values(property_declaration_id, after_change_style);
debug_assert_eq!(to.is_some(), from.is_some());
- combined_duration_seconds > 0.0f32 &&
- from != to &&
- from.unwrap()
- .animate(
- to.as_ref().unwrap(),
- Procedure::Interpolate { progress: 0.5 },
- )
- .is_ok()
+ from != to
}
/// Get slow selector flags required for nth-of invalidation.