[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.19-706-ge5415e9

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit da3055b1e418b3783abaa3df72abfdb2402444b2
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 20 10:06:08 2010 +0000

    2010-01-20  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Exempt JavaScriptCore/qt/api from style checks
            https://bugs.webkit.org/show_bug.cgi?id=33879
    
            Apparently there is a JavaScriptCore API for Qt as well as a WebKit
            API.
    
            * Scripts/webkitpy/style/cpp_style.py:
            * Scripts/webkitpy/style/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53534 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 967aca6..122d829 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-01-20  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Exempt JavaScriptCore/qt/api from style checks
+        https://bugs.webkit.org/show_bug.cgi?id=33879
+
+        Apparently there is a JavaScriptCore API for Qt as well as a WebKit
+        API.
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
 2010-01-19  Tor Arne Vestbø  <tor.arne.vestbo at nokia.com>
 
         Reviewed by Simon Hausmann.
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style.py b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
index 2cf8f7d..2c4badd 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
@@ -2934,6 +2934,7 @@ def is_exempt(filename):
       filename: A filename. It may contain directory names.
      """
     if (filename.find('WebKit/qt/Api/') >= 0
+        or filename.find('JavaScriptCore/qt/api/') >= 0
         or filename.find('WebKit/qt/tests/') >= 0):
         # The Qt API and tests do not follow WebKit style.
         # They follow Qt style. :)
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
index 7e165a6..6e06963 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
@@ -3624,6 +3624,7 @@ class WebKitStyleTest(CppStyleTestBase):
         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('JavaScriptCore/qt/api/qscriptengine_p.h'))
         self.assert_(cpp_style.is_exempt('WebKit/qt/tests/qwebsecurityorigin/tst_qwebsecurityorigin.cpp'))
 
 def tearDown():

-- 
WebKit Debian packaging