Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-09 15:35:34 +01:00
Code Issues Projects Releases Packages Wiki Activity

Append PropertyValuePair objects on Gecko side so they are initialized correctly

Browse source
This commit is contained in:
Brian Birtles 2017-07-20 13:24:06 +09:00
parent ea2da6b07b
commit 791df735d2
1 changed files with 14 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

30
ports/geckolib/glue.rs
View file

@ -45,6 +45,7 @@ use style::gecko_bindings::bindings::{RawServoSupportsRule, RawServoSupportsRule
use style::gecko_bindings::bindings::{ServoCssRulesBorrowed, ServoCssRulesStrong}; use style::gecko_bindings::bindings::{ServoCssRulesBorrowed, ServoCssRulesStrong};
use style::gecko_bindings::bindings::{nsACString, nsAString, nsCSSPropertyIDSetBorrowedMut}; use style::gecko_bindings::bindings::{nsACString, nsAString, nsCSSPropertyIDSetBorrowedMut};
use style::gecko_bindings::bindings::Gecko_AddPropertyToSet; use style::gecko_bindings::bindings::Gecko_AddPropertyToSet;
use style::gecko_bindings::bindings::Gecko_AppendPropertyValuePair;
use style::gecko_bindings::bindings::Gecko_GetOrCreateFinalKeyframe; use style::gecko_bindings::bindings::Gecko_GetOrCreateFinalKeyframe;
use style::gecko_bindings::bindings::Gecko_GetOrCreateInitialKeyframe; use style::gecko_bindings::bindings::Gecko_GetOrCreateInitialKeyframe;
use style::gecko_bindings::bindings::Gecko_GetOrCreateKeyframeAtStart; use style::gecko_bindings::bindings::Gecko_GetOrCreateKeyframeAtStart;
@ -3077,16 +3078,6 @@ pub extern "C" fn Servo_AssertTreeIsClean(root: RawGeckoElementBorrowed) {
assert_subtree_is_clean(root); assert_subtree_is_clean(root);
} }
fn append_computed_property_value(keyframe: *mut structs::Keyframe,
property: &AnimatableLonghand) {
unsafe {
let index = (*keyframe).mPropertyValues.len();
(*keyframe).mPropertyValues.set_len((index + 1) as u32);
(*keyframe).mPropertyValues[index].mProperty = property.into();
(*keyframe).mPropertyValues[index].mServoDeclarationBlock.mRawPtr = ptr::null_mut();
}
}
enum Offset { enum Offset {
Zero, Zero,
One One
@ -3118,7 +3109,8 @@ fn fill_in_missing_keyframe_values(all_properties: &[AnimatableLonghand],
// Append properties that have not been set at this offset. // Append properties that have not been set at this offset.
for ref property in all_properties.iter() { for ref property in all_properties.iter() {
if !properties_set_at_offset.has_animatable_longhand_bit(property) { if !properties_set_at_offset.has_animatable_longhand_bit(property) {
append_computed_property_value(keyframe, property); unsafe { Gecko_AppendPropertyValuePair(&mut (*keyframe).mPropertyValues,
(*property).into()); }
} }
} }
} }
@ -3181,7 +3173,10 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB
// animation should be set to the underlying computed value for // animation should be set to the underlying computed value for
// that keyframe. // that keyframe.
for property in animation.properties_changed.iter() { for property in animation.properties_changed.iter() {
append_computed_property_value(keyframe, property); unsafe {
Gecko_AppendPropertyValuePair(&mut (*keyframe).mPropertyValues,
property.into());
}
} }
if current_offset == 0.0 { if current_offset == 0.0 {
has_complete_initial_keyframe = true; has_complete_initial_keyframe = true;
@ -3199,7 +3194,6 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB
declaration.is_animatable() declaration.is_animatable()
}); });
let mut index = unsafe { (*keyframe).mPropertyValues.len() };
for &(ref declaration, _) in animatable { for &(ref declaration, _) in animatable {
let property = AnimatableLonghand::from_declaration(declaration).unwrap(); let property = AnimatableLonghand::from_declaration(declaration).unwrap();
// Skip the 'display' property because although it is animatable from SMIL, // Skip the 'display' property because although it is animatable from SMIL,
@ -3213,17 +3207,17 @@ pub extern "C" fn Servo_StyleSet_GetKeyframesForName(raw_data: RawServoStyleSetB
properties_set_at_end.set_animatable_longhand_bit(&property); properties_set_at_end.set_animatable_longhand_bit(&property);
} }
unsafe {
let property = AnimatableLonghand::from_declaration(declaration).unwrap(); let property = AnimatableLonghand::from_declaration(declaration).unwrap();
(*keyframe).mPropertyValues.set_len((index + 1) as u32); unsafe {
(*keyframe).mPropertyValues[index].mProperty = (&property).into(); let pair =
(*keyframe).mPropertyValues[index].mServoDeclarationBlock.set_arc_leaky( Gecko_AppendPropertyValuePair(&mut (*keyframe).mPropertyValues,
(&property).into());
(*pair).mServoDeclarationBlock.set_arc_leaky(
Arc::new(global_style_data.shared_lock.wrap( Arc::new(global_style_data.shared_lock.wrap(
PropertyDeclarationBlock::with_one( PropertyDeclarationBlock::with_one(
declaration.clone(), Importance::Normal declaration.clone(), Importance::Normal
)))); ))));
} }
index += 1;
} }
} }
}, },