1 files changed, 21 insertions, 10 deletions
diff --git a/components/style/keyframes.rs b/components/style/keyframes.rs
index dff585a1fee..001a994dbfe 100644
--- a/components/style/keyframes.rs
+++ b/components/style/keyframes.rs
@@ -325,14 +325,14 @@ impl<'a> QualifiedRuleParser for KeyframeListParser<'a> {
 
     fn parse_block(&mut self, prelude: Self::Prelude, input: &mut Parser)
                    -> Result<Self::QualifiedRule, ()> {
-        let mut declarations = Vec::new();
         let parser = KeyframeDeclarationParser {
             context: self.context,
+            declarations: vec![],
         };
         let mut iter = DeclarationListParser::new(input, parser);
         while let Some(declaration) = iter.next() {
             match declaration {
-                Ok(d) => declarations.extend(d.into_iter().map(|d| (d, Importance::Normal))),
+                Ok(_) => (),
                 Err(range) => {
                     let pos = range.start;
                     let message = format!("Unsupported keyframe property declaration: '{}'",
@@ -345,7 +345,7 @@ impl<'a> QualifiedRuleParser for KeyframeListParser<'a> {
         Ok(Arc::new(RwLock::new(Keyframe {
             selector: prelude,
             block: Arc::new(RwLock::new(PropertyDeclarationBlock {
-                declarations: declarations,
+                declarations: iter.parser.declarations,
                 important_count: 0,
             })),
         })))
@@ -354,24 +354,35 @@ impl<'a> QualifiedRuleParser for KeyframeListParser<'a> {
 
 struct KeyframeDeclarationParser<'a, 'b: 'a> {
     context: &'a ParserContext<'b>,
+    declarations: Vec<(PropertyDeclaration, Importance)>
 }
 
 /// Default methods reject all at rules.
 impl<'a, 'b> AtRuleParser for KeyframeDeclarationParser<'a, 'b> {
     type Prelude = ();
-    type AtRule = Vec<PropertyDeclaration>;
+    type AtRule = ();
 }
 
 impl<'a, 'b> DeclarationParser for KeyframeDeclarationParser<'a, 'b> {
-    type Declaration = Vec<PropertyDeclaration>;
+    /// We parse rules directly into the declarations object
+    type Declaration = ();
 
-    fn parse_value(&mut self, name: &str, input: &mut Parser) -> Result<Vec<PropertyDeclaration>, ()> {
+    fn parse_value(&mut self, name: &str, input: &mut Parser) -> Result<(), ()> {
         let id = try!(PropertyId::parse(name.into()));
-        let mut results = Vec::new();
-        match PropertyDeclaration::parse(id, self.context, input, &mut results, true) {
+        let old_len = self.declarations.len();
+        match PropertyDeclaration::parse(id, self.context, input, &mut self.declarations, true) {
             PropertyDeclarationParseResult::ValidOrIgnoredDeclaration => {}
-            _ => return Err(())
+            _ => {
+                self.declarations.truncate(old_len);
+                return Err(());
+            }
+        }
+        // In case there is still unparsed text in the declaration, we should roll back.
+        if !input.is_exhausted() {
+            self.declarations.truncate(old_len);
+            Err(())
+        } else {
+            Ok(())
         }
-        Ok(results)
     }
 }