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

[aroben at apple.com]

The following commit has been merged in the debian/experimental branch:
commit 53327e7add3f251b7775c99e59e81a6ab7588b22
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 29 15:45:05 2010 +0000

    Teach check-webkit-style about WebKit2's idiosyncracies
    
    Fixes <http://webkit.org/b/48638> Style bot complains about a number
    of WebKit2 conventions
    
    Reviewed by Anders Carlsson.
    
    * Scripts/webkitpy/style/checker.py: Excluded some rules for various
    WebKit2-related files. Also updated the excluded rules for
    WebKitAPITest to match the current code.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@70883 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 3242230..37fef3d 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2010-10-29  Adam Roben  <aroben at apple.com>
+
+        Teach check-webkit-style about WebKit2's idiosyncracies
+
+        Fixes <http://webkit.org/b/48638> Style bot complains about a number
+        of WebKit2 conventions
+
+        Reviewed by Anders Carlsson.
+
+        * Scripts/webkitpy/style/checker.py: Excluded some rules for various
+        WebKit2-related files. Also updated the excluded rules for
+        WebKitAPITest to match the current code.
+
 2010-10-29  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Adam Roben and David Kilzer.
diff --git a/WebKitTools/Scripts/webkitpy/style/checker.py b/WebKitTools/Scripts/webkitpy/style/checker.py
index b8b5f83..11e3e33 100644
--- a/WebKitTools/Scripts/webkitpy/style/checker.py
+++ b/WebKitTools/Scripts/webkitpy/style/checker.py
@@ -115,9 +115,10 @@ _PATH_RULES_SPECIFIER = [
     # Files in these directories are consumers of the WebKit
     # API and therefore do not follow the same header including
     # discipline as WebCore.
-    (["WebKitTools/WebKitAPITest/"],
+    (["WebKitTools/WebKitAPITest/",
+      "WebKitTools/TestWebKitAPI/"],
      ["-build/include",
-      "-readability/streams"]),
+      "-readability/naming"]),
     ([# The EFL APIs use EFL naming style, which includes
       # both lower-cased and camel-cased, underscore-sparated
       # values.
@@ -147,6 +148,24 @@ _PATH_RULES_SPECIFIER = [
       "/JavaScriptCore/assembler/"],
      ["-readability/naming"]),
 
+    # WebKit2 rules:
+    # WebKit2 doesn't use config.h, and certain directories have other
+    # idiosyncracies.
+    ([# NPAPI has function names with underscores.
+      "WebKit2/WebProcess/Plugins/Netscape"],
+     ["-build/include_order",
+      "-readability/naming"]),
+    ([# The WebKit2 C API has names with underscores and whitespace-aligned
+      # struct members.
+      "WebKit2/UIProcess/API/C/",
+      "WebKit2/WebProcess/InjectedBundle/API/c/"],
+     ["-build/include_order",
+      "-readability/naming",
+      "-whitespace/declaration"]),
+    ([# Nothing in WebKit2 uses config.h.
+      "WebKit2/"],
+     ["-build/include_order"]),
+
     # For third-party Python code, keep only the following checks--
     #
     #   No tabs: to avoid having to set the SVN allow-tabs property.

-- 
WebKit Debian packaging