Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-03 04:30:10 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #12008 - servo:keyframes, r=Manishearth

Browse source 
Reorder code in KeyframesAnimation::from_keyframes() to avoid a panic.

Fixes #11999.
Fixes #12006.

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12008)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-07-01 07:58:50 -07:00 • committed by GitHub
commit b2a32ec028
3 changed files with 25 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

6
components/style/keyframes.rs
View file

@ -154,8 +154,12 @@ fn get_animated_properties(keyframe: &Keyframe) -> Vec<TransitionProperty> {
impl KeyframesAnimation {
pub fn from_keyframes(keyframes: &[Keyframe]) -> Option<Self> {
if keyframes.is_empty() {
return None;
}
let animated_properties = get_animated_properties(&keyframes[0]);
if keyframes.is_empty() || animated_properties.is_empty() {
if animated_properties.is_empty() {
return None;
}