[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 8460ba73d7db989c8dbdc26af8f8cff77a2befdc
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 03:11:47 2010 +0000

    2010-01-17  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            [check-webkit-style] qt unit testing false positives
            https://bugs.webkit.org/show_bug.cgi?id=32833
    
            Exempt the Qt API and unit tests from the style checker.
    
            * Scripts/webkitpy/style/cpp_style.py:
            * Scripts/webkitpy/style/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53386 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 267b144..41a27e1 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -2,6 +2,18 @@
 
         Reviewed by Darin Adler.
 
+        [check-webkit-style] qt unit testing false positives
+        https://bugs.webkit.org/show_bug.cgi?id=32833
+
+        Exempt the Qt API and unit tests from the style checker.
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
+2010-01-17  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
         style-check script reports loads of errors on gtk2drawing.c
         https://bugs.webkit.org/show_bug.cgi?id=33771
 
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style.py b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
index 6dd6c5f..47d922b 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
@@ -2926,6 +2926,12 @@ def is_exempt(filename):
     Args:
       filename: A filename. It may contain directory names.
      """
+    if (filename.find('WebKit/qt/Api/') >= 0
+        or filename.find('WebKit/qt/tests/') >= 0):
+        # The Qt API and tests do not follow WebKit style.
+        # They follow Qt style. :)
+        return True
+
     return os.path.basename(filename) in (
         'gtk2drawing.c',
         'gtk2drawing.h',
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
index 509b2c5..f23d229 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
@@ -3611,6 +3611,8 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assert_(cpp_style.is_exempt('WebCore/platform/gtk/gtk2drawing.h'))
         self.assert_(cpp_style.is_exempt('gtk2drawing.c'))
         self.assert_(cpp_style.is_exempt('WebCore/platform/gtk/gtk2drawing.c'))
+        self.assert_(cpp_style.is_exempt('WebKit/qt/Api/qwebpage.h'))
+        self.assert_(cpp_style.is_exempt('WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.cpp'))
 
 def tearDown():
     """A global check to make sure all error-categories have been tested.

-- 
WebKit Debian packaging