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/properties_and_values/rule.rs | |
parent | Adding upstream version 124.0.1. (diff) | |
download | firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.tar.xz firefox-40a355a42d4a9444dc753c04c6608dade2f06a23.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/properties_and_values/rule.rs')
-rw-r--r-- | servo/components/style/properties_and_values/rule.rs | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/servo/components/style/properties_and_values/rule.rs b/servo/components/style/properties_and_values/rule.rs index 96617eccce..08693e6dd5 100644 --- a/servo/components/style/properties_and_values/rule.rs +++ b/servo/components/style/properties_and_values/rule.rs @@ -9,7 +9,10 @@ use super::{ registry::{PropertyRegistration, PropertyRegistrationData}, syntax::Descriptor, - value::{AllowComputationallyDependent, SpecifiedValue as SpecifiedRegisteredValue}, + value::{ + AllowComputationallyDependent, ComputedValue as ComputedRegisteredValue, + SpecifiedValue as SpecifiedRegisteredValue, + }, }; use crate::custom_properties::{Name as CustomPropertyName, SpecifiedValue}; use crate::error_reporting::ContextualParseError; @@ -216,13 +219,13 @@ impl PropertyRegistration { pub fn compute_initial_value( &self, computed_context: &computed::Context, - ) -> Result<InitialValue, ()> { + ) -> Result<ComputedRegisteredValue, ()> { let Some(ref initial) = self.data.initial_value else { return Err(()); }; if self.data.syntax.is_universal() { - return Ok(Arc::clone(initial)); + return Ok(ComputedRegisteredValue::universal(Arc::clone(initial))); } let mut input = ParserInput::new(initial.css_text()); @@ -236,7 +239,7 @@ impl PropertyRegistration { computed_context, AllowComputationallyDependent::No, ) { - Ok(computed) => Ok(Arc::new(computed)), + Ok(computed) => Ok(computed), Err(_) => Err(()), } } |