Simplifying error recovery in declaration list.

Source/core/css/CSSGrammar.y.in

 /*
  *  Copyright (C) 2002-2003 Lars Knoll (knoll@kde.org)
  *  Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013 Apple Inc. All rights reserved.
  *  Copyright (C) 2006 Alexey Proskuryakov (ap@nypop.com)
  *  Copyright (C) 2008 Eric Seidel <eric@webkit.org>
  *  Copyright (C) 2012 Intel Corporation. All rights reserved.
  *
  *  This library is free software; you can redistribute it and/or
  *  modify it under the terms of the GNU Lesser General Public
  *  License as published by the Free Software Foundation; either
@@ skipping 69 matching lines @@
     case VAR_DEFINITION:
     case UNICODERANGE:
         return true;
     default:
         return false;
     }
 }
 
 %}
 
-%expect 1
+%expect 0
 
 %nonassoc LOWEST_PREC
 
 %left UNIMPORTANT_TOK
 
 %token WHITESPACE SGML_CD
 %token TOKEN_EOF 0
 
 %token INCLUDES
 %token DASHMATCH
@@ skipping 1431 matching lines @@
         $$ = $1;
     }
     | decl_list declaration {
         $$ = $1;
         if ( $2 )
             $$ = $2;
     }
     | decl_list {
         $$ = $1;
     }
-    | decl_list_recovery {
-        $$ = false;
-    }
-    | decl_list decl_list_recovery {
-        $$ = $1;
-    }
     ;
 
 decl_list:
     declaration ';' maybe_space {
         parser->startProperty();
         $$ = $1;
     }
-    | decl_list_recovery ';' maybe_space {
-        parser->startProperty();
-        $$ = false;
-    }
     | decl_list declaration ';' maybe_space {
         parser->startProperty();
         $$ = $1;
         if ($2)
             $$ = $2;
     }
-    | decl_list decl_list_recovery ';' maybe_space {
-        parser->startProperty();
-        $$ = $1;
-    }
-    ;
-
-decl_list_recovery:
-    error error_location error_recovery {
-        parser->reportError($2, CSSParser::PropertyDeclarationError);
-    }
     ;
 
 declaration:
     VAR_DEFINITION maybe_space ':' maybe_space expr prio {
         parser->storeVariableDeclaration($1, parser->sinkFloatingValueList($5), $6);
         $$ = true;
         parser->endProperty($6, true);
     }
     |
-    property ':' maybe_space error_location expr prio {
+    property ':' maybe_space error_location valid_expr prio {
         $$ = false;
         bool isPropertyParsed = false;
         if ($1 && $5) {
             parser->m_valueList = parser->sinkFloatingValueList($5);
             int oldParsedProperties = parser->m_parsedProperties.size();
             $$ = parser->parseValue(static_cast<CSSPropertyID>($1), $6);
             if (!$$) {
                 parser->rollbackLastProperties(parser->m_parsedProperties.size() - oldParsedProperties);
                 parser->reportError($4, CSSParser::InvalidPropertyValueError);
             } else
                 isPropertyParsed = true;
             parser->m_valueList = nullptr;
         }
         parser->endProperty($6, isPropertyParsed);
     }
     |
-    property declaration_recovery {
+    property ':' maybe_space error_location valid_expr prio error error_recovery {
+        /* When we encounter something like p {color: red !important fail;} we should drop the declaration */
+        parser->reportError($4, CSSParser::InvalidPropertyValueError);
+        parser->endProperty(false, false);
+        $$ = false;
+    }
+    |
+    property ':' maybe_space error_location error error_recovery {
+        parser->reportError($4, CSSParser::InvalidPropertyValueError);
+        parser->endProperty(false, false);
+        $$ = false;
+    }
+    |
+    property error error_location error_recovery {
+        parser->reportError($3, CSSParser::PropertyDeclarationError);
         parser->endProperty(false, false, CSSParser::GeneralError);
         $$ = false;
     }
     |
-    property ':' maybe_space error_location expr prio declaration_recovery {
-        /* When we encounter something like p {color: red !important fail;} we should drop the declaration */
-        parser->endProperty(false, false);
-        $$ = false;
-    }
-    |
-    IMPORTANT_SYM maybe_space declaration_recovery {
-        /* Handle this case: div { text-align: center; !important } Just reduce away the stray !important. */
-        parser->endProperty(false, false, CSSParser::GeneralError);
-        $$ = false;
-    }
-    |
-    property ':' maybe_space declaration_recovery {
-        /* if we come across rules with invalid values like this case: p { weight: *; }, just discard the rule */
-        parser->endProperty(false, false);
+    error error_location error_recovery {
+        parser->reportError($2, CSSParser::PropertyDeclarationError);
         $$ = false;
     }
   ;
 
-declaration_recovery:
-    error error_location error_recovery {
-        parser->reportError($2);
-    }
-  ;
-
 property:
     error_location IDENT maybe_space {
         $$ = cssPropertyID($2);
         parser->setCurrentProperty($$);
         if ($$ == CSSPropertyInvalid)
             parser->reportError($1, CSSParser::InvalidPropertyError);
     }
   ;
 
 prio:
@@ skipping 348 matching lines @@
 
 rule_error_recovery:
     /* empty */
   | rule_error_recovery error
   | rule_error_recovery invalid_square_brackets_block
   | rule_error_recovery invalid_parentheses_block
     ;
 
 %%