[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 29d6ded34186b0643b1724a5ebbcf74d1996796a
Author: aroben at apple.com <aroben at apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 5 14:48:06 2010 +0000

    Teach check-webkit-style about TestNetscapePlugIn
    
    Fixes <http://webkit.org/b/49030> check-webkit-style is ignorant of
    TestNetscapePlugIn's coding conventions
    
    Reviewed by John Sullivan.
    
    * Scripts/webkitpy/style/checker.py: Lump TestNetscapePlugIn in with
    WebKitAPITest and TestWebKitAPI in having different include order and
    naming conventions than WebCore. Added some comments about why the
    exceptions exist.
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@71419 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 276b6e7..1b84051 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2010-11-04  Adam Roben  <aroben at apple.com>
 
+        Teach check-webkit-style about TestNetscapePlugIn
+
+        Fixes <http://webkit.org/b/49030> check-webkit-style is ignorant of
+        TestNetscapePlugIn's coding conventions
+
+        Reviewed by John Sullivan.
+
+        * Scripts/webkitpy/style/checker.py: Lump TestNetscapePlugIn in with
+        WebKitAPITest and TestWebKitAPI in having different include order and
+        naming conventions than WebCore. Added some comments about why the
+        exceptions exist.
+
+2010-11-04  Adam Roben  <aroben at apple.com>
+
         Add a test that shows that windowed plugins are able to paint
 
         Somehow we never had a test for this before.
diff --git a/WebKitTools/Scripts/webkitpy/style/checker.py b/WebKitTools/Scripts/webkitpy/style/checker.py
index 11e3e33..fb93eb9 100644
--- a/WebKitTools/Scripts/webkitpy/style/checker.py
+++ b/WebKitTools/Scripts/webkitpy/style/checker.py
@@ -115,7 +115,13 @@ _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/",
+
+    ([# TestNetscapePlugIn has no config.h and uses funny names like
+      # NPP_SetWindow.
+      "WebKitTools/DumpRenderTree/TestNetscapePlugIn/",
+      # The API test harnesses have no config.h and use funny macros like
+      # TEST_CLASS_NAME.
+      "WebKitTools/WebKitAPITest/",
       "WebKitTools/TestWebKitAPI/"],
      ["-build/include",
       "-readability/naming"]),

-- 
WebKit Debian packaging