mirror of
https://github.com/servo/servo.git
synced 2025-08-05 13:40:08 +01:00
Bug 1335942 - Part 1: Introduce mozilla::AnimationValue. r=manishearth
Use AnimationValue to wrap StyleAnimationValue and RawServoAnimationValue.
This commit is contained in:
parent
e2b494b1d0
commit
c7dc3e4008
3 changed files with 15 additions and 5 deletions
|
@ -5152,10 +5152,15 @@ pub mod root {
|
||||||
pub struct ContainerLayerParameters([u8; 0]);
|
pub struct ContainerLayerParameters([u8; 0]);
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
pub struct AnimationValue {
|
||||||
|
pub mGecko: root::mozilla::StyleAnimationValue,
|
||||||
|
pub mServo: root::RefPtr<root::RawServoAnimationValue>,
|
||||||
|
}
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct PropertyStyleAnimationValuePair {
|
pub struct PropertyStyleAnimationValuePair {
|
||||||
pub mProperty: root::nsCSSPropertyID,
|
pub mProperty: root::nsCSSPropertyID,
|
||||||
pub mValue: root::mozilla::StyleAnimationValue,
|
pub mValue: root::mozilla::AnimationValue,
|
||||||
pub mServoValue: root::RefPtr<root::RawServoAnimationValue>,
|
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn bindgen_test_layout_PropertyStyleAnimationValuePair() {
|
fn bindgen_test_layout_PropertyStyleAnimationValuePair() {
|
||||||
|
|
|
@ -5068,10 +5068,15 @@ pub mod root {
|
||||||
pub struct ContainerLayerParameters([u8; 0]);
|
pub struct ContainerLayerParameters([u8; 0]);
|
||||||
#[repr(C)]
|
#[repr(C)]
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
|
pub struct AnimationValue {
|
||||||
|
pub mGecko: root::mozilla::StyleAnimationValue,
|
||||||
|
pub mServo: root::RefPtr<root::RawServoAnimationValue>,
|
||||||
|
}
|
||||||
|
#[repr(C)]
|
||||||
|
#[derive(Debug)]
|
||||||
pub struct PropertyStyleAnimationValuePair {
|
pub struct PropertyStyleAnimationValuePair {
|
||||||
pub mProperty: root::nsCSSPropertyID,
|
pub mProperty: root::nsCSSPropertyID,
|
||||||
pub mValue: root::mozilla::StyleAnimationValue,
|
pub mValue: root::mozilla::AnimationValue,
|
||||||
pub mServoValue: root::RefPtr<root::RawServoAnimationValue>,
|
|
||||||
}
|
}
|
||||||
#[test]
|
#[test]
|
||||||
fn bindgen_test_layout_PropertyStyleAnimationValuePair() {
|
fn bindgen_test_layout_PropertyStyleAnimationValuePair() {
|
||||||
|
|
|
@ -253,7 +253,7 @@ pub extern "C" fn Servo_AnimationValues_Populate(anim: RawGeckoAnimationValueLis
|
||||||
// and thus can't directly use `geckoiter`
|
// and thus can't directly use `geckoiter`
|
||||||
let local_geckoiter = &mut geckoiter;
|
let local_geckoiter = &mut geckoiter;
|
||||||
for (gecko, servo) in local_geckoiter.zip(&mut iter) {
|
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));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue