[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[andersca at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 4f432709e05ae16c8e195c5774f207e08c79e855
Author: andersca at apple.com <andersca at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jul 29 21:35:44 2010 +0000

    check-webkit-style shouldn't complain about NPAPI functions
    https://bugs.webkit.org/show_bug.cgi?id=43211
    
    Reviewed by Adam Roben.
    
    Allow underscores in functions that start with NPN_, NPP_ or NP_.
    
    * Scripts/webkitpy/style/checkers/cpp.py:
    * Scripts/webkitpy/style/checkers/cpp_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@64309 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b7451d1..f9f928d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-07-29  Anders Carlsson  <andersca at apple.com>
+
+        Reviewed by Adam Roben.
+
+        check-webkit-style shouldn't complain about NPAPI functions
+        https://bugs.webkit.org/show_bug.cgi?id=43211
+
+        Allow underscores in functions that start with NPN_, NPP_ or NP_.
+
+        * Scripts/webkitpy/style/checkers/cpp.py:
+        * Scripts/webkitpy/style/checkers/cpp_unittest.py:
+
 2010-07-29  Victor Wang  <victorw at chromium.org>
 
         Unreviewed, rolling out r64270.
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
index 770ab40..9e4240c 100644
--- a/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
+++ b/WebKitTools/Scripts/webkitpy/style/checkers/cpp.py
@@ -2512,6 +2512,9 @@ def check_identifier_name_in_declaration(filename, line_number, line, error):
             if (not (filename.find('JavaScriptCore') >= 0 and modified_identifier.find('_op_') >= 0)
                 and not modified_identifier.startswith('tst_')
                 and not modified_identifier.startswith('webkit_dom_object_')
+                and not modified_identifier.startswith('NPN_')
+                and not modified_identifier.startswith('NPP_')
+                and not modified_identifier.startswith('NP_')
                 and not modified_identifier.startswith('qt_')
                 and not modified_identifier.find('::qt_') >= 0
                 and not modified_identifier == "const_iterator"):
diff --git a/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py b/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
index ee829aa..18fcfc5 100644
--- a/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/checkers/cpp_unittest.py
@@ -3703,6 +3703,11 @@ class WebKitStyleTest(CppStyleTestBase):
         self.assert_lint('void QTFrame::qt_drt_is_awesome(int var1, int var2)', '')
         self.assert_lint('void qt_drt_is_awesome(int var1, int var2);', '')
 
+        # NPAPI functions that start with NPN_, NPP_ or NP_ are allowed.
+        self.assert_lint('void NPN_Status(NPP, const char*)')
+        self.assert_lint('NPError NPP_SetWindow(NPP instance, NPWindow *window)')
+        self.assert_lint('NPObject* NP_Allocate(NPP, NPClass*)')
+
         # const_iterator is allowed as well.
         self.assert_lint('typedef VectorType::const_iterator const_iterator;', '')
 

-- 
WebKit Debian packaging