--- a/dom/animation/test/chrome/test_animation_properties.html
+++ b/dom/animation/test/chrome/test_animation_properties.html
@@ -666,97 +666,97 @@ var gTests = [
// convert to computed values.
//
// ---------------------------------------------------------------------
{ desc: 'a missing property in initial keyframe',
frames: [ { },
{ margin: '5px' } ],
expected: [ { property: 'margin-top',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-right',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-bottom',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-left',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] } ]
},
{ desc: 'a missing property in initial keyframe and there are some ' +
'keyframes with the same offset',
frames: [ { },
{ margin: '10px', offset: 0.5 },
{ margin: '20px', offset: 0.5 },
{ margin: '30px'} ],
expected: [ { property: 'margin-top',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
- valueFormat(0.5, '10px', 'replace'),
- valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, '30px', 'replace') ] },
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
+ valueFormat(0.5, '10px', 'replace'),
+ valueFormat(0.5, '20px', 'replace', 'linear'),
+ valueFormat(1, '30px', 'replace') ] },
{ property: 'margin-right',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
- valueFormat(0.5, '10px', 'replace'),
- valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, '30px', 'replace') ] },
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
+ valueFormat(0.5, '10px', 'replace'),
+ valueFormat(0.5, '20px', 'replace', 'linear'),
+ valueFormat(1, '30px', 'replace') ] },
{ property: 'margin-bottom',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
- valueFormat(0.5, '10px', 'replace'),
- valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, '30px', 'replace') ] },
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
+ valueFormat(0.5, '10px', 'replace'),
+ valueFormat(0.5, '20px', 'replace', 'linear'),
+ valueFormat(1, '30px', 'replace') ] },
{ property: 'margin-left',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
- valueFormat(0.5, '10px', 'replace'),
- valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, '30px', 'replace') ] } ]
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
+ valueFormat(0.5, '10px', 'replace'),
+ valueFormat(0.5, '20px', 'replace', 'linear'),
+ valueFormat(1, '30px', 'replace') ] } ]
},
{ desc: 'a missing property in final keyframe',
frames: [ { margin: '5px' },
{ } ],
expected: [ { property: 'margin-top',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-right',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-bottom',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-left',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'a missing property in final keyframe and there are some ' +
'keyframes with the same offsets',
frames: [ { margin: '5px' },
{ margin: '10px', offset: 0.5 },
{ margin: '20px', offset: 0.5 },
{ } ],
expected: [ { property: 'margin-top',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(0.5, '10px', 'replace'),
valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-right',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(0.5, '10px', 'replace'),
valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-bottom',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(0.5, '10px', 'replace'),
valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-left',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(0.5, '10px', 'replace'),
valueFormat(0.5, '20px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'a missing property in final keyframe where it forms the last'
+ ' segment in the series',
frames: [ { margin: '5px' },
{ marginLeft: '5px',
marginRight: '5px',
marginBottom: '5px' } ],
expected: [ { property: 'margin-bottom',
@@ -765,103 +765,103 @@ var gTests = [
{ property: 'margin-left',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-right',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-top',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'a missing property in initial keyframe along with other values',
frames: [ { left: '10px' },
{ margin: '5px', left: '20px' } ],
expected: [ { property: 'left',
values: [ valueFormat(0, '10px', 'replace', 'linear'),
valueFormat(1, '20px', 'replace') ] },
{ property: 'margin-top',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-right',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-bottom',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'margin-left',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '5px', 'replace') ] } ]
},
{ desc: 'a missing property in final keyframe along with other values',
frames: [ { margin: '5px', left: '10px' },
{ left: '20px' } ],
expected: [ { property: 'left',
values: [ valueFormat(0, '10px', 'replace', 'linear'),
valueFormat(1, '20px', 'replace') ] },
{ property: 'margin-top',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-right',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-bottom',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] },
+ valueFormat(1, undefined, 'replace') ] },
{ property: 'margin-left',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'missing properties in both of initial and final keyframe',
frames: [ { left: '5px', offset: 0.5 } ],
expected: [ { property: 'left',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
- valueFormat(0.5, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
+ valueFormat(0.5, '5px', 'replace', 'linear'),
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'missing propertes in both of initial and final keyframe along '
+ 'with other values',
frames: [ { left: '5px', offset: 0 },
{ right: '5px', offset: 0.5 },
{ left: '10px', offset: 1 } ],
expected: [ { property: 'left',
values: [ valueFormat(0, '5px', 'replace', 'linear'),
valueFormat(1, '10px', 'replace') ] },
{ property: 'right',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(0.5, '5px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'a missing property in final keyframe with duplicate offset ' +
+ 'along with other values',
frames: [ { left: '5px', right: '5px', offset: 0 },
{ left: '8px', right: '8px', offset: 0 },
{ left: '10px', offset: 1 } ],
expected: [ { property: 'left',
values: [ valueFormat(0, '5px', 'replace'),
valueFormat(0, '8px', 'replace', 'linear'),
valueFormat(1, '10px', 'replace') ] },
{ property: 'right',
values: [ valueFormat(0, '5px', 'replace'),
valueFormat(0, '8px', 'replace', 'linear'),
- valueFormat(1, undefined, 'add') ] } ]
+ valueFormat(1, undefined, 'replace') ] } ]
},
{ desc: 'a missing property in initial keyframe with duplicate offset '
+ 'along with other values',
frames: [ { left: '10px', offset: 0 },
{ left: '8px', right: '8px', offset: 1 },
{ left: '5px', right: '5px', offset: 1 } ],
expected: [ { property: 'left',
values: [ valueFormat(0, '10px', 'replace', 'linear'),
valueFormat(1, '8px', 'replace'),
valueFormat(1, '5px', 'replace') ] },
{ property: 'right',
- values: [ valueFormat(0, undefined, 'add', 'linear'),
+ values: [ valueFormat(0, undefined, 'replace', 'linear'),
valueFormat(1, '8px', 'replace'),
valueFormat(1, '5px', 'replace') ] } ]
},
];
SpecialPowers.pushPrefEnv(
{ set: [["dom.animations-api.core.enabled", true]] },
function() {