[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit c78beb8450a5956bd4f372b302cf1881faed9605
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 19 02:53:16 2010 +0000

    2010-01-18  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Darin Adler.
    
            Skip an error after invalid blocks in a CSS expression.
            https://bugs.webkit.org/show_bug.cgi?id=33650
    
            * fast/css/parsing-error-recovery.html:
    2010-01-18  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Darin Adler.
    
            Skip an error after invalid blocks in a CSS expression.
            https://bugs.webkit.org/show_bug.cgi?id=33650
    
            * css/CSSGrammar.y:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53448 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index ea45242..9add9fa 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-18  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Darin Adler.
+
+        Skip an error after invalid blocks in a CSS expression.
+        https://bugs.webkit.org/show_bug.cgi?id=33650
+
+        * fast/css/parsing-error-recovery.html:
+
 2010-01-18  Nikolas Zimmermann  <nzimmermann at rim.com>
 
         Reviewed by Dirk Schulze.
diff --git a/LayoutTests/fast/css/parsing-error-recovery.html b/LayoutTests/fast/css/parsing-error-recovery.html
index d78141a..a0c0646 100644
--- a/LayoutTests/fast/css/parsing-error-recovery.html
+++ b/LayoutTests/fast/css/parsing-error-recovery.html
@@ -19,12 +19,16 @@
             behavior:expression((function(){})());
             display:none;
         }
+        #test2 {
+            behavior:expression(function(){}());
+            display:none;
+        }
 
         /* Value containing an invalid block should be skipped */
         .malformed1 {
           height:{}
         }
-        #test2 {
+        #test3 {
             display:none;
         }
 
@@ -33,7 +37,7 @@
             a:link { color: blue;}
             a:active { color: red;}
         }
-        #test3 {
+        #test4 {
             display:none;
         }
 
@@ -47,6 +51,7 @@
   <div class="to_be_hidden" id="test1">FAIL: Test 1</div>
   <div class="to_be_hidden" id="test2">FAIL: Test 2</div>
   <div class="to_be_hidden" id="test3">FAIL: Test 3</div>
+  <div class="to_be_hidden" id="test4">FAIL: Test 4</div>
   <div class="to_be_shown" id="last">PASS</div>
 </body>
 </html>
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6a8caf5..8a35925 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,12 @@
+2010-01-18  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Darin Adler.
+
+        Skip an error after invalid blocks in a CSS expression.
+        https://bugs.webkit.org/show_bug.cgi?id=33650
+
+        * css/CSSGrammar.y:
+
 2010-01-15  Gavin Barraclough  <barraclough at apple.com>
 
         Reviewed by Darin Adler & Oliver Hunt.
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index 63e8eed..9d5eb6e 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -97,7 +97,7 @@ static int cssyylex(YYSTYPE* yylval, void* parser)
 
 %}
 
-%expect 53
+%expect 54
 
 %nonassoc LOWEST_PREC
 
@@ -1331,6 +1331,9 @@ expr:
     | expr invalid_block_list {
         $$ = 0;
     }
+    | expr invalid_block_list error {
+        $$ = 0;
+    }
     | expr error {
         $$ = 0;
     }

-- 
WebKit Debian packaging