[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.21-584-g1e41756

[yuzo at google.com]

The following commit has been merged in the webkit-1.1 branch:
commit 2392e5d2b80ecdca9976edee546aa285c36ddccf
Author: yuzo at google.com <yuzo at google.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 12 01:29:25 2010 +0000

    2010-02-10  Yuzo Fujishima  <yuzo at google.com>
    
            Reviewed by Darin Adler.
    
            Allow underscored identifiers in CSSParser.cpp
    
            Flex (http://flex.sourceforge.net/) uses identifiers named as yy_*.
            WebCore/css/CSSParser.cpp needs to handle some such identifiers.
            We should relax the style rule for the file to allow underscored identifiers.
    
            https://bugs.webkit.org/show_bug.cgi?id=34787
    
            * Scripts/webkitpy/style/checker.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@54690 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2af126a..dbb6ecb 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-10  Yuzo Fujishima  <yuzo at google.com>
+
+        Reviewed by Darin Adler.
+
+        Allow underscored identifiers in CSSParser.cpp
+
+        Flex (http://flex.sourceforge.net/) uses identifiers named as yy_*.
+        WebCore/css/CSSParser.cpp needs to handle some such identifiers.
+        We should relax the style rule for the file to allow underscored identifiers.
+
+        https://bugs.webkit.org/show_bug.cgi?id=34787
+
+        * Scripts/webkitpy/style/checker.py:
+
 2010-02-11  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/style/checker.py b/WebKitTools/Scripts/webkitpy/style/checker.py
index 9de362f..fbda8cb 100644
--- a/WebKitTools/Scripts/webkitpy/style/checker.py
+++ b/WebKitTools/Scripts/webkitpy/style/checker.py
@@ -109,6 +109,8 @@ _PATH_RULES_SPECIFIER = [
     ([# The GTK+ APIs use GTK+ naming style, which includes
       # lower-cased, underscore-separated values.
       "WebKit/gtk/webkit/",
+      # There is no clean way to avoid "yy_*" names used by flex.
+      "WebCore/css/CSSParser.cpp",
       # There is no clean way to avoid "xxx_data" methods inside
       # Qt's autotests since they are called automatically by the
       # QtTest module.

-- 
WebKit Debian packaging