Changeset 151488 in webkit

Timestamp:

Jun 12, 2013 12:20:20 AM (11 years ago)

Author:

sergio@webkit.org

Message:

Add CSS parsing recovery to functions
​https://bugs.webkit.org/show_bug.cgi?id=117500

Reviewed by Andreas Kling.

From Blink r150205 by <​serya@chromium.org>

Source/WebCore:

Add parsing recovery capabilities to functions. Errors were
correctly detected without this change but then the whole
declaration was invalidated. By using expr_recovery to handle them
we can recover from those errors and go on with the parsing.

• css/CSSGrammar.y.in:

LayoutTests:

• fast/css/parsing-error-recovery.html: added some test cases for

parsing recovery inside functions.

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/css/parsing-error-recovery.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/css/CSSGrammar.y.in (modified) (9 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2013-06-12  Sergio Villar Senin  <svillar@igalia.com>
+
+        Add CSS parsing recovery to functions
+        https://bugs.webkit.org/show_bug.cgi?id=117500
+
+        Reviewed by Andreas Kling.
+
+        From Blink r150205 by <serya@chromium.org>
+
+        * fast/css/parsing-error-recovery.html: added some test cases for
+        parsing recovery inside functions.
+
 2013-06-11  Gyuyoung Kim  <gyuyoung.kim@samsung.com>
 

trunk/LayoutTests/fast/css/parsing-error-recovery.html

@@ -61 +61 @@
         }
 
+        #test8 {
+            color: rgb(1,});
+            display: none;
+        }
+
+        #test9 {
+            color: rgb(});
+            display: none;
+        }
+
+        #test10 {
+            width: calc(1,});
+            display: none;
+        }
+
+        #test11 {
+            width: calc(});
+            display: none;
+        }
+
+        #test12 {
+            width: -webkit-min(1,});
+            display: none;
+        }
+
+        #test13 {
+            width: -webkit-min(});
+            display: none;
+        }
+
         /* Successfully parsed */
         #last {
@@ -75 +105 @@
   <div class="to_be_hidden" id="test6">FAIL: Test 6</div>
   <div class="to_be_hidden" id="test7">FAIL: Test 7</div>
+  <div class="to_be_hidden" id="test8">FAIL: Test 8</div>
+  <div class="to_be_hidden" id="test9">FAIL: Test 9</div>
+  <div class="to_be_hidden" id="test10">FAIL: Test 10</div>
+  <div class="to_be_hidden" id="test11">FAIL: Test 11</div>
+  <div class="to_be_hidden" id="test12">FAIL: Test 12</div>
+  <div class="to_be_hidden" id="test13">FAIL: Test 13</div>
   <div class="to_be_shown" id="last">PASS</div>
 </body>

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2013-06-12  Sergio Villar Senin  <svillar@igalia.com>
+
+        Add CSS parsing recovery to functions
+        https://bugs.webkit.org/show_bug.cgi?id=117500
+
+        Reviewed by Andreas Kling.
+
+        From Blink r150205 by <serya@chromium.org>
+
+        Add parsing recovery capabilities to functions. Errors were
+        correctly detected without this change but then the whole
+        declaration was invalidated. By using expr_recovery to handle them
+        we can recover from those errors and go on with the parsing.
+
+        * css/CSSGrammar.y.in:
+
 2013-06-11  Christophe Dumez  <ch.dumez@sisa.samsung.com>
 

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

@@ -89 +89 @@
 
 #if ENABLE_SHADOW_DOM
-%expect 33
+%expect 32
 #else
-%expect 32
+%expect 31
 #endif
 
@@ -1701 +1701 @@
   }
   /* FIXME: according to the specs a function can have a unary_operator in front. I know no case where this makes sense */
-  | function {
+  | function maybe_space {
       $$ = $1;
   }
-  | calc_function {
+  | calc_function maybe_space {
       $$ = $1;
   }
-  | min_or_max_function {
+  | min_or_max_function maybe_space {
       $$ = $1;
   }
@@ -1754 +1754 @@
 
 function:
-    FUNCTION maybe_space expr closing_parenthesis maybe_space {
+    FUNCTION maybe_space expr closing_parenthesis {
         CSSParserFunction* f = parser->createFloatingFunction();
         f->name = $1;
@@ -1762 +1762 @@
         $$.function = f;
     } |
-    FUNCTION maybe_space closing_parenthesis maybe_space {
+    FUNCTION maybe_space closing_parenthesis {
         CSSParserFunction* f = parser->createFloatingFunction();
         f->name = $1;
@@ -1771 +1771 @@
         $$.function = f;
     } |
-    FUNCTION maybe_space error {
+    FUNCTION maybe_space expr_recovery closing_parenthesis {
         CSSParserFunction* f = parser->createFloatingFunction();
         f->name = $1;
@@ -1884 +1884 @@
 
 calc_function:
-    CALCFUNCTION maybe_space calc_func_expr calc_maybe_space closing_parenthesis maybe_space {
+    CALCFUNCTION maybe_space calc_func_expr calc_maybe_space closing_parenthesis {
         CSSParserFunction* f = parser->createFloatingFunction();
         f->name = $1;
@@ -1892 +1892 @@
         $$.function = f;
     }
-    | CALCFUNCTION maybe_space error {
+    | CALCFUNCTION maybe_space expr_recovery closing_parenthesis {
         YYERROR;
     }
@@ -1908 +1908 @@
 
 min_or_max_function:
-    min_or_max maybe_space calc_func_expr_list closing_parenthesis maybe_space {
+    min_or_max maybe_space calc_func_expr_list closing_parenthesis {
         CSSParserFunction* f = parser->createFloatingFunction();
         f->name = $1;
@@ -1916 +1916 @@
         $$.function = f;
     } 
-    | min_or_max maybe_space error {
+    | min_or_max maybe_space expr_recovery closing_parenthesis {
         YYERROR;
     }