[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-142-g786665c

[apavlov at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit 1df97fb371b11a386bf39299c93fdd9bfe4a21a0
Author: apavlov at chromium.org <apavlov at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 22 11:05:23 2010 +0000

    2010-12-22  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: Styles pane fails to display properties from a broken CSS rule correctly
            https://bugs.webkit.org/show_bug.cgi?id=51405
    
            * inspector/styles-new-API-expected.txt:
            * inspector/styles-new-API.html:
    2010-12-22  Alexander Pavlov  <apavlov at chromium.org>
    
            Reviewed by Joseph Pecoraro.
    
            Web Inspector: Styles pane fails to display properties from a broken CSS rule correctly
            https://bugs.webkit.org/show_bug.cgi?id=51405
    
            Invoke markPropertyStart() after the parser has restored after an error.
    
            * css/CSSGrammar.y:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74468 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 21c48c3..34d0f0c 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-22  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: Styles pane fails to display properties from a broken CSS rule correctly
+        https://bugs.webkit.org/show_bug.cgi?id=51405
+
+        * inspector/styles-new-API-expected.txt:
+        * inspector/styles-new-API.html:
+
 2010-12-22  Dai Mikurube  <dmikurube at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/LayoutTests/inspector/styles-new-API-expected.txt b/LayoutTests/inspector/styles-new-API-expected.txt
index ea6ca7c..354e530 100644
--- a/LayoutTests/inspector/styles-new-API-expected.txt
+++ b/LayoutTests/inspector/styles-new-API-expected.txt
@@ -53,7 +53,7 @@ body.main2: []
 rule
 body.mainpage: []
 ['text-decoration':'none'] @[5-27] active
-['badproperty':'1badvalue1' non-parsed] @[107-131] active
+['badproperty':'1badvalue1' non-parsed] @[108-132] active
 
 rule
 body.mainpage: []
@@ -190,7 +190,7 @@ StyleSheet: '
 /* An inline stylesheet */
 body.mainpage {
     text-decoration: none; /* at least one valid property is necessary for WebCore to match a rule */
-    badproperty: 1badvalue1;
+    ;badproperty: 1badvalue1;
 }
 
 body.mainpage {
@@ -203,7 +203,7 @@ body.mainpage {
 rule
 body.mainpage: []
 ['text-decoration':'none'] @[5-27] active
-['badproperty':'1badvalue1' non-parsed] @[107-131] active
+['badproperty':'1badvalue1' non-parsed] @[108-132] active
 
 rule
 body.mainpage: []
diff --git a/LayoutTests/inspector/styles-new-API.html b/LayoutTests/inspector/styles-new-API.html
index 3250d95..a176b2f 100644
--- a/LayoutTests/inspector/styles-new-API.html
+++ b/LayoutTests/inspector/styles-new-API.html
@@ -281,7 +281,7 @@ Covered API methods:
 /* An inline stylesheet */
 body.mainpage {
     text-decoration: none; /* at least one valid property is necessary for WebCore to match a rule */
-    badproperty: 1badvalue1;
+    ;badproperty: 1badvalue1;
 }
 
 body.mainpage {
diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 4240c5f..2a52f27 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2010-12-22  Alexander Pavlov  <apavlov at chromium.org>
+
+        Reviewed by Joseph Pecoraro.
+
+        Web Inspector: Styles pane fails to display properties from a broken CSS rule correctly
+        https://bugs.webkit.org/show_bug.cgi?id=51405
+
+        Invoke markPropertyStart() after the parser has restored after an error.
+
+        * css/CSSGrammar.y:
+
 2010-12-22  Dai Mikurube  <dmikurube at google.com>
 
         Reviewed by Kent Tamura.
diff --git a/WebCore/css/CSSGrammar.y b/WebCore/css/CSSGrammar.y
index db79b68..207fdf5 100644
--- a/WebCore/css/CSSGrammar.y
+++ b/WebCore/css/CSSGrammar.y
@@ -1278,9 +1278,13 @@ decl_list:
             $$ = $2;
     }
     | decl_list error ';' maybe_space {
+        CSSParser* p = static_cast<CSSParser*>(parser);
+        p->markPropertyStart();
         $$ = $1;
     }
     | decl_list error invalid_block_list error ';' maybe_space {
+        CSSParser* p = static_cast<CSSParser*>(parser);
+        p->markPropertyStart();
         $$ = $1;
     }
     ;

-- 
WebKit Debian packaging