Bug 1335942 - Part 1: Introduce mozilla::AnimationValue. r=manishearth

Use AnimationValue to wrap StyleAnimationValue and RawServoAnimationValue.
servo · Feb 8, 2017 · c7dc3e4 · c7dc3e4
1 parent e2b494b
commit c7dc3e4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 5 deletions.
diff --git a/components/style/gecko_bindings/structs_debug.rs b/components/style/gecko_bindings/structs_debug.rs
@@ -5152,10 +5152,15 @@ pub mod root {
         pub struct ContainerLayerParameters([u8; 0]);
         #[repr(C)]
         #[derive(Debug)]
+        pub struct AnimationValue {
+            pub mGecko: root::mozilla::StyleAnimationValue,
+            pub mServo: root::RefPtr<root::RawServoAnimationValue>,
+        }
+        #[repr(C)]
+        #[derive(Debug)]
         pub struct PropertyStyleAnimationValuePair {
             pub mProperty: root::nsCSSPropertyID,
-            pub mValue: root::mozilla::StyleAnimationValue,
-            pub mServoValue: root::RefPtr<root::RawServoAnimationValue>,
+            pub mValue: root::mozilla::AnimationValue,
         }
         #[test]
         fn bindgen_test_layout_PropertyStyleAnimationValuePair() {

diff --git a/components/style/gecko_bindings/structs_release.rs b/components/style/gecko_bindings/structs_release.rs
@@ -5068,10 +5068,15 @@ pub mod root {
         pub struct ContainerLayerParameters([u8; 0]);
         #[repr(C)]
         #[derive(Debug)]
+        pub struct AnimationValue {
+            pub mGecko: root::mozilla::StyleAnimationValue,
+            pub mServo: root::RefPtr<root::RawServoAnimationValue>,
+        }
+        #[repr(C)]
+        #[derive(Debug)]
         pub struct PropertyStyleAnimationValuePair {
             pub mProperty: root::nsCSSPropertyID,
-            pub mValue: root::mozilla::StyleAnimationValue,
-            pub mServoValue: root::RefPtr<root::RawServoAnimationValue>,
+            pub mValue: root::mozilla::AnimationValue,
         }
         #[test]
         fn bindgen_test_layout_PropertyStyleAnimationValuePair() {

diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
@@ -253,7 +253,7 @@ pub extern "C" fn Servo_AnimationValues_Populate(anim: RawGeckoAnimationValueLis
         // and thus can't directly use `geckoiter`
         let local_geckoiter = &mut geckoiter;
         for (gecko, servo) in local_geckoiter.zip(&mut iter) {
-            gecko.mServoValue.set_arc_leaky(Arc::new(servo));
+            gecko.mValue.mServo.set_arc_leaky(Arc::new(servo));
         }
     }