aboutsummaryrefslogtreecommitdiffstats
path: root/components
diff options
context:
space:
mode:
authorbors-servo <lbergstrom+bors@mozilla.com>2016-07-01 07:58:50 -0700
committerGitHub <noreply@github.com>2016-07-01 07:58:50 -0700
commitb2a32ec028156170e63a07c072120db89923e6af (patch)
tree014a03cc38b8cf0a7c2bca31ba88ceddb10cf232 /components
parent210265d30f46cbf12142bf7495493a14497ed1f5 (diff)
parent70e964b707479e36ee8ba7ffabbe4757d6ef3f76 (diff)
downloadservo-b2a32ec028156170e63a07c072120db89923e6af.tar.gz
servo-b2a32ec028156170e63a07c072120db89923e6af.zip
Auto merge of #12008 - servo:keyframes, r=Manishearth
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 -->
Diffstat (limited to 'components')
-rw-r--r--components/style/keyframes.rs6
1 files changed, 5 insertions, 1 deletions
diff --git a/components/style/keyframes.rs b/components/style/keyframes.rs
index cbfa35b78c4..7d219758848 100644
--- a/components/style/keyframes.rs
+++ b/components/style/keyframes.rs
@@ -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;
}