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

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 8ef77fa10ae2cc7b1324f51e893470a9bf1cdeb8
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 11:26:08 2010 +0000

    2010-01-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Teach check-webkit-style about QGVLauncher
            https://bugs.webkit.org/show_bug.cgi?id=33890
    
            Remove false positives found in
            https://bugs.webkit.org/show_bug.cgi?id=33708
    
            * Scripts/webkitpy/style/cpp_style.py:
            * Scripts/webkitpy/style/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53538 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 807378a..71d0b68 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Teach check-webkit-style about QGVLauncher
+        https://bugs.webkit.org/show_bug.cgi?id=33890
+
+        Remove false positives found in
+        https://bugs.webkit.org/show_bug.cgi?id=33708
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
 2010-01-20  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style.py b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
index 2c4badd..c752af3 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
@@ -2094,7 +2094,8 @@ def check_include_line(filename, clean_lines, line_number, include_state, error)
       error: The function to call with any errors found.
     """
 
-    if filename.find('WebKitTools/WebKitAPITest/') >= 0:
+    if (filename.find('WebKitTools/WebKitAPITest/') >= 0
+        or filename.find('WebKit/qt/QGVLauncher/') >= 0):
         # Files in this directory are consumers of the WebKit API and
         # therefore do not follow the same header including discipline as
         # WebCore.
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
index 6e06963..1096db1 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
@@ -2047,6 +2047,11 @@ class OrderOfIncludesTest(CppStyleTestBase):
                                          '#include "foo.h"\n',
                                          '')
 
+    def test_webkit_api_test_excluded(self):
+        self.assert_language_rules_check('WebKit/qt/QGVLauncher/main.cpp',
+                                         '#include "foo.h"\n',
+                                         '')
+
     def test_check_line_break_after_own_header(self):
         self.assert_language_rules_check('foo.cpp',
                                          '#include "config.h"\n'

-- 
WebKit Debian packaging