[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.18-1-697-g2f78b87

[abarth at webkit.org]

The following commit has been merged in the debian/unstable branch:
commit cf6357f042f83477c2f2eb0257e5cb4bac8abdc4
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Jan 18 10:13:01 2010 +0000

    2010-01-18  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Shinichiro Hamaji.
    
            [check-webkit-style] does understand ResourceHandleWin.h
            https://bugs.webkit.org/show_bug.cgi?id=32975
    
            I'm not 100% convinced this fix is correct, but without more examples,
            it's hard to generalize.  We can always generalize the fix in the
            future.
    
            * Scripts/webkitpy/style/cpp_style.py:
            * Scripts/webkitpy/style/cpp_style_unittest.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@53398 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a6a42b7..9d5b8d3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,19 @@
 2010-01-18  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Shinichiro Hamaji.
+
+        [check-webkit-style] does understand ResourceHandleWin.h
+        https://bugs.webkit.org/show_bug.cgi?id=32975
+
+        I'm not 100% convinced this fix is correct, but without more examples,
+        it's hard to generalize.  We can always generalize the fix in the
+        future.
+
+        * Scripts/webkitpy/style/cpp_style.py:
+        * Scripts/webkitpy/style/cpp_style_unittest.py:
+
+2010-01-18  Adam Barth  <abarth at webkit.org>
+
         Unreviewed "build" fix.
 
         * Scripts/webkitpy/bugzilla.py:
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style.py b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
index ea0a64b..d275eaf 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style.py
@@ -2068,6 +2068,11 @@ def _classify_include(filename, include, is_system, include_state):
     # In case the two filename bases are the same then the above lenient check
     # probably was a false positive.
     elif include_state.visited_primary_section() and target_base == include_base:
+        if include == "ResourceHandleWin.h":
+            # FIXME: Thus far, we've only seen one example of these, but if we
+            # start to see more, please consider generalizing this check
+            # somehow.
+            return _OTHER_HEADER
         return _PRIMARY_HEADER
 
     return _OTHER_HEADER
diff --git a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
index 42d6c30..7148537 100644
--- a/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
+++ b/WebKitTools/Scripts/webkitpy/style/cpp_style_unittest.py
@@ -2187,6 +2187,12 @@ class OrderOfIncludesTest(CppStyleTestBase):
                                          'Found header this file implements after a header this file implements.'
                                          ' Should be: config.h, primary header, blank line, and then alphabetically sorted.'
                                          '  [build/include_order] [4]')
+        self.assert_language_rules_check('ResourceHandleWin.cpp',
+                                         '#include "config.h"\n'
+                                         '#include "ResourceHandle.h"\n'
+                                         '\n'
+                                         '#include "ResourceHandleWin.h"\n',
+                                         '')
 
     def test_try_drop_common_suffixes(self):
         self.assertEqual('foo/foo', cpp_style._drop_common_suffixes('foo/foo-inl.h'))

-- 
WebKit Debian packaging