Changeset 151510 in webkit

Timestamp:

Jun 12, 2013 10:23:31 AM (11 years ago)

Author:

sergio@webkit.org

Message:

Skipping {}, () and [] blocks while error recovering in CSS
​https://bugs.webkit.org/show_bug.cgi?id=116071

Reviewed by Darin Adler.

From Blink r150201 and r150755 by <​serya@chromium.org>

Source/WebCore:

Test: fast/css/parsing-expr-error-recovery.html

The CSS parser should properly recover from invalid {}, () and []
blocks skipping them instead of discarding the whole declaration
as invalid. This merge is actually made of two different changes
from Blink, the original one that fixes the bug and another one
which refactors a bit the code making it more legible.

• css/CSSGrammar.y.in:

LayoutTests:

• fast/css/parsing-expr-error-recovery-expected.txt: Added.
• fast/css/parsing-expr-error-recovery.html: Added.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/parsing-expr-error-recovery-expected.txt (added)
• LayoutTests/fast/css/parsing-expr-error-recovery.html (added)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGrammar.y.in (modified) (8 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-12  Sergio Villar Senin  <svillar@igalia.com>
+
+        Skipping {}, () and [] blocks while error recovering in CSS
+        https://bugs.webkit.org/show_bug.cgi?id=116071
+
+        Reviewed by Darin Adler.
+
+        From Blink r150201 and r150755 by <serya@chromium.org>
+
+        * fast/css/parsing-expr-error-recovery-expected.txt: Added.
+        * fast/css/parsing-expr-error-recovery.html: Added.
+
 2013-06-12  Sergio Villar Senin  <svillar@igalia.com>
 

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-12  Sergio Villar Senin  <svillar@igalia.com>
+
+        Skipping {}, () and [] blocks while error recovering in CSS
+        https://bugs.webkit.org/show_bug.cgi?id=116071
+
+        Reviewed by Darin Adler.
+
+        From Blink r150201 and r150755 by <serya@chromium.org>
+
+        Test: fast/css/parsing-expr-error-recovery.html
+
+        The CSS parser should properly recover from invalid {}, () and []
+        blocks skipping them instead of discarding the whole declaration
+        as invalid. This merge is actually made of two different changes
+        from Blink, the original one that fixes the bug and another one
+        which refactors a bit the code making it more legible.
+
+        * css/CSSGrammar.y.in:
+
 2013-06-12  Alberto Garcia  <agarcia@igalia.com>
 

trunk/Source/WebCore/css/CSSGrammar.y.in

@@ -322 +322 @@
 
 %type <valueList> expr
+%type <valueList> valid_expr
 %type <value> term
 %type <value> unary_term
@@ -328 +329 @@
 %type <character> calc_func_operator
 %type <valueList> calc_func_expr
+%type <valueList> valid_calc_func_expr
 %type <valueList> calc_func_expr_list
 %type <valueList> calc_func_paren_expr
@@ -1639 +1641 @@
 
 expr:
+    valid_expr
+    | valid_expr expr_recovery { $$ = 0; }
+  ;
+
+valid_expr:
     term {
         $$ = parser->createFloatingValueList();
         $$->addValue(parser->sinkFloatingValue($1));
     }
-    | expr operator term {
+    | valid_expr operator term {
         $$ = $1;
         if ($$) {
@@ -1655 +1662 @@
             $$->addValue(parser->sinkFloatingValue($3));
         }
-    }
-    | expr expr_recovery {
-        $$ = 0;
     }
   ;
@@ -1830 +1834 @@
 
 calc_func_expr:
+    valid_calc_func_expr
+    | valid_calc_func_expr expr_recovery { $$ = 0; }
+  ;
+
+valid_calc_func_expr:
     calc_func_term {
         $$ = parser->createFloatingValueList();
@@ -1860 +1869 @@
     }
     | calc_func_paren_expr
-    | calc_func_expr error {
-        $$ = 0;
-    }
   ;
 
@@ -1960 +1966 @@
 
 invalid_block:
-    '{' error invalid_block_list error closing_brace {
+    '{' error_recovery closing_brace {
         parser->invalidBlockHit();
     }
-  | '{' error closing_brace {
-        parser->invalidBlockHit();
-    }
-    ;
-
-invalid_block_list:
-    invalid_block
-  | invalid_block_list error invalid_block
-;
+    ;
+
+invalid_square_brackets_block:
+    '[' error_recovery ']'
+  | '[' error_recovery TOKEN_EOF
+    ;
+
+invalid_parentheses_block:
+    opening_parenthesis error_recovery closing_parenthesis;
+
+opening_parenthesis:
+    '(' | FUNCTION | CALCFUNCTION | VARFUNCTION | MINFUNCTION | MAXFUNCTION | ANYFUNCTION | NOTFUNCTION
+#if ENABLE_VIDEO_TRACK
+    | CUEFUNCTION
+#endif
+    ;
 
 error_location: {
@@ -1980 +1993 @@
 error_recovery:
     /* empty */
+  | error_recovery error
   | error_recovery invalid_block
-  | error_recovery error
+  | error_recovery invalid_square_brackets_block
+  | error_recovery invalid_parentheses_block
     ;