From 01487d7b05c76f2cdb3338c522b6b6600bd4ee9a Mon Sep 17 00:00:00 2001
From: Hiroyuki Ikezoe <hikezoe@mozilla.com>
Date: Fri, 12 May 2017 19:32:31 +0900
Subject: [PATCH] Split off add_computed_property_value().

This function will be used outside of keyframes iteration.
---
 ports/geckolib/glue.rs | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/ports/geckolib/glue.rs b/ports/geckolib/glue.rs
index 58ca0cb5a76..ec4877ab648 100644
--- a/ports/geckolib/glue.rs
+++ b/ports/geckolib/glue.rs
@@ -2186,13 +2186,28 @@ pub extern "C" fn Servo_AssertTreeIsClean(root: RawGeckoElementBorrowed) {
     assert_subtree_is_clean(root);
 }
 
+fn add_computed_property_value(keyframe: *mut structs::Keyframe,
+                               index: usize,
+                               style: &ComputedValues,
+                               property: &TransitionProperty,
+                               shared_lock: &SharedRwLock) {
+    let block = style.to_declaration_block(property.clone().into());
+    unsafe {
+        (*keyframe).mPropertyValues.set_len((index + 1) as u32);
+        (*keyframe).mPropertyValues[index].mProperty = property.into();
+        // FIXME. Bug 1360398: Do not set computed values once we handles
+        // missing keyframes with additive composition.
+        (*keyframe).mPropertyValues[index].mServoDeclarationBlock.set_arc_leaky(
+            Arc::new(shared_lock.wrap(block)));
+    }
+}
+
 #[no_mangle]
 pub extern "C" fn Servo_StyleSet_FillKeyframesForName(raw_data: RawServoStyleSetBorrowed,
                                                       name: *const nsACString,
                                                       timing_function: nsTimingFunctionBorrowed,
                                                       style: ServoComputedValuesBorrowed,
                                                       keyframes: RawGeckoKeyframeListBorrowedMut) -> bool {
-    use style::gecko_bindings::structs::Keyframe;
     use style::properties::LonghandIdSet;
 
     let data = PerDocumentStyleData::from_ffi(raw_data).borrow();
@@ -2232,22 +2247,6 @@ pub extern "C" fn Servo_StyleSet_FillKeyframesForName(raw_data: RawServoStyleSet
                                              &timing_function)
         };
 
-        fn add_computed_property_value(keyframe: *mut Keyframe,
-                                       index: usize,
-                                       style: &ComputedValues,
-                                       property: &TransitionProperty,
-                                       shared_lock: &SharedRwLock) {
-            let block = style.to_declaration_block(property.clone().into());
-            unsafe {
-                (*keyframe).mPropertyValues.set_len((index + 1) as u32);
-                (*keyframe).mPropertyValues[index].mProperty = property.into();
-                // FIXME. Do not set computed values once we handles missing keyframes
-                // with additive composition.
-                (*keyframe).mPropertyValues[index].mServoDeclarationBlock.set_arc_leaky(
-                    Arc::new(shared_lock.wrap(block)));
-            }
-        }
-
         match step.value {
             KeyframesStepValue::ComputedValues => {
                 for (index, property) in animation.properties_changed.iter().enumerate() {