diff --git a/components/style/build_gecko.rs b/components/style/build_gecko.rs index 88916c3f886..d3f894b519e 100644 --- a/components/style/build_gecko.rs +++ b/components/style/build_gecko.rs @@ -420,7 +420,6 @@ mod bindings { "mozilla::DefaultDelete", "mozilla::Side", "mozilla::binding_danger::AssertAndSuppressCleanupPolicy", - "RawServoAnimationValueBorrowedListBorrowed", "RawServoAnimationValueMapBorrowed", ]; let opaque_types = [ @@ -622,7 +621,6 @@ mod bindings { "Loader", "ServoStyleSheet", "EffectCompositor_CascadeLevel", - "RawServoAnimationValueBorrowedListBorrowed", ]; struct ArrayType { cpp_type: &'static str, diff --git a/components/style/gecko_bindings/bindings.rs b/components/style/gecko_bindings/bindings.rs index 466421556a4..d2b914fea54 100644 --- a/components/style/gecko_bindings/bindings.rs +++ b/components/style/gecko_bindings/bindings.rs @@ -175,7 +175,6 @@ use gecko_bindings::structs::nsresult; use gecko_bindings::structs::Loader; use gecko_bindings::structs::ServoStyleSheet; use gecko_bindings::structs::EffectCompositor_CascadeLevel; -use gecko_bindings::structs::RawServoAnimationValueBorrowedListBorrowed; pub type nsTArrayBorrowed_uintptr_t<'a> = &'a mut ::gecko_bindings::structs::nsTArray; pub type ServoCssRulesStrong = ::gecko_bindings::sugar::ownership::Strong; pub type ServoCssRulesBorrowed<'a> = &'a ServoCssRules; @@ -1513,11 +1512,6 @@ extern "C" { progress: f64) -> RawServoAnimationValueStrong; } -extern "C" { - pub fn Servo_AnimationValues_Uncompute(value: - RawServoAnimationValueBorrowedListBorrowed) - -> RawServoDeclarationBlockStrong; -} extern "C" { pub fn Servo_AnimationValue_Serialize(value: RawServoAnimationValueBorrowed, diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs index b61e83a8c6f..0d6f563f69e 100644 --- a/components/style/gecko_bindings/structs_debug.rs +++ b/components/style/gecko_bindings/structs_debug.rs @@ -25836,10 +25836,10 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct RawServoAnimationValue([u8; 0]); + pub struct RawServoStyleSet([u8; 0]); #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct RawServoStyleSet([u8; 0]); + pub struct RawServoAnimationValue([u8; 0]); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct RawServoAnimationValueMap([u8; 0]); @@ -25852,8 +25852,6 @@ pub mod root { root::nsTArray>; pub type RawGeckoAnimationValueList = root::nsTArray; - pub type RawServoAnimationValueBorrowedList = - root::nsTArray<*const root::RawServoAnimationValue>; pub type RawGeckoStyleAnimationList = root::nsStyleAutoArray; pub type RawServoAnimationValueMapBorrowed = @@ -25869,8 +25867,6 @@ pub mod root { pub type RawGeckoPresContextBorrowedMut = *mut root::RawGeckoPresContext; pub type RawGeckoAnimationValueListBorrowedMut = *mut root::RawGeckoAnimationValueList; - pub type RawServoAnimationValueBorrowedListBorrowed = - *const root::RawServoAnimationValueBorrowedList; pub type RawGeckoKeyframeListBorrowedMut = *mut root::RawGeckoKeyframeList; pub type RawGeckoKeyframeListBorrowed = *const root::RawGeckoKeyframeList; diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs index c707ea195da..3274a8d8837 100644 --- a/components/style/gecko_bindings/structs_release.rs +++ b/components/style/gecko_bindings/structs_release.rs @@ -25194,10 +25194,10 @@ pub mod root { } #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct RawServoAnimationValue([u8; 0]); + pub struct RawServoStyleSet([u8; 0]); #[repr(C)] #[derive(Debug, Copy, Clone)] - pub struct RawServoStyleSet([u8; 0]); + pub struct RawServoAnimationValue([u8; 0]); #[repr(C)] #[derive(Debug, Copy, Clone)] pub struct RawServoAnimationValueMap([u8; 0]); @@ -25210,8 +25210,6 @@ pub mod root { root::nsTArray>; pub type RawGeckoAnimationValueList = root::nsTArray; - pub type RawServoAnimationValueBorrowedList = - root::nsTArray<*const root::RawServoAnimationValue>; pub type RawGeckoStyleAnimationList = root::nsStyleAutoArray; pub type RawServoAnimationValueMapBorrowed = @@ -25227,8 +25225,6 @@ pub mod root { pub type RawGeckoPresContextBorrowedMut = *mut root::RawGeckoPresContext; pub type RawGeckoAnimationValueListBorrowedMut = *mut root::RawGeckoAnimationValueList; - pub type RawServoAnimationValueBorrowedListBorrowed = - *const root::RawServoAnimationValueBorrowedList; pub type RawGeckoKeyframeListBorrowedMut = *mut root::RawGeckoKeyframeList; pub type RawGeckoKeyframeListBorrowed = *const root::RawGeckoKeyframeList; diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs index 6d91e836199..e2426edd07a 100644 --- a/ports/geckolib/glue.rs +++ b/ports/geckolib/glue.rs @@ -56,7 +56,6 @@ use style::gecko_bindings::structs::{ThreadSafePrincipalHolder, ThreadSafeURIHol use style::gecko_bindings::structs::{nsRestyleHint, nsChangeHint}; use style::gecko_bindings::structs::Loader; use style::gecko_bindings::structs::RawGeckoPresContextOwned; -use style::gecko_bindings::structs::RawServoAnimationValueBorrowedListBorrowed; use style::gecko_bindings::structs::ServoStyleSheet; use style::gecko_bindings::structs::nsCSSValueSharedList; use style::gecko_bindings::structs::nsTimingFunction; @@ -260,20 +259,6 @@ pub extern "C" fn Servo_AnimationValueMap_Push(value_map: RawServoAnimationValue value_map.write().insert(property.into(), value.clone()); } -#[no_mangle] -pub extern "C" fn Servo_AnimationValues_Uncompute(value: RawServoAnimationValueBorrowedListBorrowed) - -> RawServoDeclarationBlockStrong -{ - let value = unsafe { value.as_ref().unwrap() }; - let mut block = PropertyDeclarationBlock::new(); - for v in value.iter() { - let raw_anim = unsafe { v.as_ref().unwrap() }; - let anim = AnimationValue::as_arc(&raw_anim); - block.push(anim.uncompute(), Importance::Normal); - } - Arc::new(RwLock::new(block)).into_strong() -} - macro_rules! get_property_id_from_nscsspropertyid { ($property_id: ident, $ret: expr) => {{ match PropertyId::from_nscsspropertyid($property_id) {