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

[hamaji at chromium.org]

The following commit has been merged in the debian/experimental branch:
commit adc5d93ab89231582aaf62980b52bad98d8cbab2
Author: hamaji at chromium.org <hamaji at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Dec 24 10:19:04 2010 +0000

    2010-12-24  Shinichiro Hamaji  <hamaji at chromium.org>
    
            Reviewed by Eric Seidel.
    
            check-webkit-style: should ignore "wrong" namings in JavaScriptCore/qt
            https://bugs.webkit.org/show_bug.cgi?id=51467
    
            * Scripts/webkitpy/style/checker.py:
            * Scripts/webkitpy/style/checker_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@74621 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 6307249..6a2db2b 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,13 @@
+2010-12-24  Shinichiro Hamaji  <hamaji at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        check-webkit-style: should ignore "wrong" namings in JavaScriptCore/qt
+        https://bugs.webkit.org/show_bug.cgi?id=51467
+
+        * Scripts/webkitpy/style/checker.py:
+        * Scripts/webkitpy/style/checker_unittest.py:
+
 2010-12-23  Adam Barth  <abarth at webkit.org>
 
         Rubber-stamped by Eric Seidel.
diff --git a/Tools/Scripts/webkitpy/style/checker.py b/Tools/Scripts/webkitpy/style/checker.py
index 6f1beb0..ba6502c 100644
--- a/Tools/Scripts/webkitpy/style/checker.py
+++ b/Tools/Scripts/webkitpy/style/checker.py
@@ -134,7 +134,7 @@ _PATH_RULES_SPECIFIER = [
       "WebCore/css/CSSParser.cpp",
       # Qt code uses '_' in some places (such as private slots
       # and on test xxx_data methos on tests)
-      "JavaScriptCore/qt/api/",
+      "JavaScriptCore/qt/",
       "WebKit/qt/Api/",
       "WebKit/qt/tests/",
       "WebKit/qt/declarative/",
diff --git a/Tools/Scripts/webkitpy/style/checker_unittest.py b/Tools/Scripts/webkitpy/style/checker_unittest.py
index d9057a8..4ad9a5c 100755
--- a/Tools/Scripts/webkitpy/style/checker_unittest.py
+++ b/Tools/Scripts/webkitpy/style/checker_unittest.py
@@ -238,6 +238,9 @@ class GlobalVariablesTest(unittest.TestCase):
                     "readability/braces")
         assertNoCheck("JavaScriptCore/qt/api/qscriptengine.cpp",
                       "readability/naming")
+        assertNoCheck("JavaScriptCore/qt/benchmarks"
+                      "/qscriptengine/tst_qscriptengine.cpp",
+                      "readability/naming")
         assertNoCheck("WebKit/qt/Api/qwebpage.cpp",
                       "readability/naming")
         assertNoCheck("WebKit/qt/tests/qwebelement/tst_qwebelement.cpp",

-- 
WebKit Debian packaging