diff options
author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
---|---|---|
committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-19 01:13:27 +0000 |
commit | 40a355a42d4a9444dc753c04c6608dade2f06a23 (patch) | |
tree | 871fc667d2de662f171103ce5ec067014ef85e61 /servo/components/style/gecko | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-upstream/125.0.1.tar.xz firefox-upstream/125.0.1.zip |
Adding upstream version 125.0.1.upstream/125.0.1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'servo/components/style/gecko')
-rw-r--r-- | servo/components/style/gecko/media_features.rs | 5 | ||||
-rwxr-xr-x | servo/components/style/gecko/regen_atoms.py | 2 | ||||
-rw-r--r-- | servo/components/style/gecko/wrapper.rs | 14 |
3 files changed, 9 insertions, 12 deletions
diff --git a/servo/components/style/gecko/media_features.rs b/servo/components/style/gecko/media_features.rs index c9ad30b28b..8de45d95c2 100644 --- a/servo/components/style/gecko/media_features.rs +++ b/servo/components/style/gecko/media_features.rs @@ -169,8 +169,7 @@ fn eval_color_gamut(context: &Context, query_value: Option<ColorGamut>) -> bool // Match if our color gamut is at least as wide as the query value query_value <= match color_gamut { - // EndGuard_ is not a valid color gamut, so the default color-gamut is used. - ScreenColorGamut::Srgb | ScreenColorGamut::EndGuard_ => ColorGamut::Srgb, + ScreenColorGamut::Srgb => ColorGamut::Srgb, ScreenColorGamut::P3 => ColorGamut::P3, ScreenColorGamut::Rec2020 => ColorGamut::Rec2020, } @@ -566,6 +565,8 @@ pub enum Platform { /// platforms and they already use the "linux" string elsewhere (e.g., /// toolkit/themes/linux). Linux, + /// Matches any iOS version. + Ios, /// Matches any macOS version. Macos, /// Matches any Windows version. diff --git a/servo/components/style/gecko/regen_atoms.py b/servo/components/style/gecko/regen_atoms.py index 61f2fc4c63..9a3bb48271 100755 --- a/servo/components/style/gecko/regen_atoms.py +++ b/servo/components/style/gecko/regen_atoms.py @@ -18,7 +18,7 @@ import build # Matches lines like `GK_ATOM(foo, "foo", 0x12345678, true, nsStaticAtom, PseudoElementAtom)`. PATTERN = re.compile( - '^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*[^,]*,\s*([^,]*),\s*([^)]*)\)', + r'^GK_ATOM\(([^,]*),[^"]*"([^"]*)",\s*(0x[0-9a-f]+),\s*[^,]*,\s*([^,]*),\s*([^)]*)\)', re.MULTILINE, ) FILE = "include/nsGkAtomList.h" 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. |